From dfc0491524e29e08896b1fc67e5127a3845edff1 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 20 Apr 2020 16:24:29 +0400 Subject: [PATCH] Improve trending stickers layout and position. --- Telegram/Resources/icons/emoji_trending.png | Bin 763 -> 0 bytes .../Resources/icons/emoji_trending@2x.png | Bin 1629 -> 0 bytes .../Resources/icons/emoji_trending@3x.png | Bin 2548 -> 0 bytes Telegram/Resources/icons/stickers_add.png | Bin 173 -> 506 bytes Telegram/Resources/icons/stickers_add@2x.png | Bin 120 -> 1065 bytes Telegram/Resources/icons/stickers_add@3x.png | Bin 145 -> 1648 bytes Telegram/Resources/icons/stickers_add_dot.png | Bin 0 -> 204 bytes .../Resources/icons/stickers_add_dot@2x.png | Bin 0 -> 342 bytes .../Resources/icons/stickers_add_dot@3x.png | Bin 0 -> 522 bytes .../Resources/icons/stickers_add_unread.png | Bin 0 -> 535 bytes .../icons/stickers_add_unread@2x.png | Bin 0 -> 1123 bytes .../icons/stickers_add_unread@3x.png | Bin 0 -> 1727 bytes Telegram/Resources/icons/stickers_recent.png | Bin 0 -> 527 bytes .../Resources/icons/stickers_recent@2x.png | Bin 0 -> 1093 bytes .../Resources/icons/stickers_recent@3x.png | Bin 0 -> 1748 bytes .../chat_helpers/chat_helpers.style | 11 +++-- .../chat_helpers/stickers_list_widget.cpp | 44 ++++++------------ 17 files changed, 22 insertions(+), 33 deletions(-) delete mode 100644 Telegram/Resources/icons/emoji_trending.png delete mode 100644 Telegram/Resources/icons/emoji_trending@2x.png delete mode 100644 Telegram/Resources/icons/emoji_trending@3x.png create mode 100644 Telegram/Resources/icons/stickers_add_dot.png create mode 100644 Telegram/Resources/icons/stickers_add_dot@2x.png create mode 100644 Telegram/Resources/icons/stickers_add_dot@3x.png create mode 100644 Telegram/Resources/icons/stickers_add_unread.png create mode 100644 Telegram/Resources/icons/stickers_add_unread@2x.png create mode 100644 Telegram/Resources/icons/stickers_add_unread@3x.png create mode 100644 Telegram/Resources/icons/stickers_recent.png create mode 100644 Telegram/Resources/icons/stickers_recent@2x.png create mode 100644 Telegram/Resources/icons/stickers_recent@3x.png diff --git a/Telegram/Resources/icons/emoji_trending.png b/Telegram/Resources/icons/emoji_trending.png deleted file mode 100644 index 57f76185ee2889c30906bd0b3bffbd094e5b4e8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 763 zcmV6vuxn*;q;` z%~HxjCL0#Yg7kk^^W?f_e7;US-R}9HbAIUGa{RQO9phzUb^z<}^g@xaO z=`$-5iRiVpwY7aJ@74NT;NISzBx!MR(ZEJVMt&FM^Z871kH@2_sVVawjYfYDWLcIZ zX<}l+_yz|D4QzIH_UE8bC}axe=jYqB&dyGw&CSjI479tuD@ht3AAeVGZ*MoS$;rv@ zf#&DuB}wb+>lr_$tElon zDJgOImzI_?wa^I~8XA%$t*x!S3rSf|PmfLW`~609yWN>VuXj^jU7fK-@3m=rds~v! z+S+RKJ7!%&LjwSZhliY;oV=9@27>@>Y-|9~-`{W34-O6h2#3RtTpKwSi%F9D`uZ}S zT}@4mBq@L`-U3iiP+)ux(DU;%06951AA+u~t^g=1 zDze4p=H>$M@bHixbb5LUKp+sX`Q2_eO-)Sz93LM8@bdBkKz4SviSu|o6c-l*aD9E9 z9<;o?3^;F7V`C!#@pzoa$43D2^6~(w_;W+gD{e4N2Wm(1- zkH;lREiEm^x4OD2N$T$I7NF+lW^*g+>gqn84B>FtBv_WEg@px4(#pz;E$-stLXuQk zTB^~}QInJAm+}6P?CtH!JKEgbRBdgoLytzI ty1Tp6<>jSfv6w0=E7R6;rD*@#{sCtBLjeV)y{G^H002ovPDHLkV1guVZ#Dn` diff --git a/Telegram/Resources/icons/emoji_trending@2x.png b/Telegram/Resources/icons/emoji_trending@2x.png deleted file mode 100644 index 64a1d505c7a00eb3432191a96b917a9fca5b5f0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1629 zcmV-j2BP_iP)P6u^(`vXoNjT57vWxYVZBsw7J(_7Vss;e%}Whg{IGmkJSllHQ`%5MRvJ2W9<3 zWSLs+L;hX=WRTmgrYtHIkpwGgqDX{zdiYrJ%$>PAyN-U_$9G^J&bjBDdw%!cxifPo z0ss*HL!$b(3s74A2MTxDHz18h1KHWx`<0$6sPtvC+0ZZV-o3-CSFbAG2j@~Yp+=)Y zF|pZfeJ%0RH6sozoIXr7~Hat9xDwRqxpkv35;pfkvNgob}V}F2}nwpr=%g)Z0 z6`PrviMMax#>~vjfWBpAWlTS{wYACurKP1YojiK=xhlz=a+_<>7I9ysAyX5O9VH3k!)pHZ~S;g#2PQo0-_w)>dMxsHouPaJ${$@py>s+_`g- z{sDo6%dM-cD^SReNupo8cu~@q3zU$M0O{%J z#1_m9<>loOeROmbrl+T&udk2TZ``=S&Es~viJp~}CF#or65h}~Jw1Sk+|Kb`rY~Tqr)DkLdC7@shq=pw!eC>mA zEhi@j5)u+5bFHkb5M8U)O8Rnvgn`1uJh^=NGSPQ0)vc{9=+W_vqjP{rve8hK7cSt-89J7Xkq6 zh`xUPn(;Y&_%P9b{rV-EtFEq&=uW2-78e&K`wqA%2wx7ZRx2DiazxUlMQr{3{eep6zhG)K8s^Bhy}e!1-{Ei&U#U}@uC6ZP zXR%lqpWfbH;xjuti;)wzkiQ0F)_*l0sM3F^ZWO2ro;L9 zdB(;&@qG2_74a4O0k#|FSekWddE5fQ(9 z`GR)49gB*JLIptpzz9E8sG`^FAulfv#>U2AX=zDzoKB~M3l}bc&*y{r`FZALHB{L% bP`Jq-IjiCnT^9rO00000NkvXXu0mjfjfWlF diff --git a/Telegram/Resources/icons/emoji_trending@3x.png b/Telegram/Resources/icons/emoji_trending@3x.png deleted file mode 100644 index fd3e107edf128747811955aee0f5fcde08fc8385..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2548 zcmVEOVl*8bdsdytm(XL&+m_zSf2Cledl!3`oaNy_CA;M*?Zpi-Pt+g0RX~3 zah8Fu3z)0=2Tnu%1E-<>fzwd`z-cJG0q5f40&Z?@x-Ns0P}eOrH5HXgB_bl`=H}vp z1q*au6N{$X0<5g8aA;@RqH8ev4Q|Jd9Y|7dZ!d<0h3OiO{({TP%OiqA zL>w6z!2<^l=o*mzf#dObD3M60;8ePJ@gf=;8tNL9{(uV%3{(qErIL~ogaJzT!CPJyHsX+k1f`S4@cruv`qobq$K5!2nJRkze&d#1VCNndW5#IRt zIPToJ^X~y?XJ?0FV`D@Ze-6R4v@}L|3WWj_6BGXqa2XjHL=Sy1Kg1+1XkD!6hXnQ9FT%7#|<6 z^_)VXkUHan`0JC2rKP3*f?Km@4PysRpFTY!Zx#SxTwEOE8&+6YsGr~j0s-TYxpwW^ zj6qYi#Kc5Kc*)7h`UP(B;>Fn3)NIaJ3FaG&Bh&+ zZEI|7B-U6_Q8D}A?%cUUg;rWxs&iPA+onyMsI_YNaZIy9qNAg!g~((w^z`)9Ijlch zeSJN#-U}Bl%nmp+Gc(2^8W$I*wa$iwgy8Yx$2FdMn%qPp5wYH`uCCbumy(h~g_f3< zHth}y1OgO`#VD7{e~T@b%P}V>N8`AzuC6#bI!dftgW<~kZ0qgqB_?lZXqYy%y?ggg z0rscr>gqI(fBW`rVoVLbr{I>D=|l8%CkzDwfm&!PUA=l$qa3lZvBY>~Wo0u9uA-uX zn7F8@Xxe9+SS)4*O{IPN_HoYP>gr02C6md}$jE4Bz&SWLphBS_Cf3IE^vjnoIe{A+ z8$%x-AI^Db&vgF&{;Xqg+UM}!fB%7j!Bm%;ni_ce^eLB6Q)F#B~}Q|!aT!;q7c zL-a8+GJ@39RL;5Hy?aNrFJHc#bqr46R_C$McZ!ahm3P?yu0GUii zJZ9IfU7T{wDmWt}Bk=b2CcZ{H^|{E&$%$x}NF)FN(9zKW+1c5|V-gY)VA--|taEjD zcN6W-&d#i3um-ne$r3O&HlAXaNF*>iI?6gBO)f4jM0;0P*Tmmqu^9UM`==aZU|;}Y zVPULu{rK^NXt%JiU>$=sIHsYb4S9HY5bYm6e3Dvr#&wHDOXolqW$yd&#e3bIDnJO<h(cawLtkzd0PT*>5Yl-%)Teorv^P5(!T1C9UG&eWHmoHzaezcEY3l}bA z%x7X^LVcrXmj;?xPo;!~g%PJ?1_lN+-VT|cpHGY_7K<7EXv_AEjg1-o)~#Dd^y}>G z2atgNgoVl0V7!nl>(+S;1vH!v{3m@hOmlnR{7b^(pR1qB6BlXF=f&$MorX=@Sy zpr@xN(XYL|ozbtTsEFv--QCS~+MGK$0KoF{aw@!_pdeN;Xj>{33WeG)vuS6}^XJd0 zKD7O@h#IeN;SMe`GLl+EM@I)*SXeOnGyRA`adENQ{4p^xL|@t$Mk0}jx?<_uw{K`` zYdbsO0GPKI)z{afo0}Wex3;#H=%-XFS)H+|si{Q&$(w{#O(+!N;NT#&)@f|l)C`=9 zi;LR51wx^4ir>SB52-!{1qG~f({4~nNl6pO@OV6okB?{EZP?V*G@ajZ(hM8`;P&m? zsYR)jm6e6z;o+E-m4(&S)zstq`}@(+(UDc&XV0DyV?;zmpr4-~W@cvM+qZ8S>ypdm z7#tj|ao?u}4gm1fsZ(m^r**jN*RR(YnoK6s=C4L*2OI$4=FOY2udk1FN3LAC z!g=vB?S~N5sj8|9eSLkk)>o~90|0b#a>C-`V(JAtoTr^|gCKB*?6CFfE;`BRLSzB9! zySqCqTC@n1N+n38Qjkie(B0h)a=Cok@!4p`!Od6c&G)KvP5%R}4`+Ch6nX0a0000< KMNUMnLSTa4K=fw- diff --git a/Telegram/Resources/icons/stickers_add.png b/Telegram/Resources/icons/stickers_add.png index ac6c2a1666abbeccdade0028480f8c5590ec26f9..39a2a9f6ee7846b61279d133ed8b53c61946e873 100644 GIT binary patch literal 506 zcmVv5vwp42ILw4Gb)-@Bm1C2zUfW)-HVr9*Ge|HzrnQkbo7j zwh|9u@|kmK(X|}(`b&<})c&0~i4!>I#7k@Vu4C@?dTuhAsDxqY`u)C|UoIE7-|yXG zu~13Vw2nqsz$$X-bUHGd%_Pe*c?E2+#iz(o=s$=V91I4s-EMQ<^?EIF9LsPxly0}H zLZ31I8SufkKy3X-01VFOv-%v5M;VXDW>l%M!4}~AOOSg2mS{8IY&PQaUrG8rOKkB0 za6F~!9)LUoX7diY1;fWy0+)?@?Uc|qv@R`4k_b|8F7@#Ra1|!$B#I*a!KPI?Gj6D} zv5kilyD#79IY-aub5tW32lvMyhr>Z9$MN%nmGYMrzyaX=;c{}lUUiUjUJO9KU*UOA z-~e#Kr77~AkKwsWzCjR_zWHc1MY;kC7Z{C3s+%;%vD@vGMgve4!E`!R-J~&&<#L(R zymir5t5xYBc$WOT@}gnXYN;SV>&1>BpO)*>>7-}Bwp?2-31Vd%uYY}TEC}ghPprb~ w^eUQHPbSx{d=>qG!I#{|kA7_c3)Dp40EB4_a0M3Mi~s-t07*qoM6N<$g3xp48vpFS$5RHjbCwOxmHsE1BuIRm= z`NVho+4>6auTE9Cq2oNod*Bc*{d@24mf9=#=Dfhj*lrIGrFa5LXO6}phJGDzg=YM7o X<_U1o_;D#7Xg`CetDnm{r-UW|xgkR3 diff --git a/Telegram/Resources/icons/stickers_add@2x.png b/Telegram/Resources/icons/stickers_add@2x.png index de8948d663ddb4e7365afe1988d7aca89c556440..3351e67a2762382570ad2d420e14f00e680bfcaf 100644 GIT binary patch literal 1065 zcmV+^1lIeBP)-LlC}@#<{bjLtGV3@$WZBJ;LVj$|oDIe>ZP$Z`twm^klBCuFT`(qoJ$~V5QNqv9V!~kB_Y* z=(yAaZD@;)rv880)hEBQvSRPj4)W#Mz8w#l|zzq+3c6OGa^1C8z>C zPQrDyIXyi!v$M0&dY_-4+1S3mzBbR#&tc3nKj!AtY>+81P@0Z$f&a*nyr44Okz!yG!{gQKf2pt_A#eCR@ zhX=d5x?0sqVLfbMD+YX*kf*#@0B=Eqw{v)SSjBLyI@pZ$a)q9V3n08{gKnH#H->8w zOT8dnwzaio@gV_+l2AJ;fJpH1@gePGhL@I>#zx+Y!G{(Bmqc_L6`(^UZ(*Eo-jnxd zeCghYlP_22yZ}BZ8sixAio^&xd}N%O+R-077J$muK!E$? zkE|;BTB^#G@7odp2MJcOa231;0`%l1bk$iN2!ok%>6B|-UiBUhI;6|V9Cl=EMkFpT zFO3Uj^3g=D;Q$v2$u$UY9|~E=u&SIE=#{DD8U(NnlyH$l-cIzI<++69S}1@$Yzi*6 z8$>d^V~1`VtHU#FU@Ha9MGBx@Ho?BWzMQ=wW@cuR6OY*57O>@c#LjS$fUB<;dcak1 z&xT+pH7(FwB-bE-)Q1Gyz!diP_s#3;YpP16GHhTg11y$E_j4=17%nDh@Et^UMB_JCvn z+eB83e%0uIc4bw`B5`+jH~CXl>pwC1o*+8u5Ig9HcK%`;AKqWZbN)kCr4b)Hodo`k z1Z>G_&T00000NkvXXu0mjf7eMrP literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj_MR?|As(G?rxXB~)z4*}Q$iB}($gji diff --git a/Telegram/Resources/icons/stickers_add@3x.png b/Telegram/Resources/icons/stickers_add@3x.png index de40bbad2ccb63c41ed519607b9f76457e43a6ac..3b52aa36ac1bb5522848d7456a412fa00c54694b 100644 GIT binary patch literal 1648 zcmV-$29NoPP)U3Pz`%g$@9!6VeSM;>txdGFv;-FnzP`Q&*YoqUxVX3w zXJ=>P^z>959v+IjyF2eb*%YD;%IvDIua^@O6LMo?L!O_X%Tfh8pbI*oJ4@fcb!S6P zS67!@US5{Bx3{Ho!j^|_*nq7JiSkQOZ*Q;M+}xD!@9!)y-w$95HeovhqWlol+}tcz zR#xQ4$A@qH&iY^*KEM}`M3qj^%*>2bji)n^tTVzF_~e76x^E@wPjYE$Y7(oft736+ z(Ydf9M;sp?i~aq5adL7J^iVf9H{#{xCFr@J2t8VBYpdw)?hbmop`jr$K0YpnhlfR7 z9b9&k_4ReJw6rAN-rn2_Fu77OjfU~)=*TG;zP`SsB1A4MEXav$G@BSSK|pAcnf26S`f9LT?A3DLoEpv;$nh(a}-)^z>wX zdAqy2a%5yAty9kBU<0;n0-xbKhs%)eP7vOLjhxHNOF20?nZ}Wl%D^UUn*_e6h$J_H zP>*eczP-IY+1}n>5>UgNwCaUz_+S!XNZ2OX2~xe4wL!-4zoDVQ3ZfJOT*|@+_+k2frT#TlH(+y^mhc2&Uc(6*!%Ap#Y%c~rni_6kwCJD-!pxYPc%nP~&ECoa zs0c88<%R&jXjuiI3EJA);)2KfIH$3(F<95RzrUBbu*QS5q(qqVW1PeZuo}u16NGUB zx1NJht3g?+XCNdlNb_xn8*u}xVQf@P5alocVBV9(^Z`*57o_rauU5sd<4FnDkRKi%s7Fr2=?MAp*RRz?Z?MQvO`HabLXZiq;gM*hN(h`PZ1K{0~00SAes*( zh6!p1k}8vUW=+klNW~r#lg{0+T0jXnh;pJ;F|d`3&VWV`PIgg(z49coy}g|zyO+F4 zZE~0>4#JSSy1JsGPWJTlgn1Mi>pj93Z9+M!8f?H8Y`XYX$OBB2fP+Gw@4r8Qxx)zR zWJSD?*WZ+*NQ*h@^*1n40uG{fwJL_0E+z576P2gh(l|_U4m5(e!4uBs)S7UZ;v8rM z;ixSoIJ{JA!eOE~2Xj_;~kYT)jbB2 zrjK5t(NvCm_~Q5_j|<*(q{PX@v;=cE?)#2%5L2=LSRhIkRspb7!hOn+1yQgCo0gAK zT%v`_<0pcmB;g*7I94WIdb_lwK{sr`R@}bF-`NmUa1d+U)%@>qO6tWF35i8*%vIGt uSSmX~i5dOn0!15#zwA%Nna>HbypsP`6(qbF)$>OH0000|k1|%Oc%$NbBB0OCjLn2z=UOUKnAb^7<(ERWB z94U`~4FZo6@5M^m%v|+K>Q$YbuTgB|^@>l*Y=X@ljz<)d1PnXYaC`0lD_|d4t_T!T pc{;g14Jat#!lMLKb7I#5X_M_d4j&5>4*~69@O1TaS?83{1OR`uFlqn* diff --git a/Telegram/Resources/icons/stickers_add_dot.png b/Telegram/Resources/icons/stickers_add_dot.png new file mode 100644 index 0000000000000000000000000000000000000000..6bb2364b5ffb7a3b533e518b27b389c48c0b4d02 GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEa{HEjtmSN`?>!lvI6=}>F4Hoq+TQ2MP8{TFQ zSL_HgPHh&I-Rterc|!Gp-HG@q9WhMrnji0f!DjZXD&Km^hgzU>7(8A5T-G@yGywon C(N1vy literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/stickers_add_dot@2x.png b/Telegram/Resources/icons/stickers_add_dot@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..94a129badc0cfde9c05331f610425a14467692f4 GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmUKs7M+SzC{oH>NSs54@c|Bbm zLo!(3P6^~{G2n4|eeZO4rOx?>mU~)vNN%*xD!-W+5j4YL;}t)Tds}3^G^=~^9$(FU zn*Q*ml*I9kXFkVVE45{N7V%re!b$U(iSO@ixxY;}wAJ@o6^qDEk?&rAb^+&`$_yoU z=E9JywP*FeEy-0lSF`!UFXrlXyi0Z;34Gu`aam((ulm;%%6{auADRJp~$i2=RJx$BWv;+RF_}6$tdb+)-RiIa%D-GgX^TT$?OqD xT61LsCZ>G8!8mP>S2}x$%1xUx5|!>{ym_86aJg31MqofOc)I$ztaD0e0s!V7j&uM3 literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/stickers_add_dot@3x.png b/Telegram/Resources/icons/stickers_add_dot@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..699d72914b11720f77ea5b2aea6de32d50f188e0 GIT binary patch literal 522 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!Ea{HEjtmSN`?>!lvNA9*9`tl^ z45?szd;Q?rCI<=EhZ9+^C5E>#X*O7G;1yRBTOfV!PumWI12d0%ska}|h&iTye|OJg z#ib@s+i!O{Y%aQUcyoh8KxShoN8(ZbNXN#B3hepGt-;M$H=4aW*qx{uam$Ami6-q&Zk;3&1-%JHfBzm;c7 z0}k5jgdJPAgz?n;wc6V(H+Ex$ds__L?NUpI7ZbB58q$>Cph zx3M=I<6v=O;$&eGxUJCWz>p-ZBEaF0)6Bxe*pWNIL4jc-uMh`|!Zt^yMusD19tr{t gH`r*cnBf<5RP2>D)`zOsfsxDL>FVdQ&MBb@0AMxNU;qFB literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/stickers_add_unread.png b/Telegram/Resources/icons/stickers_add_unread.png new file mode 100644 index 0000000000000000000000000000000000000000..a6c899e13a089cc70dc43bb8fe1ba3e5c408f284 GIT binary patch literal 535 zcmV+y0_gpTP)zpg<+5XSf1C=?p)QHw;Y=LIB6N{w3Wsf5s}v}zKxq9ySF zbN4syo_p50mUA)5IQwVj`*vq%Mr4c;s~?lE5OTR(HvN9zjK^cM-EPh0a#3a6Zns0O z-X1sbv{)?4Xf%@Z`7HOO(P(%+w-~9p4_>KMWVKo)xQoR?27`grYBed9N~(+tg+hJ; zzz>Img70=aX|-Cp43kHqX_UYza9(LjVQ><`0$;TR6H% z`n^g31_EY6U@KG?$@4S;@qQ$?ZvqAaCRo8%VGSON#qwb<|TqfN#+zOLeZwW!FyT-fV3He zwv!@$z1aaygG6YUG|mhG3;$`?gk`_qD>$tlj1)NI-xxX)*S7Jx_lHAEV9yCYe}HER zAbI95(*g6K#QY{K$t@^5WwGCk*w~s*r=wc0*G(M9YI8gu4Yfmhqo>m;DnA_>ybBYrFse002ovPDHLkV1j?V@s0oh literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/stickers_add_unread@2x.png b/Telegram/Resources/icons/stickers_add_unread@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..db1b65583de128dac06a11a6b6b2ba1462fd20e5 GIT binary patch literal 1123 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 Rn#BMB002ovPDHLkV1ju8=IsCg literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/stickers_recent@2x.png b/Telegram/Resources/icons/stickers_recent@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..aea8a48da8edf179f3b2706614249439257bc07b GIT binary patch literal 1093 zcmV-L1iJf)P)Bi3k&w@>Z%>%n%daHW}=Yh0^I9i2ZKQkm2S7NjgK}$dcGUn zxfZUg&C$`3nVg)A)_Z+@E#B?(^K)~5e;?j?#>dpuR52!IW@gOl>S{4o>g;T7ZJCRU zi>RO2#i5FKc6RLh`+M~99v>gu<>h7D@Arq=an6f6)TIq=W55?aef=Tl`d4Uwe?R8K z-rU^S#l^*@PAcnR16wiRdkA^%R}0`NXz+A)cXyi@ZdC`Hv0iS_6LA5AH*L_p=hnT$ zt%%hYtXc2I!iB8`I=upX1X#3>X z*VpaC!$WaU_5_=p@uhnoP8Ds-0+>)VQr>yUdr+=$UU?m#8WodWS-|!6b*UW@qOEi4 zYoyrF(Ftx5J6{4AEE=hyQrn3*j*%%{!?#9cKz|81JUlGbXQD}QOdE|$RX|JtJE<0giB$2wk0XL*pC-yQ$^Y8yXzxq;2Y!GL^J! zr?-@FllMQ%FGx0ZNQy*~@b6$BZc~g($9BGv<0y?Eta6I;jEkrP&b#iHJQj5O( z$2z&|MT~WN-HV_n^y@@)0;B%Gk@XW3*#nXRY!6v6`cT=MdIe>X6>h{?4Ou? zPY|7Si2dk?Jb$r`5AUzxxjd0IX~blwlfYdhU`r;ens5+x+6(ZF3AN-?N%yq{ZD@-P zZ!hKCcnmn>m0;6d^{)mr^5cPX?teANBA`;)FWdeO>00000 LNkvXXu0mjfJ_!nb literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/stickers_recent@3x.png b/Telegram/Resources/icons/stickers_recent@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..bbf9b57e4113a693991d9d533c09851fcb93428d GIT binary patch literal 1748 zcmV;_1}piAP)@8!Aaj}&| z!9cm9yj1+dK#3qjRrtqn-uda~=4LiDG{m~QyIEIP7whcoWcBs+thTl`v%%oY%S&c^ zdU|4KXJ_o>XJ@T%7UZzQ!$Y>cz0Hn}jxs&e)zuYyetypMTu_7_t*)+)wYIiqdb-};UN$^D z%=-HJSXmh$+sX3sGMk&5V{dP7b~h-lip4Y<#)E?ctIF{G{mlg-d}d~bH#RoLvL~=- z?u8EMf=(L&#)OS{{;yb1Pmfja1Sd8&Hn;zI_LY^DnMvpE?JdWK2`I{v=nU@Fy>9T$Vp^gm2=f}1pfPmS z=75l>pe%4Q$sQPW4L5u==%)$7%vd$?M0e`4w?eIn3d#(?tboS<6I!KhWEEY>*{aMyNJBX0Pr85`viM70TU z0`ndp(}%PO0(RBhP1EMd1Yw<5HDbo((DhS=K9%^e1s^DZ&x$o}nIJ5NQv&9F%*xXy z2tKH45qyt6l$^NOb^{sOtKP47?psKMn$3NzPRV%i|RE42ibb1R}2wPO0b4}e}7M% zD#$YU0-q>}av%|ea4;oUU@taN`4r_qA_%c^N)UZ0Hc|N$TAlEdinzj0_#24y ziUoyf@4vpj(l%*rPa+7JU6deJ?o;;n_noR=Utc%sQ~5-35WaI47Z=oP$=lo8!)t_P z=f~C6)qHPnPaB0Gfkg`QSnkOqY`A;EB4X(8^RkMLCcNQVpJvpHpn2@+r!JL=aMKDM9j5v5Cqj zii5CG`mN;-L4JrKjpNwM9U{_5t{NikZES3;Xe!b8_&Ax$hxP{?WQ+8Q;e-f{WSCdG<3c}}nwlbAQ28!Z@84Lo7ic96K7Z%CXb&bOaK91uiDK~iJ8{?t;L;8p`XnS< zx0Apj6s8?|&UV7*v9r)KK&F|z;FFXFH3bjAOG%u91k)2Nr2!jADkYK|2tp0R*hrOF6)asMo78uR zNLSloTbI!aoL)Xf2tbuSX0fPArO%-(NJ33Ay>6(^$iczn5HskY7P{I)Cv>awd|*Ei zV2$w^RDjvsi&0LYP5M84k|~9r1rd1(LbRoidM#c#3?_9Sy#!S~tv#?njNhzi!n7gUI??{83Kl{f5*<@iA081sRPZ@j=1zWIb_$WnspxKxW$8t?DTx@Lw zjW|{&ZF;-7q(L`qz?LiAgdRTx1%|N3jX(fq)v6rqdsession().data().featuredStickerSetsUnreadCount()) { - Dialogs::Layout::UnreadBadgeStyle unreadSt; - unreadSt.sizeId = Dialogs::Layout::UnreadBadgeInStickersPanel; - unreadSt.size = st::stickersSettingsUnreadSize; - int unreadRight = iconLeft + st::stickerIconWidth - st::stickersSettingsUnreadPosition.x(); - if (rtl()) unreadRight = width() - unreadRight; - int unreadTop = _iconsTop + st::stickersSettingsUnreadPosition.y(); - Dialogs::Layout::paintUnreadCount(p, QString::number(unread), unreadRight, unreadTop, unreadSt); - } -} - void StickersListWidget::Footer::validateIconLottieAnimation( const StickerIcon &icon) { if (icon.lottie @@ -788,19 +775,22 @@ void StickersListWidget::Footer::paintSetIcon( } else if (icon.megagroup) { icon.megagroup->paintUserpicLeft(p, x + (st::stickerIconWidth - st::stickerGroupCategorySize) / 2, _iconsTop + (st::emojiFooterHeight - st::stickerGroupCategorySize) / 2, width(), st::stickerGroupCategorySize); } else { - auto getSpecialSetIcon = [](uint64 setId) { - if (setId == Stickers::FeaturedSetId) { - return &st::stickersTrending; + const auto paintedIcon = [&] { + if (icon.setId == Stickers::FeaturedSetId) { + const auto session = &_pan->session(); + return session->data().featuredStickerSetsUnreadCount() + ? &st::stickersTrendingUnread + : &st::stickersTrending; //} else if (setId == Stickers::FavedSetId) { // return &st::stickersFaved; } - return &st::emojiRecent; - }; - auto paintedIcon = getSpecialSetIcon(icon.setId); - paintedIcon->paint(p, x + (st::stickerIconWidth - paintedIcon->width()) / 2, _iconsTop + st::emojiCategory.iconPosition.y(), width()); - if (icon.setId == Stickers::FeaturedSetId) { - paintFeaturedStickerSetsBadge(p, x); - } + return &st::stickersRecent; + }(); + paintedIcon->paint( + p, + x + (st::stickerIconWidth - paintedIcon->width()) / 2, + _iconsTop + (st::emojiFooterHeight - paintedIcon->height()) / 2, + width()); } } @@ -2487,8 +2477,7 @@ void StickersListWidget::refreshMegagroupStickers(GroupStickersPlace place) { void StickersListWidget::fillIcons(QList &icons) { icons.clear(); icons.reserve(_mySets.size() + 1); - if (session().data().featuredStickerSetsUnreadCount() - && !_featuredSets.empty()) { + if (!_featuredSets.empty()) { icons.push_back(StickerIcon(Stickers::FeaturedSetId)); } @@ -2535,11 +2524,6 @@ void StickersListWidget::fillIcons(QList &icons) { pixw, pixh)); } - - if (!session().data().featuredStickerSetsUnreadCount() - && !_featuredSets.empty()) { - icons.push_back(StickerIcon(Stickers::FeaturedSetId)); - } } bool StickersListWidget::preventAutoHide() {