From d15af0c5f08d99ed589cd9b0c04a73accc4bb13f Mon Sep 17 00:00:00 2001 From: John Preston Date: Sun, 13 Feb 2022 19:18:29 +0300 Subject: [PATCH] Use red chats list badge for unread reactions. --- .../icons/dialogs/dialogs_reaction.png | Bin 340 -> 341 bytes .../icons/dialogs/dialogs_reaction@2x.png | Bin 565 -> 533 bytes .../icons/dialogs/dialogs_reaction@3x.png | Bin 814 -> 787 bytes .../SourceFiles/dialogs/ui/dialogs_layout.cpp | 18 +++++++++++++++++- .../SourceFiles/dialogs/ui/dialogs_layout.h | 1 + 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Telegram/Resources/icons/dialogs/dialogs_reaction.png b/Telegram/Resources/icons/dialogs/dialogs_reaction.png index 1ea3423d298c12b4153be45a9c4e0dc437b54dee..25ac8ccd1ed2e9a4e46fc8052944ede609236c0b 100644 GIT binary patch delta 220 zcmV<203-j@0@VVLfq%bAL_t(I5$#Yr4udcZjoLXo86!o^aDyz6D`emROdOI6a0C{Z zP*{Q#B};1+DWMjE1GFA2zn?9ckbhl&;E7}*MAI~Ro{!@gLZFmtt)-O4m~~x|IYFhA z_x|;%Wm&qegT6!HK}}XP4a2bePCKZ`pJ2Rjnglgj33(hr-&OZVh~_JmbG~ic=|SK@ zMZ3Nryumq#!oXa;CoZU}%32%4FxPb*)tjLxifNi4JkN7kmN#xBXIa*^En^JvKL_6@ WZo5q0000GU03)>=~;Q6TWfc3 z&GYP?cBJSKa9!7akJRX#WOAwG(x(}SgzOYWv27c9)nOv#oKy$1p2xOrZ%8R6jloUR zRBKJbecvN}Ng~LyY#4?B9>)>>9d=}lF{RWAcU=ePJ$5wWI2J*rYTH()}ETHBe> z@d<=%qaA9ZKro?&O84&45Qd90uHDX5!@1`nhe0|WzIX$?0p0*_;HQDnXk=Md7>0SC zUoMyRdaY?%wHjU5H=9iqMMY5@kH_V5IUEkF1h)NrKF_l3L4U06cH8gwMNxzeF?@go zgltJA8}6?$ugv)RU1VN~fDq)&sn93pNQ0ZE$s7sKkH#9~fEh*e!w9iHqz%)&<5e3JTep}}8~!wYx6-?2y4j)QPEo6-ETI>&LGc57_9 zTCM6{l-KaG?|=7u%ooEChXV*HBN}Mq@%VbZV(ugkWLcIQjF_P5bQ;Go=}sa^lBlZ6 zWR8**MLC^LWJVP^pU;!Y1hsf!AW4$%`_+ubGSbtM=UaeML*S+Tkum^(y zaTyMW5avqmAOv|)5~&kK(Q%x-SDN|x8)=xI%w{t%K~Q_WUfu<(j508xBI)hMy#}hWAUrdnBiHNo6CXr+v)NFq=}6nQsnw_?&ZOCF-flO>dwRJ9 z@>Z*b+M+NXkAGkKG72V>362NV<#KtkSTIZ(OUvaFxs!orpvvDvuJ0NN7Z*K`6WuuYzxXn@uLZ`;BpT<}TUIokH&8{LVRZGVa_vA0PCh z3D5*+0yF`d08M}7_xrco?Gcq&EOxuy zfY)d=m&;{19Co|i z9$-W8#JV<{Z9E<$s`p)R5DW$xy-+B$-|z1MNE_I!Rx5)i)-V_h%jFUg``(2oA(cvr zL?ZZw_ICg>0)L!(y`GrM-$boe3z6aIPN!3jS!4>BNqY79e24(qF7V^n72$xQ(I^g# zHzpE^;M8Jyb-7$PT)Z)u{8;Pj>2#7xrM#^?Ed+kKT>cb>mFs4+c}gS%u-$HP%CWr8 zW-}Zv-WYh5;M8Jyt=H=~T)Z(P`5g`i*+mLrgRKJZ`+sC9ER{-#0I6=dTxQV|GGsQJ z&*w8Ke+&ukOAHZ&1RE`UD&ex z)%VMH4wF>9Tdy?0+;jEI&fq$4uL_t(&1?^Z*i+NEP=7){M1`EYnN@BrAS;*dkSj?D}%oI!V z1xP-CrM)#)N{VDftY(K&GJ}Zn-^^P|6Yja^xM%aLV{yCQ_kI4{$Gy%$Bw{a?084-+ zz!G2yumo5FECH4PNdj`YJQ|G_i^cJHyj(7)(`mh4&tx(di+=?{W3^hd*=(cHn9t{{ z)oL=CluD&oECy@{l%Q596atwaj#sr>wcG7C0uG0xR;zI!et_-u_4NiK^sQJdhG4iP zul3XEluD(fQYq-cF`Z6B<=W*s0cPMAYVnGX$KzZ|_jR~KR4Nr5?^|3I;J<1KI(W6W#?C&_eU@cr_Z0XgtL(uNIG2_{b=_K~wQ+@p%3E`a%m(?0$cLquF@8etv$U z@f5ohwEF!%*TYM(J{SymFPkSjAHZ%VJ%!_FGt0p{dvHZvFucos;e+-~=7x5G4n zGX~o$kH5eC!dW(A~;rfXFfhY$i>MK;c!?;y65xx{r#O> z_F2Ts%YV!9c;pT5egIH!Z*R}aK8y2uy_?PE-VLI%-EMt8-?M_ka89Qae)1#C{cXYG z=W@A(2?|4-Os3&*_}A0J^U-KzHk*Y>(Ln2Tx^}z$(Bh@o>-AtMp&>);NuqY4+bTT@f^?KdycIp3DMbRjuVhOMWSOP2o fmHe00000NkvXXu0mjfg$h{o 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 };