diff --git a/Telegram/SourceFiles/data/data_message_reaction_id.h b/Telegram/SourceFiles/data/data_message_reaction_id.h index f8935e380..ed25fc721 100644 --- a/Telegram/SourceFiles/data/data_message_reaction_id.h +++ b/Telegram/SourceFiles/data/data_message_reaction_id.h @@ -25,7 +25,6 @@ struct ReactionId { return custom ? *custom : DocumentId(); } }; -Q_DECLARE_METATYPE(ReactionId); inline bool operator<(const ReactionId &a, const ReactionId &b) { return a.data < b.data; @@ -38,3 +37,5 @@ inline bool operator==(const ReactionId &a, const ReactionId &b) { [[nodiscard]] MTPReaction ReactionToMTP(ReactionId id); } // namespace Data + +Q_DECLARE_METATYPE(Data::ReactionId); diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp index ae49ae209..58c4c5cb7 100644 --- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp +++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp @@ -161,8 +161,7 @@ Selector::Selector( std::move(iconFactory)) , _size(st::reactStripSize) , _skipx(countSkipLeft()) -, _skipy((st::reactStripHeight - st::reactStripSize) / 2) -, _skipBottom(st::reactStripHeight - st::reactStripSize - _skipy) { +, _skipy((st::reactStripHeight - st::reactStripSize) / 2) { setMouseTracking(true); parentController->content()->alive( diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h index 754f551ea..ebeb2bc5b 100644 --- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h +++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h @@ -132,7 +132,6 @@ private: int _columns = 0; int _skipx = 0; int _skipy = 0; - int _skipBottom = 0; int _pressed = -1; bool _appearing = false; bool _toggling = false; diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.h b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.h index c607dbf0d..9821de5bc 100644 --- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.h +++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.h @@ -82,8 +82,6 @@ private: static constexpr auto kFramesCount = Ui::RoundAreaWithShadow::kFramesCount; - using ReactionId = ::Data::ReactionId; - struct ReactionDocument { std::shared_ptr media; std::shared_ptr icon;