diff --git a/Telegram/Resources/icons/dialogs/dialogs_reaction.png b/Telegram/Resources/icons/dialogs/dialogs_reaction.png index 1ea3423d2..25ac8ccd1 100644 Binary files a/Telegram/Resources/icons/dialogs/dialogs_reaction.png and b/Telegram/Resources/icons/dialogs/dialogs_reaction.png differ diff --git a/Telegram/Resources/icons/dialogs/dialogs_reaction@2x.png b/Telegram/Resources/icons/dialogs/dialogs_reaction@2x.png index 8e8a802df..cc22d2386 100644 Binary files a/Telegram/Resources/icons/dialogs/dialogs_reaction@2x.png and b/Telegram/Resources/icons/dialogs/dialogs_reaction@2x.png differ diff --git a/Telegram/Resources/icons/dialogs/dialogs_reaction@3x.png b/Telegram/Resources/icons/dialogs/dialogs_reaction@3x.png index a5754543a..a93e9a58c 100644 Binary files a/Telegram/Resources/icons/dialogs/dialogs_reaction@3x.png and b/Telegram/Resources/icons/dialogs/dialogs_reaction@3x.png differ diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp index 00129ce93..d4078abbd 100644 --- a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp +++ b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp @@ -129,6 +129,9 @@ void PaintNarrowCounter( - st::dialogsUnreadHeight; UnreadBadgeStyle st; + st.sizeId = displayMentionBadge + ? UnreadBadgeInDialogs + : UnreadBadgeReactionInDialogs; st.active = active; st.selected = selected; st.muted = mentionOrReactionMuted; @@ -221,6 +224,9 @@ int PaintWideCounter( - (st::dialogsUnreadHeight - st::dialogsUnreadFont->height) / 2; UnreadBadgeStyle st; + st.sizeId = displayMentionBadge + ? UnreadBadgeInDialogs + : UnreadBadgeReactionInDialogs; st.active = active; st.selected = selected; st.muted = mentionOrReactionMuted; @@ -618,6 +624,14 @@ public: st::dialogsUnreadBgMutedOver, st::dialogsUnreadBgMutedActive }; + style::color reactionBg[6] = { + st::dialogsDraftFg, + st::dialogsDraftFgOver, + st::dialogsDraftFgActive, + st::dialogsUnreadBgMuted, + st::dialogsUnreadBgMutedOver, + st::dialogsUnreadBgMutedActive + }; rpl::lifetime lifetime; }; Data::GlobalStructurePointer unreadBadgeStyle; @@ -660,7 +674,9 @@ void PaintUnreadBadge(Painter &p, const QRect &rect, const UnreadBadgeStyle &st) Assert(st.sizeId < UnreadBadgeSizesCount); badgeData = &unreadBadgeStyle->sizes[st.sizeId]; } - auto bg = unreadBadgeStyle->bg[index]; + auto bg = (st.sizeId == UnreadBadgeReactionInDialogs) + ? unreadBadgeStyle->reactionBg[index] + : unreadBadgeStyle->bg[index]; if (badgeData->left[index].isNull()) { int imgsize = size * cIntRetinaFactor(), imgsizehalf = sizehalf * cIntRetinaFactor(); createCircleMask(badgeData, size); diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.h b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.h index eac461560..76377c708 100644 --- a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.h +++ b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.h @@ -68,6 +68,7 @@ enum UnreadBadgeSize { UnreadBadgeInStickersPanel, UnreadBadgeInStickersBox, UnreadBadgeInTouchBar, + UnreadBadgeReactionInDialogs, UnreadBadgeSizesCount };