From 134bc131698ab6ac459792b074d91659fe0e67bd Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 2 Aug 2017 18:19:11 +0300 Subject: [PATCH] Show faved stickers in StickersListWidget. --- Telegram/Resources/icons/emoji_activity.png | Bin 639 -> 658 bytes .../Resources/icons/emoji_activity@2x.png | Bin 1303 -> 1320 bytes Telegram/Resources/icons/emoji_faved.png | Bin 0 -> 692 bytes Telegram/Resources/icons/emoji_faved@2x.png | Bin 0 -> 1624 bytes Telegram/Resources/icons/emoji_food.png | Bin 501 -> 516 bytes Telegram/Resources/icons/emoji_food@2x.png | Bin 777 -> 788 bytes Telegram/Resources/icons/emoji_nature.png | Bin 554 -> 569 bytes Telegram/Resources/icons/emoji_nature@2x.png | Bin 1100 -> 1142 bytes Telegram/Resources/icons/emoji_objects.png | Bin 360 -> 366 bytes Telegram/Resources/icons/emoji_objects@2x.png | Bin 628 -> 644 bytes Telegram/Resources/icons/emoji_people.png | Bin 668 -> 694 bytes Telegram/Resources/icons/emoji_people@2x.png | Bin 1150 -> 1158 bytes Telegram/Resources/icons/emoji_recent.png | Bin 546 -> 568 bytes Telegram/Resources/icons/emoji_recent@2x.png | Bin 968 -> 986 bytes Telegram/Resources/icons/emoji_settings.png | Bin 606 -> 788 bytes .../Resources/icons/emoji_settings@2x.png | Bin 1229 -> 1738 bytes Telegram/Resources/icons/emoji_symbols.png | Bin 432 -> 439 bytes Telegram/Resources/icons/emoji_symbols@2x.png | Bin 859 -> 880 bytes Telegram/Resources/icons/emoji_travel.png | Bin 465 -> 449 bytes Telegram/Resources/icons/emoji_travel@2x.png | Bin 817 -> 836 bytes Telegram/Resources/icons/emoji_trending.png | Bin 546 -> 562 bytes .../Resources/icons/emoji_trending@2x.png | Bin 1189 -> 1221 bytes .../chat_helpers/chat_helpers.style | 4 +- .../chat_helpers/stickers_list_widget.cpp | 52 ++++++++++-------- 24 files changed, 30 insertions(+), 26 deletions(-) create mode 100644 Telegram/Resources/icons/emoji_faved.png create mode 100644 Telegram/Resources/icons/emoji_faved@2x.png diff --git a/Telegram/Resources/icons/emoji_activity.png b/Telegram/Resources/icons/emoji_activity.png index 055ff9f33c91d65a09eb946c04525dcdf7012fdb..0d15632840d5482cd83bcdc92e5fb33a6c0ed18d 100644 GIT binary patch literal 658 zcmV;D0&V??P)l5ae^^)^OV*`T>$#BXKL( zCJ0=Jpa_95AQ*w7oL2f}I%!D<&SKts_uljFJHy=rK>QN^>=JC-HXa@xaD9CZuh+Zw z41Yph*ZKDL#yRr&{K}cFlnWtNluag+rSI8n_I>4sVX#`Qax@yTTCK8JEHa%=Q%cEL zEXGQu!cwV3uh+XS-aT<5k)Y!^B*~YT7k3=R$saC38m*Vk9X2z4BRJL==oXuu)k$5;9(lCtwR~LecqEHAyA;k7p z1VByGXjv8qg8@l$I-Rm!uhTTmZQja#GZYH(`T3d0$Hz1bgSWT0OE<`7vs4ttHGXei z!M1H!mIWy#R8@tP5~gWF*LAepZ3KfsOePbYot+_<%OMa5002%-PEf1WT+KiLESJl4 z!|Cbi+8=B<9MbRiyDI-XuaHb8q3b$yU5Ats9*+l7O7wa?+~40Xl&GqTR4N4kxVpMR zyWMtGy_H)&(zb1qWVhR;rfENa(9aY?uwJi|B+t*!cXP{Unx;vTY_(cnx@698jX6b8 s@c8(Mi;IhuVX+PiEB*#{8qk~Y4kbi5!DhSZu>b%707*qoM6N<$f`8RDhX4Qo literal 639 zcmV-_0)YLAP)u`w8A>t5+o@Sh0B8H==d59rm#=OR)`3n)bJtV08_uAiH-`WcR_#L~ty5hsb1Iy(y-EQ}0{P={r zu5&)0bBTODzZU<2JrF{`?RKyE7K_E&`t$R1>)cL8hGDSTY;rc6vDs|0P$)2+PE$(B zSS-dyqrpR3}%RdIKB2fyEsN~MCgw>Ml~UT)Pkolfu6Vz1ig=jVKXe_t`2OeVB#o3q)B zUaxm+zX0%S=XC%yO+&q2hsWbt`4Wi)Y}>}g#RWp45Q4!VEX#t==R>d8+t2j={(h~F zwOVb}tKDvwb?$u;%aedaH!f>6C_H{CTDjR1}3m2nrz%`%#*v(XuSQ zzP^$qKR!O#>2zqC<~|*q1A#z*kB^UxL?Sc{gVkzvjd3=crJ^W~XHW2ZIKZ+jNGYMJ zDx{P!O%uAVV>le*?CcDS#R4}sH^}93I6XZD07RovwA*dxma5fi+=X~N?)WjL(pG;AaJgKNQsVjf8Ld`pb-SvnNG6j2fMT(T;c&RK6_1*sBsm_B zscG8rLT#E5f}Ku>Bzb##`#tqH%`{Dt Z#21{=GQw=jr27B>002ovPDHLkV1htjKUV+% diff --git a/Telegram/Resources/icons/emoji_activity@2x.png b/Telegram/Resources/icons/emoji_activity@2x.png index 681df82ddcc473e589ecd7a9f7f50f94f89b5e47..fb267451565d92ba4c7cdaa877c73c218ed3dbe6 100644 GIT binary patch literal 1320 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 diff --git a/Telegram/Resources/icons/emoji_food@2x.png b/Telegram/Resources/icons/emoji_food@2x.png index 4f3d8cf7845b60c99d6ddc7ef3efa76917ef6912..654a0adc62a9a32870abb49c5bf05d05d890c681 100644 GIT binary patch literal 788 zcmV+v1MB>WP)l zB6w{tmYi~sKo30?WM$qdkH&10P0VTw9oR!Qne}rVHb##C0O1G5pF;z(#xH!|@%PYx zLZJZX=jULWCX~x%C>D#bTCHF*nZRf?f{%}n$Xw)&e!q{DQtr7t1|bBmuCCB^U5pCP z^RQN{MXeE@tk>&^h{za|g4cB&7mGzC_-io6@Z#b^4F2-+5=hJwZx{x8o+pIJfKUwjF5V*d+PL;DA>-9Qt9D={Tz9u5l;w{Sp zP1A(0=LOFd=$%5LfbZ|`i9MI5=X(5~yE zs;W`G`2N&14IRhX32)nWCiLm)X`C&2R}jTB#zMDdN+~kNQlZD=aa^Uv;Uaj(7`9ri zKu)94NQGW5m)L5xqIx63hX8nlE5l5B~(u7@x@^tXd=k0`W6yc{%ROm@r2K~qY(dw7m`IcWbHiFkQv$#}VF ziFo;FN%;MsCE#~MXSt2%gx@bZNBsWLIpGh3&H>LqQLR?@@zpdIU#V2m!xcpd{6rxO z9fhAxr>H1OwpQ`+veDak0dzdv$0vMbxsFPuB7#o$%=w+-$NpXT3*UGASol8!ihF<` StMqgL0000``T{~IA(Rr9R9HeH^aYe&^A18!t(-!0=}V}RYL#Bw zODd-vD)i7(iHYBHcx<2jGs({G&LmI1%psGR%qPDcvm4m~K-hx(+B85mzc;mTE|#|6bH;H6kM7oNK|_woNZDFH3>`aL(!Y_*e{meSHlKREaGXi!__fq>%o~?(Xge zp~YfR_^ni6ZQD+a^y0d15ZdWG-D*`}2$J5^49zcE-s`d%VKYCZZaV!lL;}#qEN#y==u3s z8e6Z|S3+-ZZ!pg1x-FOpP3kM*eC>p(?SC|l5R9(Ktk(9$ZE$||JXZ>IktTl4qL)=G`P)v?*)(~1zafWYW}kWHnc2w~03iG)`!h6fylv0gZRaNM^u2xx9Ra(q)xisl+ZU*Q4b#S-a zwfy`2{^dU$4n_>4EQAmsgc!^0itn=C(R-I=GMThw@qNFA^VgKkaUAX4wrx0_PH;RP z0RUjNT7hlbT8!(u!YLMbIm zDKQK~1OS}PW>^%3c18$c22YZt#jt4_<0Mc@v1yuCJm=gDZrXm&1kVbdj7`9Zt!=3@ zdN1>7d7i&C?uyB>?DO^aJg<`#V+?~JF#42IIGs-WcZ=`)oqC%3qLljC;_^HX^E}r; zgb=NX%CgMF_%rzTCUeeF2!To|R7#-`0y*cszq-yF`WyBS@XlF4j_z{g00000NkvXX Hu0mjfNDU7; literal 554 zcmV+_0@eMAP)5TEDW_fkquA%tE_D5W2ugk{MG=qCxG=h9=N*Rtf+Z;*QkIkoh-{L@ye z75Kgn)9Dl#V<3dk@Hmd)^?Jemeuw>j57+CpO`-2%+cqI$N8OMiB3YKDar|lTz&QuQ zFtoL@EFla-2*VJ{veYocFo1LZSt;jSQ&JQK*|x1^QWS;evtF;q4@ye;4mcbR9sGDa zzVXxP)WJLHGsb{1)=6i`hI~J^P&@tEY}QHNbzP0)Z+i#Jvb2BGG~sf&!1;Uz0D#SA z1Ey(eKDKRtR{Fm!RaF(4ra9jH%jFV+Ab`na0*o>6JWs>pIELr*36IAEcDo(iZnu7= zbzM`Q=M+T|2_Xhs>}L%bW8`@rMNvd~o)aSKEtTiF7MNujIgUdBKtT|^2a50e1OT*H zEGWw|Ek-G&lSWb0QB>D;=VTl8bzOJ-rIb2p-!y878^w*nK0+dGdi_(-PN%UnP2V*f z@=21U|C&0EGpIrcL7wOJVu(od`F!~9yRJJ}ufDn?;_n8E<2aP2sTQo1>U2nwByEM` s&xsI%q?DwTB19xaB&8HdDL+0b-)qiJN2TyqivR!s07*qoM6N<$f^$UxTL1t6 diff --git a/Telegram/Resources/icons/emoji_nature@2x.png b/Telegram/Resources/icons/emoji_nature@2x.png index 308965ef3a46f4bfdbf7b38b7cfeec2ab5be4b63..136160bfd9f74de98a93ba38318154f47ae1f722 100644 GIT binary patch literal 1142 zcmV-+1d02JP)okZ#HlLRQ^|#86U0C?SLpx+gpyTArBX^XrV>*_ z7+PW~(M2^%38j^oQsKNs-aLKH{J1lj=zAY`)4AuKFL%EC-E*ct007}X#Lw?0;1sSC zPp8u$iXy103aYAtD2lMPwdHmi0GLU|m2rH0j7B&-JajG3@8Qlu>2%tVw1#9d`R@^z zB*~JvAPBAz|DmzBgZ1@wh{a;y_xoWm7{JBF1-!n#g2&@AjeC20gVohlNG6jI4u@ef znLwx0f!o_#yA%Mv{t~m{_xrJ4ug~q|)6exCb#y2C3$qo}NNH9tW@2 z3tq1m;_*0~ot?RwLj%>T(L0o1vA4Hp7+)w9EaR)ys{0zxX0xVAYqgr?8jVK7HH}jf zCxoCN2!=^xv6$r=9LE{PUtV4=$5jAkK3=U>brUlTV;RpdjBaeTT1B7FXNNSst7x#g z9i4&@VmpRfDrOhZqEZnAVL4LS-rhD$ia5Krt=9OK!)cWi5wTDx7{>4K?_0*xIFoJS z-EP-1F(P84(Lj#lkYN~P7zR0xqx#W^h@vREPn_lgS`>CJAZk}RKR>6P>KL@8fd*Gx zWl=26RRD||iO0uBDst25RJZA<)oQjI3CFD)$8q5E`JmV9L9^L}@pw$#y74>@kw^q4 zlL=g1T|uwcvr7SViI2x)`1tsM;cy6p!2mj)4m6uhczAd)Tu726h(@EP$y%)zY;JBE zJ`aUL!1FxBVlfDZ!?3ot1|E+GR#sMY=g+-{mzNjaS1m~rX0uscEjs-?K?uQIE@x=B zqtS?7<2N@qrUd%^KJq+27k6}YWEgXBa4@}S(fRE8&!Z`Q7)I~s=`z% zh3$45RaHe*RZ$Rxxt(Sh22V~-sB%;)6?)?Ne4c7iZAXH^AhjC=gF%#KnR@-5ogI4O zEXz_aj5w1{AP}G;Z6%G*m`pJ7qv>OUZaV87qDoh*?^=(>kpD2ifL0vKzO=lO*b5<+b0TEoW1hSixdKTzdz z*>=*;uh_|_yJE3O<51=koE$1ilK#ZgHXs_h-7b1Op2dl4HfC4vEX!gj6tWegC<>LW zQWFON3S*_55zPYlk#FaZNU*Qi+O4rBb0T9g4*wtvs9&*G3|dKt)kZ z$;h&7S*$6FLgOCp5eJyrTqct-ykSS9kzsi(iXvt*8N038U&B!c^c5`20?+dhjYc67 ziTr5*2qEzP{tm<85bo~o;QIO+TCJ98LqZEzh<^wE+yCYN0_&71k6lhKK>z>%07*qo IM6N<$f(KU++W-In literal 1100 zcmV-S1he~zP)<--gl~Pa_8R3&4Y#(oma_Ms$NeV9$Hz#+;o;%`Lufjkri!$XOeX((p}MX!g{rFRTIgSvS{|&g zuR|;r1Ha!7{eB-VE-v8p^%XoGkFDL?+Z(K|u0k@Igm5?v2#X8hAA`{404g3o}NNH9tW@23tq1m;_*0~ot<&n@^aX^ zd|na##NOT>)jprkGwmytiu)YRWHPoS)oPVVQm@xt=O|MsAp})brIN&AF(!#5NmTpG z%gg0dJ^bmTl}cqUkst_6dqEK9+EywR^!a>TeUw>D7Fegxq9BBDuXWY%-G*LO)#ZeK zdwZKog82IwWbN^<6cdXC5iy_7Q|q86uGgjK^cRy1IgHx64Zn--M1vBl!6EfWcq@ z{eB!B>mGo(jHM^u}G zgM*p%$z&4m@9%B748x!crA2UR8rcf&lip3%q zak*UPK8g#40xR6kgj!D`kwDWlZOIM8U=BB?Y1&n{d!bg_Q51!Gf(?g5>bR(B8Y+sy zd-eGCIGXT(LKH=iWf`K;C`2NW&w-Z^0`KqdFc=Kr?(Pn*udkumY}yXsEc^oTp3T&q S`6tK#0000eT-h^Ri^YZ&rs%Kgj|#|&R)&xZnrZT z-LdS?xk*mGb8`HV834vadYcLi0PitLLGOp{IFP95%Hk-lx zE(XUUrNnl-MVh8iN@2I#ecs}w&W$l_t!3{$ckYCQ^E@6dgkWp!Ah^@uAWcGY|0fdOaH6cjn9Ean42Cu#cRrT_o{ literal 360 zcmV-u0hj)XP)9zu`z~68Dm%}#c>?Zxt$&m5$Ac%UDxq58DluhGA5#B z&?t(mz7-X@pxPfeKvCoz1DhhoJMJ_If|mkIbD;_@9Mg40^N+{cgni`?RJaP z>4d7PP*oL*qJZN#zk?3LfV!@6I2^Fw@6j~PqM!dyp8o~qXul~q-BEl10000~6g4~K&=>6HC`kIiN?w>Wnn?{qq# zX&UeC+~~Rv?RGo&JT7rcDOi@3J2@|wWkI9S$Tf#cTvb&tO|y^`52k76{qA0oMaEVKjR7fZfd275k5@quiFPpb`*}TQe=KmJ2*Xz&rC{*Li|6X0! z(RE$n|KXRou8X>^i`hsp#?bS;r%R`Jo|k7IdSBZ2{nDgUeBbAlza0pIpmgb!APD{` zUP1 literal 628 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 Y7Zshl&kOi*WB>pF07*qoM6N<$f&@(_;Q#;t literal 1150 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 IM6N<$g4$={IsgCw literal 968 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 literal 1229 zcmV;;1Ty=HP)gsC9&(G&9 zl%JmuH8nM?IVB|}(AwGxDwQf}{M+uDnVCUE#7HE9tE;PMGMO+dD=QH%Dk?&!(}|Ht zg!7L7KqL}Dr_+f>qcOpkm6e4ilL=Q=RuY`Ev$M%|{^yUXsw#YaePsxEJRY>!Y&bMD zgu!5tx4}OV2n29&a1d=a8+tq*Mx3T;tgfz3Zj>Mh+}YU?ZQ^fXcXt;Ff?yhLZ*Tu? zZwz#FbbL3Oo12SXulKioG2rw0FgG{%)9BdP*l&AEiShAq1OSv&R8-)>!9mKBzz5-Q zIMH~JBnde=IifjVUS6QKwiaM*ZB6uBZ*6U1OG^vtbUKvDWGIu#P^Z&jYilcRZ*Pm{ zUteEGu-ol|2_lgQTCLW!olj3s55By-2-a~p9Pew?YPDiG9OgBcrfF2$n}>U25`g+i>{u~-b}=jXqcC8kmM|LncKzGfxc*w_%vU2-;K9tMl={tOt zN|m-$U0zm;_2zBAPtJ5u)e+?VQ+6w5W!cX{{DU>Ns?iZ zBuN|?7!W)WAK2O1L5bOH#>K@&)}6=&x3{-&e0&U7S62W4U@#bXHcu**;{N`AA~_fgqSNWby1F`)NF)dV z*w@!5YUcfZKlb+azPD}!fpv9tI5#)MHFW)5F69?CjRpW9!HqExLKMc&=QApm z3V>9%91e%V@U@fRyWQ?Bc-l$u$z<{td^Ve9_Q~xom&-z(ve|4Xgt%=*0Ibz&jH2jI z@bP%0<2d<4bP3mWpAJgifOWgwYxouiKq=+R1&lH5_xpKpK8~N~AdcgQu-2NrUhf`! z9|yoztHm%3b77?vUDtgCKgI#DTCH-uUT5I#cFSh7`3!!J1E3IszVA~h#nEWQa=H8p h{QGcyVtw?R`vxbGtUS&2-ah~U002ovPDHLkV1gQ6%fJ8t literal 432 zcmV;h0Z;ykP)Sk z7OtyVV+zv*4jiFV>lcR34osG@q9i%^;l~;nM`=I0D#?YHx+z@ecz|n z`el!`mQu<)x>zhSoAcIsy(R#b05FOoG#ZV<13DZIXf~TD0iZDkLWsiX<#Iu_TD?yH zcsv#cADuD)?DzYRpf{%s0MqI8Bj|iS|G5(YSF2T_$#1t?3L);10>FB`&M1oh1fEVO zI*yYJ|E*lteH-w!#pv~Vk6;o7Kq+Nz*cijXVDKA!M)AG2aU5rYT5Ijs a=R04Ea+Xe@V|Td#0000qqrq-jpt#w+xNZ#gMn9@5h!=X3%9;Roi|cLRcE3=cbF zc-R@k!_IF%9})xsx~@albtsAgNs`cNwNR_oP$(2|e0+@i`+Hv}lq3mjYirOn4YDjl z6h$RgJRa}aCl-rQE|;TryY1Ph z(P+@-=BB6VPxU^S&1T86tiEWcOw*)|jSZ%cs;czz^5VOXZQFEscu0aE@WV5i4A+UA zvMh^qUH{uBkw}nfnt^&9931e$RaND>(qF6HZqvfT0!>X#(bLmY;6Ao(yMBW`;Wsxo z1D(vaZ7P*Yl*{D??o%$8DH4e=#tBF7L{StNhT-d19adIWR&afN{b`K3kEc?p&_I5p zX&N)ez*SWZ1;Z0J69boJITQ>};_)~$#=u2U3J_ z6zO)m*xK51MFSr2YPE`VIz2L2zwGbtGjD`nK(Sbi zN~O}sriW>ow6wJ3%YuH}6JKk3dYa1R@<`Cj%ga1yKDdK73}a~MMx#NRrtzZr;Q&Y! zMat*%1EcHpIw^`01RV?xfTGbT9UUD7MjM7fvMdKh2ZsZoNF+j;Oon^&=;Y*tCMPEc zK@SFZDwRt4+8eYii?Z3Q>juxazyZ+A%#7y_SiN57z1@Wacc#wn?k+QRE-x=hlB8jx zhYNQ~RaGh$i}d#PM%&xl!=1?!3`6_O-D5CnXFexg>ZA)n9VvqePL)U`=<)H9Ow)9&^Ye3xMx%~B08k_np=>rwtyasmPovSG zt*x!TeH@{gOoj}@7>Kk=*LB+5-0bNi%QC&Zym;FH_cKBj3pouU69Zf|c#YHpe) zl}aVbX0s#rDVNI>3Wb<$#?nfX1WnUC{e!2K_4Re!+}r@L-A9wjWMH6vQ51!Z8B~_# zKrn8xn;29S#XvA_iAJMr%%D8a2ZC{n-Sn-Y_Au!C`+JZM$Jk8_TC3Fp!MNr5`I(Iw zG@s80f^o~;-5nb<=-Js>AQ-pUP3*}80EI#Uu~;k!Q%|bZDi#+P(QdZ^biLv4?(PPH za?1YxK0^XsGYSBgmzPK+64Q2dq*AG1X=w>xUtjFIo;6b{l^VDtm}J`RHnz97JCJ|_ zv|6nql}b$w)}4cc1NO$$9mh4wINmA!*8TlGg~MS-PtP@Kh2uEnayhK5tc-u!9P;}5 zisj|yj+=aU`mX#0L7<0+hl$VR$Hxc7<8ikYsPih+UXe(IN~O}okh-qZ>gwts%#Ns=F=KPUhS zhr@Jyd^|K#(=-xA(J#_J6aa-nAxfvyzBemQPfuxfc6J!#a8Rp~$)u;fCBrZ%lgV^! zC`=U!fEE@OTz6RN^}5&F&t#$2rLecR*K;XcU0snN2;)GG2Wpip%Ty>7=GlfCnNeHf{kngJP z-j41MaQTvBdcOYJ^n6K)F$VS}Io|^RD_ly+;y7mW`P^8?rzNF?QVIZ|wFc)r?fsgF z2)^$_N{L3J@iG_yPNx%G*L{XB7K_ZJwZ`#y#A>yI@B3)C+qJ-dZf(Lj=Lo|PT5H&J zyWJ2)5vJ2Af*_~@oA9)R5ZG)sg@@!-0Jg)^>h*ev^0IXo@T^N=Ko6~5hW%l6ib zo9B5}xKav4^gcYFioApn@4@rn>-CEJ{cgY~lSw@|=NyjXl;(Ign;Gyh46ETn2q>kX zwZ`FaD9kYt83VptF4b_(Iie_f%C{|U{eIu@wOXxuZ{F#2u-omjjl<#4db9O4u5zgl`0AMf}SUt^VGkdz_a`{?Xf*>e`Gsd#v?)UrGqnIQKy4`MJKOOFPJbvz_ rCltwbUG{i9$}EMRO86)G>IeM;er@@rzB?K`00000NkvXXu0mjfXN1@? literal 465 zcmV;?0WSWDP)DFm-(V{%!AjUl2nbfG1S`QpEbIjzK=2I$LRv+zN-G2u z!AcMU{}p$Mmt>Qi;tx~J?6k8x3FVx_ zaU5jn@p!;>T}-D_j7Fn8;1e2#5CXg1E)$-V0+@yp5g23WcDwLA?;W5T8iuB6uq+F{ z?<=8)!y)Tzv285NQbL0ufUfJWLz7!hN(k{9RArmw1(V4nAIdpLtyatR;e0-iK^@1* zh6*7f$mw*-^r5cnvBll*_te9PncsEY)XY@2>GgWC8q+lMXWDMJaXcQQ1B1ap>ErEo z8`TVl!{S9%t5w`?HvmAt-&ZcN*=$B5TCdl!obo@tTrM=5%~YvK`~994iv-Bo!YcmWZ_4k%S@+b8T$(i~eEM~M-00000NkvXX Hu0mjf+Vs)U diff --git a/Telegram/Resources/icons/emoji_travel@2x.png b/Telegram/Resources/icons/emoji_travel@2x.png index 8958c7c62c0bf21e1ce2ebb2cf8f158b8f577b29..27a78641d5f753ac95f7d768c1e67cef9fa1bc67 100644 GIT binary patch literal 836 zcmV-K1H1f*P)2+8`Guu~oR&~>Dtis3gb+%|DU?u32|0ycb1kiqTQ5sbxwb+GA(ZqILI~-p za!RCfsE|@&3Cr6<>~H&LcQZ4)-A(DsTsHH~Jo{zdnQxLkA_DzD{RtXCRKMVU>u=Bi zR+1!%6h$E-qRC`J@9*!H{jf_-k|ea-Z5YyZ9amRZR(*qqwSzXp$K&zc1h<1WR4SFe z^xp|{N|Hp4MuRe$jBOuTmN%Z+W+4;`A(zWRRaF#=MJS4bP$=YUrU78JS|OE6u`QMT z{e3(>K5h)MSS-+LwNNgXkxV8bNz%7NXR}#$b6#9rI1XqYxYz5UTCF0N%R!c9KcMZw zPfkvt>pBzs{~C=(sMTsH6bhEh%L8cVT_ur7SS}Y{nU_~8mGT1G8Qh%x!C>I}1z5xg z%?57lFsG-d7>!1|0L>0=et}}Kh}mowBs4#`*dt2xxI|qeY`pR4Nr{nkEcx zQ$&3)xY1&<81C-wgtpLny&fF6(GCv}(QG!kz-O}=_dK2#S+B3J6b^^EVq&ov#p7}A zxjf4@%ZX^G^YimymWmr_08mxce{i?Z05BX5{RL-%X4z?UT}LDm@duoz%IkDGTj4!D zIm6+w<*kReG*uJ@tJTV}|Mm5?H{g*-1cSi)O??Y8p6bc0-5(%Nwv|6n?#&kLz zZ@}yIy5mGV&_wI&pi^7yD#H>uvD<{@yjXlTj^xCv*=^ zM37|}%jMD)IFY?kSqd(pvi9xmjc#vmMMA&m;o*Uvo}MK)7;L^&M+Jfkxr*wjg!ykF`Z7C&w@RJ{-^yKaW8x^0C}N-60kgc8zK zWtB>05h10*5Qgt9-kWEdKX>k(Y5w$Zh{-)SznnYYz278zLJ~()RKjF3*(9VqsFR^k2$z?auq?|r=$z?T z52%yja2T~(&DWMzuh%yR>g3_!A@1((q(Fzmq450QW=h`Q-$_+fshV&&Op!=Lczob) zikvvB;_U2fGfN)?5&%roTt8?~NC4<|yXyrNffU&ZY}yKs8N6r_+IDS$KYahH09}<#LEdqrR+KwOZxYG@DI-p!Is4 zJFyHT(ci}#o|&;MOXQjC>xED#moii3lL?-7$bPft(L?RJq& vCVhj_KVc091JAv9&!OG*_%VOq{20(bu7gdULjWwx00000NkvXXu0mjfymo;h diff --git a/Telegram/Resources/icons/emoji_trending.png b/Telegram/Resources/icons/emoji_trending.png index 4c76cf74a82879ab46541a1524e9ba43b08dfdf7..c3e9c6ba7f64bf77b18d2b1aaeaaab45d6238246 100644 GIT binary patch delta 517 zcmV+g0{Z=;1hNDyiBL{Q4GJ0x0000DNk~Le0000N0000N2nGNE0N^Urpa1{?`AI}U zR7i=nkt{iXWt#g8^Ljk*^Q~KV&iS6tz0JM%m;eCbk7Rzw)a`bm-|v6402&RNrtu-3 z=MBA2hOwboETUH9@%aD2x7#g#*I+RCJv<(d>%b3nI-TFam&@f#I3i-DQuz#?N~H|J z4@INVpTW&$Gm4`47F?1fwApO$!%L;oOIWknL`jl=h*+c1cn|J&yHS?qmvFz|kC8}( zh@H=8^msh~h8GG2!`~1L1`z;oI-L^nY&L5Q4~0Uy8=@!*DvE-Lh^NyDolYkL0EWY1 z!q@BdjN$ow9vx>MDcpPR(+ezMt?Ctqd*`4R;yJT0*>RLTrL9u zz+^IiA##hwLY;fPUidBoPEiz*yxndf2m&A?v|26Td7jAcb~|-$GMRL6f+mV0-0yd= zSS$blAP54;vJ3zKxm-?Ptl7-ra4_Ead_ITOYNdYf_j_G|Rt&?a^Vw|n)I%IXEEZD_ ziDlWBPup&{0QY*Lu?F^v@bsCX-Q%X__W-wOUQh zB@&6xTCT(4K$c}OnM|rNilT5d8ezNLMwiQF*m6ye75+kBG`|`Ise!Q400000NkvXX Hu0mjfUN`L& delta 501 zcmVTkt{iX^SZeYGq2})-*4SIo$tAy&ONt#0RYfwb-P{c_xpx5ZsS8C!tW+vLgQij`L*PTvX!J9v z*=$BxmOp|jih?$q?eEZ1siX^OHk+s@3YBX#8pcq6x7&@Xs_H`hem_Pc5h`~+pV8y- z=tB#Ig5hz4!5{(vPN!2UpUr09Lqnm^%Z+QAhMJ}!BI4*gYD^)BA0@mwwL_{18ht$UPdQIv!n+<*0@JE3_0IXIkJWCJ+D3{9s05F+MC~vV? zkl5>g^->;zG7Li*x7!UQNdiQKR;vY~C{q4zwCZkuluRZ=HnA*Ad9_-Nc!@;fXJ4Pg;Xt0} rF_}z~9K$d;8jY~sZllZP(jCti^k5AQX)K|%00000NkvXXu0mjf%R=M) diff --git a/Telegram/Resources/icons/emoji_trending@2x.png b/Telegram/Resources/icons/emoji_trending@2x.png index 3a3753703d7de0c1186de20c8a29e462becf72d3..70d42a77ee5146c09e3779a447a31ec7c322d95f 100644 GIT binary patch literal 1221 zcmV;$1UmbPP)lxD`rV;ey-~1!9}_Fa zT(H=t*=kLcHUDRy=jJ#4_UyZJ_RoWNom%I7KJU+K=X*{&=eu73fbawL`>O%`RnWi_ z5)xo=a1aIt27t%o1WRg~^MWImmeZiNOmKebi5sgOUXTb+%ke;57Hk-{OI3l9iY{t~o)b9n}(a}MK zc1oksU|L$*_W)E=Ua=F~E2luooNm3{j7#SJ)wctvn(r0i)#KpzM zuLBp0#eP9MH9S20@4;Ct7M`A-1_X|X*wE1MZ^2tyS^|c4N+c5f8*m|8v39)6?;-~|N*K0_lSc6WCp0HDcaqQ=(L)OZc<^$n=Cwbk2D7sbWJ0RVtlET+ab zHa7a?P5pKyB_)2%HX>qISJ#J6TU#47zO1Y)cuQqrVZm>3iA3V!wZFelj2|B#4-U9c zD8$#-SHHo_%gbH-ii?Yh@p`=;!^6V^2XAg}_8Z!2wKAT;WilBtuc)Xfu+5pAoD9{~ z)ua#r06;`=I2>;Mdc7VlFE8EthlYlTepy*r)S5)_oSYo5OcV+QG&ME3^~+>3#(240 z4oaocqhDrbCbcFJJUcrZxLhvPWNB#$Mn*Dz{<*sN590xL~2bU zcv4al)c^osetsSR0466VKl-#GaV#t>j9Qln&SJ5s22)d0AD^$TuHgFm8UO&M zr>BW|7K;V$?(UeOe$#)@iDdWp_rzqqUhlS6M@L72!{NZu(GfA%ZnwkZ<0Io3=}9?7 z1UDEA#AKOF=2m=gaFANmsgRHm#(tB@M9n2W6SZ0mR;$(HIBE0I#AdUB!{IQFot&Id z^NHX}rIKi3u~?`DJV_uB0H4oi9NXL5qvjLAbvhkPOiXwjx7lpe0-huii5NG(N~MC0 zjSXr(b^A)CQqX8LjAIcI5ndoNtF*L~v43oA%xe$ofu^deit#Yi-rnx(bqfIib8~YU zPn_G^+rIdC7uea^=~hUm(_u_ZjL+aqch~3VXUxmX3qCjiU{6nvTfyGmUZ0?AYik*w zUR70%e13j*DOz7&?^SMIUY^_Q4Xf3P6%`f!EIHrTXhuc`uCK4V0Q`ML z`@2v;O*^=G4A#C71U}q7>!1d%jK}RxCqC`$AOfF jU+~|w|1|yB|MLF;HNQSgr3gvQ00000NkvXXu0mjf9#2q6 literal 1189 zcmV;W1X}xvP)* zteDLK!lv13O_YT(v+H;8Yku$E-Ouyv*~a^R>#lWQ*Y~Sr#(k&t;Q51#I(b3-vs?lgTgCZg>FE4)| zs7xjc2-2g`(b2C54G#~;)6>(SKoJp}nwq{Aw5_czXh@GF63N$qCMG7L$z%!{=+V&; z^7;JGgANW3h78i9p`oGBf{H{Ue0zKI8^G;$y1F`6&>z5}j*bqt6rvIm5&!@|CX=z|Ha9o> zRg?BA%FD|Gx|@iIy}iAkbvipcS@SC^D+7P@OG`@ugUaP{uUZEO2aNfXlaqmgW@l%k z)9DNtw5qDgt6o`I8DqZDXvCwbcKgg5jYhb-y7HMH85v=$mzS4E8zX`i6cjL;JfbKHT3T9s=9Nk%F<-4#gGQsF zt(TjdOB*AC=I7^wKp%?;e%-U0x??CdO~&t|j1!@~m^ z<_G;BC6Vay@sY8a(P;E}*T%=kfyd*)@$oUE*X44-%gYNf#`GkJpeB=vv6)h-^l3Ic zJk03%RbgRa#CeOwLhB*kYrS3%cDtR{#I#u06d4%_JRXl2)9G}yJ|d__qhT}!^9?jB zD+`1|Au+bUzfbEUf*K44n3|fRH9b8&am4#y5{ZPkShZR$Y;JDS`e>J#LZN_*iwk0m z&*uk#_@62&Dv0wF6BDdn+KoU>O$~AL(ACxD@A1KF6c!c|cVs&|JHa1CdU|?%3L6Xt zjEjro3`#nCy}rJpSS$`66acWlzu%|9z`y_}$ol$v;?t?Asqwdle~sjFIljKWdNpZm zZ1l@37K?q3+jhGhrBW%Ei}nAmR$M!{3h_zYnQYig$N+ULJ~~Fe@vI>#M_k zQIwRF;L6GhA|mSbdW?vOAm+uy#C(1Ra=Bc%ySt0k)zzH)0RXb^J_y>{+5)T93Uav| zY&ILbzrPdnoK7d`^?ERy&7fARVR?BOPEJk&X$k)VEPvLv*VrG600000NkvXXu0mjf D=;b#j diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style index aca14e786..248158de9 100644 --- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style +++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style @@ -103,7 +103,7 @@ stickersRowDuration: 200; stickersSettings: icon {{ "emoji_settings", emojiIconFg }}; stickersTrending: icon {{ "emoji_trending", emojiIconFg }}; -stickersTrendingActive: icon {{ "emoji_trending", emojiIconFgActive }}; +stickersFaved: icon {{ "emoji_faved", emojiIconFg }}; stickersSettingsUnreadSize: 17px; stickersSettingsUnreadPosition: point(4px, 5px); @@ -137,7 +137,7 @@ emojiCategory: IconButton { width: 42px; height: 46px; - iconPosition: point(11px, 12px); + iconPosition: point(10px, 11px); } emojiCategoryRecent: IconButton(emojiCategory) { icon: emojiRecent; } emojiCategoryPeople: IconButton(emojiCategory) { icon: emojiPeople; } diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp index 6b4744b45..579a4f997 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp @@ -208,13 +208,15 @@ void StickersListWidget::Footer::paintEvent(QPaintEvent *e) { p.drawPixmapLeft(x + (st::emojiCategory.width - icon.pixw) / 2, _iconsTop + (st::emojiCategory.height - icon.pixh) / 2, width(), pix); } else { - auto getSpecialSetIcon = [](uint64 setId, bool active) { + auto getSpecialSetIcon = [](uint64 setId) { if (setId == Stickers::FeaturedSetId) { - return active ? &st::stickersTrendingActive : &st::stickersTrending; + return &st::stickersTrending; + } else if (setId == Stickers::FavedSetId) { + return &st::stickersFaved; } - return active ? &st::emojiRecentActive : &st::emojiRecent; + return &st::emojiRecent; }; - getSpecialSetIcon(icon.setId, false)->paint(p, x + st::emojiCategory.iconPosition.x(), _iconsTop + st::emojiCategory.iconPosition.y(), width()); + getSpecialSetIcon(icon.setId)->paint(p, x + st::emojiCategory.iconPosition.x(), _iconsTop + st::emojiCategory.iconPosition.y(), width()); if (icon.setId == Stickers::FeaturedSetId) { paintFeaturedStickerSetsBadge(p, x); } @@ -1189,27 +1191,29 @@ void StickersListWidget::fillIcons(QList &icons) { icons.push_back(StickerIcon(Stickers::FeaturedSetId)); } - if (!_mySets.isEmpty()) { - int i = 0; - if (_mySets[0].id == Stickers::RecentSetId) { - ++i; - icons.push_back(StickerIcon(Stickers::RecentSetId)); - } - for (int l = _mySets.size(); i < l; ++i) { - auto s = _mySets[i].pack[0]; - int32 availw = st::emojiCategory.width - 2 * st::stickerIconPadding, availh = st::emojiCategory.height - 2 * st::stickerIconPadding; - int32 thumbw = s->thumb->width(), thumbh = s->thumb->height(), pixw = 1, pixh = 1; - if (availw * thumbh > availh * thumbw) { - pixh = availh; - pixw = (pixh * thumbw) / thumbh; - } else { - pixw = availw; - pixh = thumbw ? ((pixw * thumbh) / thumbw) : 1; - } - if (pixw < 1) pixw = 1; - if (pixh < 1) pixh = 1; - icons.push_back(StickerIcon(_mySets[i].id, s, pixw, pixh)); + auto i = 0; + if (i != _mySets.size() && _mySets[i].id == Stickers::RecentSetId) { + ++i; + icons.push_back(StickerIcon(Stickers::RecentSetId)); + } + if (i != _mySets.size() && _mySets[i].id == Stickers::FavedSetId) { + ++i; + icons.push_back(StickerIcon(Stickers::FavedSetId)); + } + for (auto l = _mySets.size(); i != l; ++i) { + auto s = _mySets[i].pack[0]; + auto availw = st::emojiCategory.width - 2 * st::stickerIconPadding, availh = st::emojiCategory.height - 2 * st::stickerIconPadding; + auto thumbw = s->thumb->width(), thumbh = s->thumb->height(), pixw = 1, pixh = 1; + if (availw * thumbh > availh * thumbw) { + pixh = availh; + pixw = (pixh * thumbw) / thumbh; + } else { + pixw = availw; + pixh = thumbw ? ((pixw * thumbh) / thumbw) : 1; } + if (pixw < 1) pixw = 1; + if (pixh < 1) pixh = 1; + icons.push_back(StickerIcon(_mySets[i].id, s, pixw, pixh)); } if (!Global::FeaturedStickerSetsUnreadCount() && !_featuredSets.isEmpty()) {