void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-04-15 21:57:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build with Xcode.

Browse source
This commit is contained in:
John Preston 2022-07-18 12:09:12 +03:00
parent 57ecd918f1
commit 8383caa2b5
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
View file

@ -2727,9 +2727,9 @@ void StickersListWidget::removeMegagroupSet(bool locally) {
}
close();
}),
.cancelled = crl::guard(this, [this](Fn<void()> &&close) {
.cancelled = [](Fn<void()> &&close) {
close();
}),
},
})));
}

2
Telegram/SourceFiles/core/core_settings.h
View file

@ -67,7 +67,7 @@ struct RecentEmojiDocument {
struct RecentEmojiId {
std::variant<EmojiPtr, RecentEmojiDocument> data;
friend inline auto operator<=>(
friend inline bool operator==(
RecentEmojiId,
RecentEmojiId) = default;
};

16
Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.mm
View file

@ -258,13 +258,25 @@ void AppendFavedStickers(
}
}
[[nodiscard]] EmojiPack RecentEmojiSection() {
const auto list = Core::App().settings().recentEmoji();
auto result = EmojiPack();
result.reserve(list.size());
for (const auto &emoji : list) {
if (const auto one = std::get_if<EmojiPtr>(&emoji.id.data)) {
result.push_back(*one);
}
}
return result;
}
void AppendEmojiPacks(
const Data::StickersSets &sets,
std::vector<PickerScrubberItem> &to) {
for (auto i = 0; i != ChatHelpers::kEmojiSectionCount; ++i) {
const auto section = static_cast<Ui::Emoji::Section>(i);
const auto list = (section == Ui::Emoji::Section::Recent)
? Core::App().settings().recentEmojiSection()
? RecentEmojiSection()
: Ui::Emoji::GetSection(section);
const auto title = (section == Ui::Emoji::Section::Recent)
? TitleRecentlyUsed(sets)
@ -475,7 +487,7 @@ void AppendEmojiPacks(
if (const auto inputField = qobject_cast<QTextEdit*>(
QApplication::focusWidget())) {
Ui::InsertEmojiAtCursor(inputField->textCursor(), emoji);
Core::App().settings().incrementRecentEmoji(emoji);
Core::App().settings().incrementRecentEmoji({ emoji });
return true;
}
}