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

Correctly show flying custom reactions.

Browse source
This commit is contained in:
John Preston 2022-08-30 10:52:42 +04:00
parent ad0c9ebb79
commit a3c110dafa
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Telegram/SourceFiles/history/view/reactions/history_view_reactions_animation.cpp
View file

@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/view/history_view_element.h" #include "history/view/history_view_element.h"
#include "history/view/history_view_bottom_info.h" #include "history/view/history_view_bottom_info.h"
#include "ui/text/text_custom_emoji.h"
#include "ui/animated_icon.h" #include "ui/animated_icon.h"
#include "data/data_message_reactions.h" #include "data/data_message_reactions.h"
#include "data/data_session.h" #include "data/data_session.h"
@ -33,11 +34,13 @@ Animation::Animation(
, _flyFrom(args.flyFrom) { , _flyFrom(args.flyFrom) {
const auto &list = owner->list(::Data::Reactions::Type::All); const auto &list = owner->list(::Data::Reactions::Type::All);
auto centerIcon = (DocumentData*)nullptr; auto centerIcon = (DocumentData*)nullptr;
auto centerIconSize = size;
auto aroundAnimation = (DocumentData*)nullptr; auto aroundAnimation = (DocumentData*)nullptr;
if (const auto customId = args.id.custom()) { if (const auto customId = args.id.custom()) {
const auto document = owner->owner().document(customId); const auto document = owner->owner().document(customId);
if (document->sticker()) { if (document->sticker()) {
centerIcon = document; centerIcon = document;
centerIconSize = Ui::Text::AdjustCustomEmojiSize(st::emojiSize);
} }
} else { } else {
const auto i = ranges::find(list, args.id, &::Data::Reaction::id); const auto i = ranges::find(list, args.id, &::Data::Reaction::id);
@ -65,7 +68,8 @@ Animation::Animation(
return true; return true;
}; };
_flyIcon = std::move(args.flyIcon); _flyIcon = std::move(args.flyIcon);
if (!resolve(_center, centerIcon, size)) { _centerSizeMultiplier = centerIconSize / float64(size);
if (!resolve(_center, centerIcon, centerIconSize)) {
return; return;
} }
resolve(_effect, aroundAnimation, size * 2); resolve(_effect, aroundAnimation, size * 2);
@ -84,7 +88,7 @@ QRect Animation::paintGetArea(
QPoint origin, QPoint origin,
QRect target) const { QRect target) const {
if (_flyIcon.isNull()) { if (_flyIcon.isNull()) {
p.drawImage(target, _center->frame()); paintCenterFrame(p, target);
const auto wide = QRect( const auto wide = QRect(
target.topLeft() - QPoint(target.width(), target.height()) / 2, target.topLeft() - QPoint(target.width(), target.height()) / 2,
target.size() * 2); target.size() * 2);
@ -105,19 +109,31 @@ QRect Animation::paintGetArea(
anim::interpolate(from.width(), target.width(), progress), anim::interpolate(from.width(), target.width(), progress),
anim::interpolate(from.height(), target.height(), progress)); anim::interpolate(from.height(), target.height(), progress));
const auto wide = rect.marginsAdded(margins); const auto wide = rect.marginsAdded(margins);
auto hq = PainterHighQualityEnabler(p);
if (progress < 1.) { if (progress < 1.) {
p.setOpacity(1. - progress); p.setOpacity(1. - progress);
p.drawImage(rect, _flyIcon); p.drawImage(rect, _flyIcon);
} }
if (progress > 0.) { if (progress > 0.) {
p.setOpacity(progress); p.setOpacity(progress);
p.drawImage(wide, _center->frame()); paintCenterFrame(p, wide);
} }
p.setOpacity(1.); p.setOpacity(1.);
return wide; return wide;
} }
void Animation::paintCenterFrame(QPainter &p, QRect target) const {
const auto size = QSize(
int(base::SafeRound(target.width() * _centerSizeMultiplier)),
int(base::SafeRound(target.height() * _centerSizeMultiplier)));
p.drawImage(
QRect(
target.x() + (target.width() - size.width()) / 2,
target.y() + (target.height() - size.height()) / 2,
size.width(),
size.height()),
_center->frame());
}
int Animation::computeParabolicTop( int Animation::computeParabolicTop(
int from, int from,
int to, int to,

2
Telegram/SourceFiles/history/view/reactions/history_view_reactions_animation.h
View file

@ -44,6 +44,7 @@ private:
void startAnimations(); void startAnimations();
void callback(); void callback();
int computeParabolicTop(int from, int to, float64 progress) const; int computeParabolicTop(int from, int to, float64 progress) const;
void paintCenterFrame(QPainter &p, QRect target) const;
const not_null<::Data::Reactions*> _owner; const not_null<::Data::Reactions*> _owner;
Fn<void()> _repaint; Fn<void()> _repaint;
@ -52,6 +53,7 @@ private:
std::unique_ptr<Ui::AnimatedIcon> _effect; std::unique_ptr<Ui::AnimatedIcon> _effect;
Ui::Animations::Simple _fly; Ui::Animations::Simple _fly;
QRect _flyFrom; QRect _flyFrom;
float64 _centerSizeMultiplier = 0.;
bool _valid = false; bool _valid = false;
mutable std::optional<int> _cachedKey; mutable std::optional<int> _cachedKey;