mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Move recent emoji and variants to common settings.

Browse Source 
Fixes #16163, fixes #4018, partially fixes #10123.
This commit is contained in:
John Preston
2021-04-25 12:12:32 +04:00
parent 68e35b232d
commit 5bb73d8d3d
12 changed files with 276 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
Telegram/SourceFiles/settings.cpp
View File

@@ -9,14 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/emoji_config.h"
namespace {
constexpr auto kRecentEmojiLimit = 42;
auto UpdatesRecentEmoji = rpl::event_stream<>();
} // namespace
Qt::LayoutDirection gLangDir = Qt::LeftToRight;
bool gInstallBetaVersion = AppBetaVersion;
@@ -56,10 +48,6 @@ int gConfigScale = style::kScaleAuto;
QString gTimeFormat = qsl("hh:mm");
RecentEmojiPack gRecentEmoji;
RecentEmojiPreload gRecentEmojiPreload;
EmojiColorVariants gEmojiVariants;
RecentStickerPreload gRecentStickersPreload;
RecentStickerPack gRecentStickers;
@@ -79,92 +67,3 @@ int gOtherOnline = 0;
int32 gAutoDownloadPhoto = 0; // all auto download
int32 gAutoDownloadAudio = 0;
int32 gAutoDownloadGif = 0;
RecentEmojiPack &GetRecentEmoji() {
if (cRecentEmoji().isEmpty()) {
RecentEmojiPack result;
auto haveAlready = [&result](EmojiPtr emoji) {
for (auto &row : result) {
if (row.first->id() == emoji->id()) {
return true;
}
}
return false;
};
if (!cRecentEmojiPreload().isEmpty()) {
auto preload = cRecentEmojiPreload();
cSetRecentEmojiPreload(RecentEmojiPreload());
result.reserve(preload.size());
for (auto i = preload.cbegin(), e = preload.cend(); i != e; ++i) {
if (auto emoji = Ui::Emoji::Find(i->first)) {
if (!haveAlready(emoji)) {
result.push_back(qMakePair(emoji, i->second));
}
}
}
}
for (const auto emoji : Ui::Emoji::GetDefaultRecent()) {
if (result.size() >= kRecentEmojiLimit) break;
if (!haveAlready(emoji)) {
result.push_back(qMakePair(emoji, 1));
}
}
cSetRecentEmoji(result);
}
return cRefRecentEmoji();
}
EmojiPack GetRecentEmojiSection() {
const auto &recent = GetRecentEmoji();
auto result = EmojiPack();
result.reserve(recent.size());
for (const auto &item : recent) {
result.push_back(item.first);
}
return result;
}
void AddRecentEmoji(EmojiPtr emoji) {
auto &recent = GetRecentEmoji();
auto i = recent.begin(), e = recent.end();
for (; i != e; ++i) {
if (i->first == emoji) {
++i->second;
if (i->second > 0x8000) {
for (auto j = recent.begin(); j != e; ++j) {
if (j->second > 1) {
j->second /= 2;
} else {
j->second = 1;
}
}
}
for (; i != recent.begin(); --i) {
if ((i - 1)->second > i->second) {
break;
}
std::swap(*i, *(i - 1));
}
break;
}
}
if (i == e) {
while (recent.size() >= kRecentEmojiLimit) {
recent.pop_back();
}
recent.push_back(qMakePair(emoji, 1));
for (i = recent.end() - 1; i != recent.begin(); --i) {
if ((i - 1)->second > i->second) {
break;
}
std::swap(*i, *(i - 1));
}
}
UpdatesRecentEmoji.fire({});
}
rpl::producer<> UpdatedRecentEmoji() {
return UpdatesRecentEmoji.events();
}