From b02a965778fbd3fbf158a07e0cb1b2e7ba7ccedd Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 19 May 2022 17:25:59 +0400 Subject: [PATCH] Add premium sticker packs icon. --- .../Resources/icons/emoji/emoji_settings.png | Bin 765 -> 700 bytes .../icons/emoji/emoji_settings@2x.png | Bin 1496 -> 1477 bytes .../icons/emoji/emoji_settings@3x.png | Bin 2401 -> 2167 bytes .../icons/emoji/stickers_premium.png | Bin 0 -> 599 bytes .../icons/emoji/stickers_premium@2x.png | Bin 0 -> 1079 bytes .../icons/emoji/stickers_premium@3x.png | Bin 0 -> 1594 bytes .../Resources/icons/emoji/stickers_search.png | Bin 481 -> 643 bytes .../icons/emoji/stickers_search@2x.png | Bin 936 -> 983 bytes .../icons/emoji/stickers_search@3x.png | Bin 1382 -> 1830 bytes .../chat_helpers/chat_helpers.style | 4 +- .../chat_helpers/stickers_list_widget.cpp | 43 ++++++++++++++++-- Telegram/lib_ui | 2 +- 12 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 Telegram/Resources/icons/emoji/stickers_premium.png create mode 100644 Telegram/Resources/icons/emoji/stickers_premium@2x.png create mode 100644 Telegram/Resources/icons/emoji/stickers_premium@3x.png diff --git a/Telegram/Resources/icons/emoji/emoji_settings.png b/Telegram/Resources/icons/emoji/emoji_settings.png index ed8de446d6f77f7789172c0e49ac2fd636fc14d3..fa77adf096ea03500374ff19868265682c5bb741 100644 GIT binary patch delta 582 zcmV-M0=fPD1-u22fqy1RL_t(Y4egb^%Rx~b#~&UUl$4jjOAH2OAQ@#en~2R|A}fD^ z!9eC`z#s;(nGDLHSY%N)*Mewom4&idSTCG;U-!B%6+wFF>T4}Xf!oyfDm+SSqP$&QZ2KY`X zj+DV*K#9?4)ND2nheIxxyH+Q(PN&1d$Kw$IFu;&-6ygh&N+oR2WHJH30q|iel?o|f zfFa?-*tlM=KYyK0$z+mA_h(IR$Ye64 z^7;IDJf<1A2$D#pQo-m!LIYP@e6<(@)e#Yk9{^w^5`PH}fRW#GpKVbr7JIHmFCQ|5 zw;Pw-hUW7*`ony4!Cu0KPe5QA~Lf@bfXAI>-DvP^KZ*G4qN)iR}0s0HXh_)iw zXm7KvRj>&}N!o~|l~yh)s9>Y`K&_&Uwrb`2*nNg4y#lu=qHoO)6-M2SUl5vT4u3W*6a0jI)DAK3jm}bPdm?4JU%|o zW;2;gM)UwkL7rn5F-1b5@c#bZXf)PpHJwfu3z|XIgL!dpsUE6N!XKB=Y%u zHk<7uwaev#0Dm%wVS(`@`;^Z2<70HhoNEHJ{(;RT$0u~>lN=&V+2rBb=Py!^fk0Hh#kFR>6i%`W&x#u|V3kA?;5R^j*iBaw($EM{zk$Gf?? z@p`@cR)67kyO}Zu$!T`z98RZ`)+rQqn>zFW diff --git a/Telegram/Resources/icons/emoji/emoji_settings@2x.png b/Telegram/Resources/icons/emoji/emoji_settings@2x.png index ded23bc2ff2dea0189e94e2e16fcb1fab8e2857f..591d1164a3c1af55c55be8a35bf117e4ad707f13 100644 GIT binary patch delta 1365 zcmV-b1*-bk3&jhNfqySaL_t(&1?^c&C~a>PzaAlPc^6_tkv#LrBci+u6Y`f4MPZ;! z3`kKT69Xv|0|NtfMTi0Nih(y_fD(~HB#%7)zk64$_T77*bGCCf-P7HBuv_1H{MOoQ zukYLI`}U6?+NEVc%Yc>vEdyExv zhhq&33o9-zreSt=_T=Owi~b^_qoac|-QC?S4GT{3KrUS3vKR$5x>EPqRU7OJbOZ*Ol!hCEzcT!afX zBNk!R)zy)+=jUh8nVFdb0|W2x?+*_Tt*xz&j*cRI*`bGr2PX8>(-RC~4iG>AkdQ&k zTB*Rq`@O!tCO4>HMvRP%^zrfGp+dsX&o3$}ij@IK$Z+vhh1A>IOFj+{4{dC0*taSK z00B$*aDSu<<{u!guCDx+b8~b5kjV{D%1KE{|NXu|D5>ncygYgUIC61ukwZ0sS6*ID z=(Dr4`e7U#99mjhxY)=FLogxIZ#y?PNBVeh{hBP*xni&e5zfxeM69l^ibTR87SQG8 z<>uyQd?JK=48ep*c7Cccj`hB(s!F=vx3{;G0+z^zh6YvufgzYAg_+h;*RLd=MxY;$K``V964S4AM#` zF#*lb&xeGBTwPt!P`JGc3=AYDdLcwZwD1llM8sib8uF}|o}Na(B(yR}f9?SQheVBw`+xi1-rfX(7KpJ>T0~*?*;h?s(K0IAHviSjC@&P|`XQ^SsiBpwv$IoA z!J$*YCX+O!cZl@25&$PFxYOfBC{j9!@%16I*w|R1y@!vU< z_V)Inp`on&9a~B`)3vF`%)c6Vi7)`W%eZ+QrKP1bxRsR^R*D3e z2m`Rl^zEkCH-CCsES9jaFySJDHK(tyk6hi~-z)iicz7UFZ*OmEYAVCv3J&3xHO>-3 zLqof|x~{LUDUiFnyY21mQ&Ur4UtgrbeR_IYiGF;1oMG?p@1vumZEbCELQ1%Wb5JOC zcT^u37`U~y#UqdkudlCzgM&dqK}t*k0RjE}{cmq?(tp0J+1%U&k&*|8^jKJ!=Ire3 z?(UA85Ed5~WuILsC6Z@#bye6GuHcY0Gcz;NUXE&ti;IZ>*-~F$4|jfkevOTdSS#1o z*7EZ5>?J5EDcRZCL3cQTD|ByYXy8-?oxKj#@IF31M@L6A0pzg|imVVe?UhB@!Vd}P zKx(fyMSpx#QxlCID@<%`tRl`~1Du0`xIpT#KdS?8Z}0Q-b8?C`N59j^$jG183xfV$ zpdc=gf?9t^MPyM?5qUg5KBi<ERri1|lFqnwXd<3$t4}IXOw(xMSy+Erxq~dIU2&0(2l{ zlK}#@mG16tF6cWuJB3bDQc{Q;d7`ob!NiG#E>|0cvQotfd6t*F1_4>4Yh zob?b3mr)!~IcXWq&CP{#o`Ye_sBk00F5`I{Sxrq1MP*@OL6kP4CTaw{wsQy}pnv$m zCDZ_*SxSJ2x`0|lA#G|u#9R!^?mj|~*hlm8^HKh=62%WLZo&irV62f9m?$D5LKa}3 z()Hyu=1ISRG3B(!ztG_K^6XbiOaR-8(n~!`Woc2MKSxDtnzLT&F(8#=73};YBO^F} z)<13_@zydiF@fVCR~)O*$hca>6MrT>*uwgVb3#2O0FF{n6mnS#Z>~7l!W=Y@7BLij zgUQLsQTZv#%gcF@p`}K2cjD0^h9y1R#ok;|QE_;9$m5usn^T$qPOupUVS9TUr@4E3 zd!%&w;VutLdc2Oz86F;{am>%pGg2hLM3}3qtGc>6K2LYu@w#Y0!lqpxIAO}l%7lI0 zLe}$%i9Z2ydE)rcjr=I$*&q23%jD!_jxpuB^ltcPR>yxs8xOAk&~0Q2(NsM9uLd?h qhuJVAU`D`L~hKibCTZmXl#IkcCB7)#f zSAr$RLW+SHqJoOLup+1g#GWV?5Om{8ED=TBS+JndC^p1s?B9>?%H%Nj-Ff%Dckg@m z$z(O7dk&wu;& z4LV}}wYIh*fLP?a5(2=gs;b|=f5+rSD?|+85FkX@#UK!1VwGM4L0Do~*{Yu0q^*io5$^ytyHZQC9`d=y>tsMXz4Hyt+yi0!kP~FUfzWJU2I2`sS@$x0?HgfFcM* z)XnmN*R~JbqS@fwxpQT_)6~>tmX`u3&YnHnEFXAn@P8j9KRGtj0r%s)E`}S=r_QTa>{BPK>f#^<63MT<*I`;GDPpzD6X=$k$Q%OmQTMN1mA3ls( zt%{}rkbnMZXzoH=?ZJZwHN=K2%QpUneMXyptQ3n^ZEdX~+IBZ_;J|@cmNH#dQ&Z!{ z>Q!?2^5rpO#`uSf@Rci9ysWv)0ps6zIwYq|nIhLF5VOf7!1?v-mxi8r2gi{FCOq`w z#fzJpn>B+pK|?er%KizKqUckgO$lJ#rV zs#S5_jekG{kObLd$BvaMP=D{GGig5Q%a<=DteG=sW(G=54oyoW00Um8 zz<>O0cgvP75>rD%LuLUH3Q0V`%OoBmG(r*u=lF@mMtOO8KCKrO6{!iOEEp09qvF#zFyuDvD}N-&O3S2CK{2jz002YkR#sNV)qe_0 zVCc}H+8!O}I(_OC6FN&9eE%{WwYwwV>)Q_-#z*9EOLJN+y}_r4CHp6KzCp~cBKsT~PoixtHkCSG!N*_czDo)yKnP+pL4SR>I@RoV^-X#*t zJdv38>BzE2b1z{ILE#08hkp(oawExbpy=Le+`4sZ+O%oznI%iKz>@t0M?c!)O_st$ zw;D7J07+AZw;JpNC7Nh%R@qU@&y&`4RvdQ#G8Ix%TIPA4pxS=&|WfKkHE4V}uSH6gtTQI9)xHlqpY$Q2lJUw;NjGmH>xwWk-+ zJhbO#Aw&wyrnym(m*R|VuVWyy9aS6nwGTrnlh;0UOm4MV(d@;c`q+OHOnB{b0*9&# zr7KUUpR%&D&!0bQ?097(_XN-B9UFsSOzQu8DQW)^!(j2hq9V400000Ne4wvM6N<$g1~zCyZ`_I delta 2297 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 literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/emoji/stickers_premium@3x.png b/Telegram/Resources/icons/emoji/stickers_premium@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..9676bc9c55304955ae1a7e4f7a1fcd32f212a75b GIT binary patch literal 1594 zcmZ{kYdq5n7{~vcso5I2M&pAC8Hxt&FaAt}ZRC?S%mVfWX_~Tt)QT78ES9 zVe6ksB7mY?ZLNU1A?5F)02kQ^TAzrWpBZFt5J0L1U$ahC365UdQ~n&cU^{;1<3+<=8Kzk0))BI^EtLj2bF7k0O>9{2E({;54jqLhFAN zvDNXIBr+4{S6`>fX0sU#hMB5bO0o7vdS!TcxRjJs+ho8|x^k0O^6hCT zT3`PspKpK%MUEEUTi3BNHEo@k@VVa8tA@iwQ(=<+#baY*sOVjUVQK7!PEK{T&Xr^> zZS5qOq;Ijmzkg|IsRGDyXJK12)`Bpjm08)+-u|tQ=|&&~2B7BRX6EMNlafg1*A(T- zBogIIniG`d<0M~`oSdAj8iqH{*EW=ts63ktaHd(P4<=b+bam}zRA`Yz;&kV3GyE=D zS=mDXQ$GFt1o!!i7dd7VbjTZ6Sd3~X8Tk0|qfjV(_E|#nFF5>*&u|ri`jA%nC@bsr zV&_f|sDwoS;2`}~p`vJFet2R+!c{PX%MGpL3j}8~1GAeW0e?in&6_uKbEml60WlED z(a{n0k4sH_VxrMBE5+2 z0Fzfxa0M?9o(l;?uzT4UPQ# z{N<}q?@R{cX-i90a?k1frKP2wo*tCp0+-7b2;`i)m`vvCYV3R*9*>uRLJc+#Ulzw` z(G9%tGSQ=N-uRz;SNu9H()bD?>h8qE#8QoltSrs>;9Ucgp`oEo;RQblhOpwv#o{*6 znmRgendW&N%W5%XWM<;Ss*s5%5%{kxPbGNVuCo(qXtqn6$zdZS|5U}^lfJ%QUdum! z=5wko1R5xmLBq9f_1^Bc%F4>_niAIe^)%XXDs@vJXqtm2r(0rB`(eSKXTJ9I3R^iE<6N=gV_7`6kMLSc`Ns!jSGvI|XXw*S*P z_40+FRb39*H*zRrs_r?9g*kA*#>OV+NOonx zjT>6^%)kyq>UdE@}Ds48C!V0rL*uiw~th`040+TNX zgTZF$H5=woZm@U*VqbP;W##p%VCxw^|5_Y9xKwn9A)4eXRJ8#-^3t#cu`y3*gZtu2 z&giGkqPj1R>r$-~j6CQ{nAS5C-fa9l>JleB526@Z>1Hw8(Si-3ofrBp3S*_Kw4Zu`=y1o#{0> zIWp={Cd9iNjYdPaG608JcqUYnLZN6SjO11|H4$bXKZFz!gzM{fd_!i-^H{uxcF5r} z=9I%;J=|%WuerK9^U)u{^PG?S%yTZon4ihOUm5tJ z7I3*-sZ=VFNO-;8)9Eyu&D!nucs!;i>H_5R`NQGxd_K3^?SE)Anog(J>lJ3N*JD{$ zR|ySJwOU23$z&3b$0eBC?Jk$gx7%&A*#v_@$^Z2Mv!i;gRf~@Zyx;HV^SQ&} zP)F$=@D64$JF)sZKaNnOFQ-Ou9EW5%GinSx!{JaAMPi8Jtk>)Ks}vB!6pKa7 z;rIJBkiW#3&wuAzuh+zo+__qvp>u7_AU?725>8e*(2yt;gdLjYdBK zD1N*I*i~#3^sazn_D-jRE8d8S5$N@bHg@PWu5scMp1!?FZ2!fG(Jvr#nY&IK>h90nqF&X%G47>o{MBk|=Mr^tO P0000g6 delta 361 zcmV-v0ha!Q1>pmbfqzR$L_t(Y4egXWj)O21MZ*ZFQm_LGSOJ@W0veW(DiYgaBWNgK z53>VkDCp^dWR9>jih?mHB+Up{_PfXL+1H=b>1c-odmYf!2@Jysg24BE+qNN_rYXy^ zD2l%C)e|?Vq^_#!e!q8J_cJv*3<)A_N}+&~BpJuCZQD4Gb$?wKBprqXkpL9aS0oll ziagIP%bKGEkpN!Y2fkwh%ampp^^gF-fafb%i9}I^(O9A80KkCNm_$v}l*9biW>tPt?(qjYwOkCf`_)}j};E7NSHErb?F;`N6*W|kH7KT(4u3l97OouT9rqYqiu00000NkvXX Hu0mjfX!5J- diff --git a/Telegram/Resources/icons/emoji/stickers_search@2x.png b/Telegram/Resources/icons/emoji/stickers_search@2x.png index 25bf885bfe6fe56652e2a3270735a65414bffe3d..fedddd5a50d3571053533e1c27015ff667c5ef1c 100644 GIT binary patch delta 867 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 Qg8%>k07*qoM6N<$f*j*7EC2ui delta 1270 zcmZ3+_l#>oLp{p{PZ!6K3dXmyt@U*SMH&J<1v>d!y_8f!Oq5n|W=*~3AJE~ac;(6? z_61iKTo;g%Qd#Hn@ULIN{yUT3tXWh1Zsv2jW0A{m8E>9<|IPI`d;LSF{_SZHG+=T& zz#+k?oWO#~N#qP^7xnR9w``o{Qmfbhx0NsGjnrgWn^;l^YvGj78DqmnU$55g?-ALm&eD$ z6B8RNdcAM);>9y(&OCSS+^3TY4HAcriWzi&{PfEH@5?7op8Wp3`_$V%e`>O_RxMkm zR`Z2panmBBuiw74b$=+Uo2Ifp{Nlptb7#+9y>@M{c)do~iq&><;yc&4f3aSbdiVbQ z{=U9r&dOU2nlvM)7EIZ^uvamyzCQk0K~>eQt5;P&`ve^mVOv^zr}psf5+lwPqNscqN!z|HNUxYvV1w=hh{XE4Qq96l0+MTY1j2#S0B@PQBWmx7A|%mUjs; zzYdi~O{=~6u-J27eJIaeap zw#ISGpT0i6^m(E@;pY}8+!buQo~NOvAXOh5J2&~@uRiVcfC=w7oXc8QR`+vu*m6p8 zE$-a&B{u9`h{4OMe$Evek{>$-3hw?rkL%Q2F16U@hKwr}_IzVHB|bfJS2t(JT|3F` z*W(_|g9LZoOJ+)1{^RA#ldXs5wLt7^PB1Ev zy4mV0!aN~2H`kK$+h(TiC36Z6G4(z9Hj_tr;nPX43};Jh1E#X2M?ZcnME2&!X_9My ztNohxl#l5|(TV;u9mW!T0|KmOD7P`p%7(iyuA|u!%mO&0jc4vD^9&6MrEvks3YE%E>7Sm^XjEyPF#@ zE#H}YM?~Vf#P6pY>m{yREfRZTn85e&{=Iu%+?ILSdwh;b-P@TZWwiHGsz_is^R@hB z7PWoXEt(J7xm3!0(mb@{&-;wi`Y9}GVyYfGYwb6uoYeU1XSHEDi`Z=;&i{O@%GZQK z=bts)`}XbI0}NWO3sP)PrM)@No0Kf_XI0NcLoPJ|oy4yvBv^$xrfK9y_W%0*yV+FR zebJ1I4<9BzT_Ud)eDnn{H%^Iizopr0F3cuL;wH) diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style index d5c19ccbae..98a78b0430 100644 --- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style +++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style @@ -94,9 +94,9 @@ stickersTrendingUnread: icon { { "emoji/stickers_add_unread", emojiIconFg }, { "emoji/stickers_add_dot", dialogsUnreadBg } }; -stickersRecent: icon {{ "emoji/stickers_recent", emojiIconFg }}; +stickersRecent: icon {{ "emoji/emoji_recent", emojiIconFg }}; stickersSearch: icon {{ "emoji/stickers_search", emojiIconFg }}; -stickersPremium: icon {{ "emoji/stickers_search", emojiIconFg }}; +stickersPremium: icon {{ "emoji/stickers_premium", emojiIconFg }}; stickersSettingsUnreadSize: 6px; stickersSettingsUnreadPosition: point(6px, 10px); diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp index f260abc40c..9a1d5986be 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp @@ -184,6 +184,7 @@ private: bool paused) const; void paintSelectionBar(Painter &p) const; void paintLeftRightFading(Painter &p) const; + void validatePremiumIcon() const; void initSearch(); void toggleSearch(bool visible); @@ -204,6 +205,7 @@ private: bool _iconsDragging = false; Ui::Animations::Basic _iconsAnimation; QPoint _iconsMousePos, _iconsMouseDown; + mutable QImage _premiumIcon; int _iconsLeft = 0; int _iconsRight = 0; int _iconsTop = 0; @@ -327,6 +329,36 @@ StickersListWidget::Footer::Footer( ) | rpl::start_with_next([=] { update(); }, lifetime()); + + style::PaletteChanged( + ) | rpl::start_with_next([=] { + _premiumIcon = QImage(); + }, lifetime()); +} + +void StickersListWidget::Footer::validatePremiumIcon() const { + if (!_premiumIcon.isNull()) { + return; + } + const auto size = st::stickersPremium.size(); + const auto mask = st::stickersPremium.instance(Qt::white); + const auto factor = style::DevicePixelRatio(); + _premiumIcon = QImage( + size * factor, + QImage::Format_ARGB32_Premultiplied); + _premiumIcon.setDevicePixelRatio(factor); + + QPainter p(&_premiumIcon); + auto gradient = QLinearGradient( + QPoint(0, size.height()), + QPoint(size.width(), 0)); + gradient.setStops({ + { 0., st::stickerPanPremium1->c }, + { 1., st::stickerPanPremium2->c }, + }); + p.fillRect(QRect(QPoint(), size), gradient); + p.setCompositionMode(QPainter::CompositionMode_DestinationIn); + p.drawImage(QRect(QPoint(), size), mask); } void StickersListWidget::Footer::clearHeavyData() { @@ -1037,6 +1069,13 @@ void StickersListWidget::Footer::paintSetIcon( _iconsTop + (st::emojiFooterHeight - size) / 2, width(), st::stickerGroupCategorySize); + } else if (icon.setId == Data::Stickers::PremiumSetId) { + validatePremiumIcon(); + const auto size = st::stickersPremium.size(); + p.drawImage( + info.left + (st::stickerIconWidth - size.width()) / 2, + _iconsTop + (st::emojiFooterHeight - size.height()) / 2, + _premiumIcon); } else { const auto paintedIcon = [&] { if (icon.setId == Data::Stickers::FeaturedSetId) { @@ -1044,12 +1083,10 @@ void StickersListWidget::Footer::paintSetIcon( return session->data().stickers().featuredSetsUnreadCount() ? &st::stickersTrendingUnread : &st::stickersTrending; - } else if (icon.setId == Data::Stickers::PremiumSetId) { - return &st::stickersPremium; //} else if (setId == Stickers::FavedSetId) { // return &st::stickersFaved; } - return &st::stickersRecent; + return &st::emojiRecent; }(); paintedIcon->paint( p, diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 21a7adc03c..9c09b1fad0 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 21a7adc03c0bb256b1dac8281fe1ca76c4296aa7 +Subproject commit 9c09b1fad07d5048b55a1dfcb27c7d1a585bba55