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

More robust effect icon loading.

Browse source
This commit is contained in:
John Preston 2024-05-14 13:07:37 +04:00
parent 732b67ca04
commit ec5d8b7373
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Telegram/SourceFiles/data/data_message_reactions.cpp
View file

@ -584,15 +584,14 @@ void Reactions::preloadImageFor(const ReactionId &id) {
} }
auto &set = _images.emplace(id).first->second; auto &set = _images.emplace(id).first->second;
set.effect = (id.custom() != 0); set.effect = (id.custom() != 0);
const auto i = set.effect auto &list = set.effect ? _effects : _available;
? ranges::find(_effects, id, &Reaction::id) const auto i = ranges::find(list, id, &Reaction::id);
: ranges::find(_available, id, &Reaction::id); const auto document = (i == end(list))
const auto document = (i == end(set.effect ? _effects : _available))
? nullptr ? nullptr
: i->centerIcon : i->centerIcon
? i->centerIcon ? i->centerIcon
: i->selectAnimation.get(); : i->selectAnimation.get();
if (document || (set.effect && i != end(_effects))) { if (document || (set.effect && i != end(list))) {
if (!set.effect || i->centerIcon) { if (!set.effect || i->centerIcon) {
loadImage(set, document, !i->centerIcon); loadImage(set, document, !i->centerIcon);
} else { } else {
@ -656,11 +655,13 @@ QImage Reactions::resolveEffectImageFor(EffectId id) {
} }
QImage Reactions::resolveImageFor(const ReactionId &id) { QImage Reactions::resolveImageFor(const ReactionId &id) {
const auto i = _images.find(id); auto i = _images.find(id);
if (i == end(_images)) { if (i == end(_images)) {
preloadImageFor(id); preloadImageFor(id);
i = _images.find(id);
Assert(i != end(_images));
} }
auto &set = (i != end(_images)) ? i->second : _images[id]; auto &set = i->second;
set.effect = (id.custom() != 0); set.effect = (id.custom() != 0);
const auto resolve = [&](QImage &image, int size) { const auto resolve = [&](QImage &image, int size) {