RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow disabling animated emoji.

This commit is contained in:
John Preston 2019-08-02 11:52:35 +01:00
parent 93a52bb66e
commit fd59147b8a
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp
View File

@ -30,6 +30,13 @@ EmojiPack::EmojiPack(not_null<Main::Session*> session) : _session(session) {
}) | rpl::start_with_next([=](not_null<const HistoryItem*> item) { }) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
remove(item); remove(item);
}, _lifetime); }, _lifetime);
session->settings().largeEmojiChanges(
) | rpl::start_with_next([=] {
for (const auto &[emoji, document] : _map) {
refreshItems(emoji);
}
}, _lifetime);
} }
bool EmojiPack::add(not_null<HistoryItem*> item, const QString &text) { bool EmojiPack::add(not_null<HistoryItem*> item, const QString &text) {
@ -65,7 +72,7 @@ bool EmojiPack::remove(not_null<const HistoryItem*> item) {
} }
DocumentData *EmojiPack::stickerForEmoji(not_null<HistoryItem*> item) { DocumentData *EmojiPack::stickerForEmoji(not_null<HistoryItem*> item) {
if (!item->isSingleEmoji()) { if (!item->isSingleEmoji() || !_session->settings().largeEmoji()) {
return nullptr; return nullptr;
} }
auto length = 0; auto length = 0;

7
Telegram/SourceFiles/history/history_widget.cpp
View File

@ -482,6 +482,13 @@ HistoryWidget::HistoryWidget(
} }
}, lifetime()); }, lifetime());
session().settings().largeEmojiChanges(
) | rpl::start_with_next([=] {
crl::on_main(this, [=] {
updateHistoryGeometry();
});
}, lifetime());
session().data().animationPlayInlineRequest( session().data().animationPlayInlineRequest(
) | rpl::start_with_next([=](not_null<HistoryItem*> item) { ) | rpl::start_with_next([=](not_null<HistoryItem*> item) {
if (const auto view = item->mainView()) { if (const auto view = item->mainView()) {