From 323500f6dd4755d2a934a9246fb0f398a7960c09 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 29 Jan 2024 17:32:34 +0400 Subject: [PATCH] Improve design of locked tags. --- .../Resources/icons/dialogs/mini_arrow.png | Bin 0 -> 212 bytes .../Resources/icons/dialogs/mini_arrow@2x.png | Bin 0 -> 267 bytes .../Resources/icons/dialogs/mini_arrow@3x.png | Bin 0 -> 368 bytes .../Resources/icons/dialogs/mini_tag_lock.png | Bin 0 -> 283 bytes .../icons/dialogs/mini_tag_lock@2x.png | Bin 0 -> 378 bytes .../icons/dialogs/mini_tag_lock@3x.png | Bin 0 -> 550 bytes .../Resources/icons/dialogs/tags_arrow.png | Bin 1629 -> 0 bytes .../Resources/icons/dialogs/tags_arrow@2x.png | Bin 196 -> 0 bytes .../Resources/icons/dialogs/tags_arrow@3x.png | Bin 244 -> 0 bytes Telegram/Resources/icons/menu/tag_filter.png | Bin 0 -> 634 bytes .../Resources/icons/menu/tag_filter@2x.png | Bin 0 -> 1172 bytes .../Resources/icons/menu/tag_filter@3x.png | Bin 0 -> 1722 bytes Telegram/Resources/icons/menu/tag_remove.png | Bin 0 -> 692 bytes .../Resources/icons/menu/tag_remove@2x.png | Bin 0 -> 1344 bytes .../Resources/icons/menu/tag_remove@3x.png | Bin 0 -> 1966 bytes Telegram/Resources/icons/menu/tag_rename.png | Bin 0 -> 614 bytes .../Resources/icons/menu/tag_rename@2x.png | Bin 0 -> 1098 bytes .../Resources/icons/menu/tag_rename@3x.png | Bin 0 -> 1615 bytes .../Resources/icons/settings/premium/tags.png | Bin 390 -> 593 bytes .../icons/settings/premium/tags@2x.png | Bin 685 -> 1099 bytes .../icons/settings/premium/tags@3x.png | Bin 1063 -> 1609 bytes Telegram/SourceFiles/dialogs/dialogs.style | 9 +++++--- .../dialogs/dialogs_inner_widget.cpp | 3 +++ .../dialogs/dialogs_search_tags.cpp | 21 +++++++++++++----- .../SourceFiles/dialogs/dialogs_widget.cpp | 2 ++ .../view/history_view_context_menu.cpp | 8 +++---- Telegram/SourceFiles/ui/chat/chat.style | 1 + Telegram/SourceFiles/ui/menu_icons.style | 3 +++ 28 files changed, 34 insertions(+), 13 deletions(-) create mode 100644 Telegram/Resources/icons/dialogs/mini_arrow.png create mode 100644 Telegram/Resources/icons/dialogs/mini_arrow@2x.png create mode 100644 Telegram/Resources/icons/dialogs/mini_arrow@3x.png create mode 100644 Telegram/Resources/icons/dialogs/mini_tag_lock.png create mode 100644 Telegram/Resources/icons/dialogs/mini_tag_lock@2x.png create mode 100644 Telegram/Resources/icons/dialogs/mini_tag_lock@3x.png delete mode 100644 Telegram/Resources/icons/dialogs/tags_arrow.png delete mode 100644 Telegram/Resources/icons/dialogs/tags_arrow@2x.png delete mode 100644 Telegram/Resources/icons/dialogs/tags_arrow@3x.png create mode 100644 Telegram/Resources/icons/menu/tag_filter.png create mode 100644 Telegram/Resources/icons/menu/tag_filter@2x.png create mode 100644 Telegram/Resources/icons/menu/tag_filter@3x.png create mode 100644 Telegram/Resources/icons/menu/tag_remove.png create mode 100644 Telegram/Resources/icons/menu/tag_remove@2x.png create mode 100644 Telegram/Resources/icons/menu/tag_remove@3x.png create mode 100644 Telegram/Resources/icons/menu/tag_rename.png create mode 100644 Telegram/Resources/icons/menu/tag_rename@2x.png create mode 100644 Telegram/Resources/icons/menu/tag_rename@3x.png diff --git a/Telegram/Resources/icons/dialogs/mini_arrow.png b/Telegram/Resources/icons/dialogs/mini_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..81b5076f827ef74585664faf1b2e176364678659 GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uuz(rC1}QWNE&K$e>^xl@Lo`H_ z6C}PIxOnm6`SblO=}e*je|^0F6*2UngDkmHmCpq literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/dialogs/mini_arrow@2x.png b/Telegram/Resources/icons/dialogs/mini_arrow@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..6e1e87682fb5735fbb0b6f2af22859c6eb292d89 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={W7>k44ofy`glX(f`xTHpSruq6Z zXaU(A42G$TlC0TWzSVF5FO4N|zKE$K6mD)n@64DsN7 zJJpcyfC3M5p!l?Xn*aZM8yRd^9;UsqG2+guNyb7O7H@6{3Q;1?Xs&_b6dXT_>U>8)xSnAsaJEZU-wd; kFQ}0{ORWEz>jPFM@q}56Z#l2@fPqnf zq0wGhVQJ00WmBRaWvM(XjpA_3wvD;G__vE zW%?8DHVfDHO`r3_bYhdv@r5t7p1wcW$#s9~kIrIA_3Yf$pZ`T&d)4{yClCMLsyT|< zS1<4|Pkkbk_3FhzwwzZiue7tD`u?1J{^wrBtoQqLw#pp7`sMm2iN%J;s^k0LPMP{N i>ZRuPHerb4_#2sLF3n=?W3DI%`PS3b&t;ucLK6V-Er1~a literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/dialogs/mini_tag_lock.png b/Telegram/Resources/icons/dialogs/mini_tag_lock.png new file mode 100644 index 0000000000000000000000000000000000000000..cb1e4d76a2e8381f0093385b79bac0f6fefea32d GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uuz(rC1}QWNE&K$eT0LDHLo`IM z_HX2EP!MoE+O{;}L=&S#L*K#~$5>Y=2>fMST%O*uHty^F=dz8NzYa%aU$^6U|K9Z2 zmTS}OI1WsgeICk44ofy`glX(f`xTHpSruq6Z zXaU(A42G$TlC0TWzSVF5FO4N|zKE$K6mdgAHg7~;YE zc8VcivjLCmLS|#__J>J6vc-IT2YMq;X)dTeB)cYwT~W29Q~metfA=>o4GG=2sd2a2 zh3|h&eAnMC;0V^@KfEFLcJ$3%>l!jmB*d&vJg=;K*XGPIJAJ|%rgtX3ms4(N z*eNvy{l_0CO_FC7sQGciWRs5Z+28x>>vb45^Ud?i5v?0oHb8-^YwRU&I;PNO6w5InMIyzO#E}$tz`I?+}Ng@$dqFh6gs*!eY9Hlwy}vy(*IkFc2a*E46mh|gtJNai+6 z+P&U$Ux`Bb&X_gdco=Wjo@)9N2MU6`Ca T2)z4*}Q$iB}-tWv# literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/dialogs/tags_arrow.png b/Telegram/Resources/icons/dialogs/tags_arrow.png deleted file mode 100644 index 78a86bf65b86ee0977cd7e403da51dc29e6fbee1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1629 zcmbVNJ&fE$6n0P|g+!5%QV@|uvYaLaY>$7}9>qk*?ZK^tkJH|w91_KjXU4nMtv$x} z-R_>ahK>dai3UUgB@GoF1yF!Q9nl6M(L+T;aXjyOojY{-5th~-+uwZed+&RG`_cB+ zn^!KqbV-t=E4|HbAFlQKg^SO@`OBO07vb`JzWHt`NtdtIzjM;(UtE)<3%?|T-D)>{ z3saG5go%i2vor^^B;CC?%L(1%l^pR=k_F12-+iyh2@90_PKd&MosW~v!-DS|ZVl++ z9`%`W?=|`E3-IUP+csN3-SI_mhl?Y5DSr z4ZKS#9w^|Nts+B3-T+)PJ#g(6WMhPu&`_`>o}Y%Aehqa@Y#FDZ&@+rwLWmt@kgxoCyjXkD@X!cHB6Qps{^RbtBtVN!*E4;!%&= zapb#*tk~Wz68O-_*me(vBTeQR+B_t^aLif?)5;SwaJ_*&Ew>ZdOTC)X8&}|f%FOHFQbk+dwMgOl~i+3l+(FzVT zu3om&6>i%3%rl@aVEX?0&(U?5+_=|W8(e!phr{7^zaRZ@!FHVEYt_e2Iv9?Pgg&ebxsLQ0Np-Iq5uE@ diff --git a/Telegram/Resources/icons/dialogs/tags_arrow@3x.png b/Telegram/Resources/icons/dialogs/tags_arrow@3x.png deleted file mode 100644 index 086a6b8ecdd0472b4366bb5815cfca8e0d1fb237..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^azJdr!2~2bzr=0^Qk(@Ik;M!Q+`=Ht$S`Y;1W<69 zr;B4qMC;q@8#$d71=t>>=WHnw+FsPKn^C8f`R+kkojV6wSuU%5aEjZt`#|$=Y3ZMQ zArt;vyp#AFwS|qrrR3aMOHK7765p+tiYyh8v^{oXdB7{n=YJ)Q?n+#)etv1~*85d! zLrX5YipPGDukz|_*mvc6)V*pwS%!1cawf$bhf5V=uAlh& rW;o6InAfVUZbz;~aWr1q8$ZwL$1jHeg`AB*7c+Re`njxgN@xNA6!`0grr4+d0F9YwwfJ;BvxmukZp9?A} zDaC!Sd$YB#_&dklvv(iOnfZS9%(*k?#`gWr_I47!^!lsO%$`-h|JH4c2>7b%s5Q0B zYVP{@)j=x->Zf{rt&C-Bei-SpHLBKb{@*(LjcWIE%&g`5J8u_QEZOa|{Bnhjp47UV zIZB#d+EY(m%$RciIj57c(d@GmJyLexZF5r0`lB$zXW7*((e9%hQ95Gm&5ceAD-3pN z&h$yMo4ta04jcScgib%5v~m8`tfM!d7FkX|-P$ujJlVX@IXgf~ zqvrP8vej3UW<1oX+AFtc0V~g}$4v(xyewIDHLK<5y#QS??hwuU3**)Ul?lYHpWeS; zF?@CCT)*#K%x$x$wOtgR)>b6LcU-%11@E!ei*L%ACqCwHKWy@@zraRruHSM2(TgV? z%%phP?!W&Yyi%k&!SRgtCr6#rPm5NDM6JJWQE`WV+Hcmw&5u9-1jd7jl7} z)hBb#`dZUztNdMj(vfRfTZ?wi*?3;`&@+ip00i_>zopr E01d7H`2YX_ literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/menu/tag_filter@2x.png b/Telegram/Resources/icons/menu/tag_filter@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..056113881671f1eee7c364d97b54f16703e31608 GIT binary patch literal 1172 zcmV;F1Z(?=P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NF{z*hZR9Fe^SX(IcK@_*^7D=SG zga;vViE=ARUPMtsNhI+gFJf(NDYoz;QtErelSlC&NkZh!rAQu8F6Ey4-G1NiGuxP* z|7FMS-+q1CdH8qc+~&-g^FQazczJn-#{)mi13GR$0RaKAv9W%BejJ{i9v>ec9UZZl z?}Ceqi!U!Pe+!Jcxw+8L(C@J0(?eL`@bEA&Fi>!rp`oG1#zxAl*XvVKQha=TCDn#PZlq9h+{Z1GV=QR8p10pE8gDTQh}tTB$x|^ zv9U2JRS5&NJ3Bj&Iz2r#7z|2m^7y8vCbAoo$;5H!bh_o`Wl(Q!ZXzNgII8*-u6loe zhb(u{>QaBHSaoS>36l5s_c1XstUyCU1F^NGrG>={!hL;xM7+AXT2REs78e)y`1lB6 z#3_{w4h}v)KL>JseO>l6DW?+P@9)38y$uaWb>ZRRN^J7@{{DVQUR_;La#~s%Fc@4c zQw9+rBO~MW^%Y7~Qh;7o5u#5P59F7!9H#^c2|p>2C<*oT^&FK<oA z26bj;rjQC%Ce+~7)m1EUdwUxl9j(gyK}6}WTCEVkKw7G)slm@hrm)PhJj0QkoLp5^ zB@LIv#KfnkC+M7?pJ&*W!P3%FQbvd!8_hYn6zh^L@GAsa)Q&CSi_$Y!&dsFjj9 zPTMpjBm`%-wY5dWo}Zs3&eTIW9B~4-XGuKtDrCpZyR;Q2>eY*T+B^ zM;SpD+27x%)c+E2^~mz_@=!Q^eSJ0Dy-PuTc6NpnEh{V2&>&e=qQ5-}K(=+4Rp&ag zv$K<|w^Vpv$1%VyXVeCeXdcZLX{fq?;NIypH(VMRg3?Z;`$5I5P`+0aQ`jwgzViHWai z!xbHUIJvBlw4~M7na2idJDv;{78dZjqlq=>R!d4ssB(3HKQfj(C@2WYRQw5xl_jtf m4^~no9*oBW9uNF*5Bvd!H$z?yEm#}?0000-nAl literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/menu/tag_filter@3x.png b/Telegram/Resources/icons/menu/tag_filter@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..e8661460e7c83eb14c391407335c62bbcd9ac9c4 GIT binary patch literal 1722 zcmV;r21WUaP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS>BuPX;RA>e5T3bk!OB6Qmc|*}4 zNg^^$MSbxh6+@8}A)x{x1PKjP#0z*s?NJ3uf=m&|$&)9ChlhXk`n`GcCLkcdA}rx3 z@%;I7y)4oQt*xzjd3kYQPr1td6t7;r`r*TeGiSJTUDc|stt~4n<4aw;cJ17`b9_3Z z92^`hFE1}GE#Z3+<55Vr=kUeH$CFi+m6cOdQyd0~s;jH()2B}{Il&Vh9nI%_^ypD> zaWS9Hq3rDJbaiz-e*F03$B&#Q{i}I-dGtx$zI|IKptEPse*OBDiBC^Y^JNzo7YSUp zu)n{bpP$bM(UTGw7)V{>lhA2Ztf{FXS@@f;0Y;1%6c)eI&K3?Rrsde!7!88pvcVCNs5&}2Ha0dA+WPvs#CjuvBhZwa zn@hOw-@kWqauQ(DB4uP`5dZA#EE_kicAbmxR8LP2VZM6xN@oZ`0pLzdOb~8WRh1wc zBYJy#Z)|KZ=980?>({SKFe`7u>iX^5H_{?#ZwyGnR?xES}dXV0j6 zl*QQepksCs^48XtudlBjAOa!}9y}miY-k9z_)IY|F&HJrwz;{9(c|+NLh0z}ARVx( z83Lt|wYRs&LPxkIB_*1+|4Nukm{G)lnZ{u-yo%5a0UC9Yo}O+v=D!FL5fMj6M+_I+ zD+e?#E{?jysz@OVht0t1&6_u=m+kFsKR-VM0sj~8@9$^0n93Z)q@*P3G9@L2(`v-3 z_B0+G98`jAE6b!X9>u`QLg~#=SXj8Svckj@6BDzuvt^;=4U>g91qOu0_wV1Qju4t% zx^#)Ef(7d^45|+e4K+76GaC@WwzjrPPid<$3?`M9meK--bxS(-weH#TlK zOi1J)tjRFgGden2UtiA*b8&HLYiqN$6*fVb$|Tu8Eq6Fm086{cEai%diuw6@)-_HZ zMMXt|YRDV5u&}@+-QC@BF2?c9yonl|tPy`8j$>LOK*!ln&^8$&qG1X?*mex)7cX8Q zO4QCHBqSur04Zw@3kySxT3ua@?2ClN!-o$kHW(itm*A9Y%FN8<*hZjKFv?jlCnpD4 zSHf&+Y7$cmM?~!~6^o=8rwkog;m*!ZI>=DptkB-xE+em?+27y)*RNk3imJMvGN;hcQNpQnp4z*?a#EON>3T74l`I#6|d6JP{ zYDMKu+)!6nM;hXiQ7i}+(1OG)(6HFpSjzV8?(Rw)Tdc`29GpLY{!D&Xcw3^ekR&Z_ z#1J}?ZU{A`Qv(`%s6@gRW!Q}yH%KvD2FWIK$Q(_9 zQ?^9AJ0oBG-MxF4rWq2;I&T-+su@r={#C8Bv-6iPU&uD(0t`@3Pf>XD_3PK9gV8S6 z)6&ui6a{?fr`Ef{labC z-QC*bW|p$vPmaXBXJdm89dB%K$6*$ejQmK9Z|M2+=aEmQ4Bjai`ThHMBtY?UlCO+% zis&5UL*Tmp!i5W1g-y2s81W${Uw@UNdO-Dn>H*aQss~gLs2)%~prZ%=0YW7mB>I-p QY5)KL07*qoM6N<$g4baN-~a#s literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/menu/tag_remove.png b/Telegram/Resources/icons/menu/tag_remove.png new file mode 100644 index 0000000000000000000000000000000000000000..0a495b4efe5a638dc64f8fc20d104e97edf409e6 GIT binary patch literal 692 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfl1EO#WBP} z@NUT2)rE-y_AzEV%=7vR((Z(>DLCuu&7@EJ!z+`JLTp_SvR`3iFr(rh2h1Kbpk2uE2uF zs{eTPZ?&M6S6+X8_r1FPaO3k=-+yOqm8vnD{kFu)wp!hBNzlrlHF{#*hB4P)hc3T7 zk*`9!;OE~upF8SDQjB)r&D$GyoW;S}M2fcvX!+-#Z_0KHIt7bx9WC44YLsc=sLZte z{Bvf#<(EDA_uii9k+L(!OJ$Pvho67^SPB#b8l>KqS(}PP9ZoP{Xxw}^&s>Ukm3Xo8 zC0VZ4hSOPFC#m&tlxz-LJ#kr#9(%CbzaG|soCt_xb^Kbebgq4oR4jdR}t&JyEgrNjotpZ^;@HKbzfxn z9(W_l)%vkwPt;lq8NR&MJ%{pn#PhdCF*Pm-(K;yLt0pXUw_URT`0~q|HT%?=b~nB$ z-x(99Bj&YKNU-*dMrguP+sLWgZ}WZ=l#JIAb6*^|G-%@~ literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/menu/tag_remove@2x.png b/Telegram/Resources/icons/menu/tag_remove@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..521ab6968f6f0a27c50a58c1b13760f8bc4efced GIT binary patch literal 1344 zcmV-G1;6@Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NGs!2paR9Fe^SXn4_Z4^GHPh?1D znPrR!k+BFxhU9`oxG_YLqKFi^QF4KDfeUh@P;#XV$%Udw3CWmwmU;f4?_1yZw*S5N zIcJ~qo&Wp){+x?_)_&Ksp0(b0ulHSRZ<*}t_q785{}s^D(Xp_w_z%r)*ot@1n%FD~u2#8GT>gpJe z0zpfj&dtqjW@g6D&W>Ul92_L1wY9aqy}dju-nhQLerRZDWo0FqWMpIv4-fM&if%nU zJ&THp7{bHDC=VRRu(|xw#3R)6-KcD=QVudwP11Hw6U+%*MyZ=j7xB zT-bLhDJg7RRUte)94if;p`jraY$=!f`ueywetv%E=jY&hetu3&OysIml3Q9@K!P7P zDU~o_8DM}%&cg)+1YBNTLiPCg7#|ZpZsOSn2BqAc>_VyMqT*Jb`e%Yz;j~cMFv;+ps&B4JziKWtjU>_YFeSd#X zj3FT*N*Kk|{{H@ytmEV3VtUS)lz;$_jg3Vn0ep3J6&M)EA&@H8*VmJ;;^JaOHWC8@ zMM6Tt)6*01D4dwFB2qCO>Ng4;%<@uNQT3Q-q!}0O4mzS3ifc=4^A3-DSA|oStfa>aMS^}Z!CsL&q zA{*38I$91758d6}c`gqQ4u})i(a}+!*3i(9azqQg~xy z1DzdD%f0AA11t=ZVvuyLNC`Gb+?fO}g}Q9&`G*%0jyHD5Zo?nULQ zsw#?Ud3o8~+?%LDiqO!|K)zA7OifM6 z#K6E{a&l5?gGRMU*uqM2FN$eyZl;*#=H`rzjaf{*=O}9XeUO^`{{DWs2-Ov=x1XJz zH8L_%jR0@*m=Jnr>92xP9JIBy(K<~}PosWGG5LwXiy~D!SV~=0Y4jZ(9TXFq4Wy9* zBQ2f|3Dnx!ib1>|wzs!0EG*!qjE9kUi_Qc`HkuybwY0Rly1J-aN9UTFnu>gt#G|dP z-PqVj9RjH??gkksI~Y$LA01H zb_|V=jEsl|#D8R55HM82Rg1YQVN zS6A7sMg+7?Xr9*B*G)`JaMcLs7s=NOe64^=EASVj2OkEGaTh@V0000U4zw literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/menu/tag_remove@3x.png b/Telegram/Resources/icons/menu/tag_remove@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..5ebfb2b9110f1f0f92d969cded31766d147ff432 GIT binary patch literal 1966 zcmV;f2T}NmP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS?7)eAyRA>e5T3tvLK@?U~O9_9% z(kLM`(;yKPiUd&wOCGLbLPz2+37!h1oRQmM?fC|eFWC- z2&|Jfec!%)PEJmrK7EoFTVuV~u3h{6`}gAFVp>|-8Z%wm+{wvFIELS^U%yVCJSi>w zzx6sw81(q@<5Q^>$!91I4&)#E-o%FUc4aRzJLFI=+GgKATu+Q1hg#_ z6%}z@GOMzthpVe=OH0dv0|x|9%!H#ykG8h9vK%{h?AWts58Gl!8G{%U6qK5px^w4F zK^?<%?AS5Pb~DgKR0x;)Hg4S5-ri16u`|8!J#D&Fq^XAPOP;A(+ z0qc_C-sR@z_UhFu;+vnJkBErSfKLnpEA7LF4~gr+g9l<#3foScH~~cLT`4IkoT`V1 z$D22Ai0|{~&*9&iw{BI1+~40Xz~SMD0%0tBdU}X*W@aWdG*nblePeBHEfGC=@x@eSLjIiQz;DVoX>~yQin;hYuf!$Z+N>04J0iH*QF%`S|#}fB&9@ zr>3UVFZZH!@$vD*f^!DqI8iavjf5iY7=X5I+cr2jNb;ELyLaz4O`u$&y1JTJ5D6&< zSk@p2la4{$*VlJ=c$if1+U(l3%S>Y9YS?KI923jgvuBOV8t)-}IgSAaF~{iWC~1w4 zkNf-k8;3WuCpI>gD6q|dR51|g%XAC`@C5#lBK$Om*p#JJRaHds^5sj#$0bsh?-)$N z8^|tSLqkJ&OHG-otRI^yV9C6koE&BPq^Za;aA4(NV+E`$SY4EHo05)pmf1KftcQU~5pka^(u)BQD43UM?u9DScuB0d{Ka*93xn9J{$( zZW(eo+OYd)ety0TrDYMa$vnq^5f&DPIE!%JzI}@*OfJ0)x&8b1BSshSanP2#d6Ge9 zI|kbj86!R>D8$VOj%3(u7aSa1TwGjIQgZO%K?(Wt@^S)iYipB`T_BBI3534ry3I!aHSs9hDA_xArY6-^xi;NxetptwK2NnR19`EhiSUfnpks)X8 z#ye>^sr>x>{`cjc^Gc{DCMM!?gPz-?M~`s-CMqe>$ZpV>y;j|zCCtK&6vYkj5II9f zN2yC64$77x6=#ZJ6*(CS(&1Zuef_$1Chk@V#AZP-Ss-1&%^U06-Me??#OXFWwn#g} z^&)_x$%ewMTeqYS#Wp)=a(2t9;uOsKcJt;<3Eym!8j$0Ls7zj79_t(KSwzKblgtq{ zMSkOj3l~`5usm?Oc#O}UJtG+_rQbLs%&T6!c#-Tz;qv9n91gC?-o1N=E-NKWIeIl! z94=YkN=r*QG;eS3&dyHrQ`~YcB{)j0s_eNKPF}ini9y34DP`4t6%`fi zb3@#y8gd1IF8;8AA|zdDw%-5B%1YL^f`S5VxP_})0s8s#=Mo!>HhcysV8l_M^({9y z*FZ{n11{IuONR63&nw4Js{!BGt0Op>ot>=~6#BSUX9o=Tr81Le8gQ>bAauNQ=MI^H zd2!~B5l)As^! zG9x3Srly7j%qie(+tAQJ17@89HeXBx)?E080VQ_Pk2F|$S!KNFg@uJ|Vvq0Ph3vYxJ_7m(=p&$yfIb5H2&f!^Kk~2jKH=L~_y7O^07*qoM6N<$f;!@j AHUIzs literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/menu/tag_rename.png b/Telegram/Resources/icons/menu/tag_rename.png new file mode 100644 index 0000000000000000000000000000000000000000..69040f6aaf7d189fc28411da97fe14f0671ee304 GIT binary patch literal 614 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgf?1HC@V~B;| z-4N^bjE*94(&xP#Jvs!YI;ks8)Cj3#ndqT%uQN)QOL5|hEn12qUQ(j=4$53}D^!|R z3-(v<&wiU$R#tr1C9in-jhXL%pPOU*{LIY68THm8A!%-l1D6H`E@628{dd(~u?2sW zW}jUbw)%WHbKj$nJFc`&TD(BC`)G`wxm2&-^zJKt$r00d*_wOZlK0;)x003I{IX=$ z$&?fpORf3m^S4J&KB=O7FVB4ab#G3y*}m(q2dgMNa(b{g&R@%LMbGiaima=zR$0we zo6PCSmA(8jr>RgU$C+Zq(hv=iw9Pkv*6^_~ZTZT)JZRSBi3Y+eto86{S}V!tzer5Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NFv`IukR9Fe^SWhT)Q4}|0G(#j5 zDMTqHkxY@X5;es}7Njgtvan&H6peo+%F2dfL!xAotQ1X6G&K|pSxNaDArdnfe7~>5 zYurb|U_4Hzv%0#Pzp77!R;wKt7OHtJNxQ9+8ui<8ryM zFPqJll#~>JB@+s74i67Odv$e{oSe+W%9Yd8(=fZcyQ2-smEW3`mX^M~y@7mbX(<4r zqoX6(%+AgRU?U729UTQZo`!}7QKOfa7Z~7`iy8!iLq6^A?}PvL_BJ&&Rmk+O{~sT% zt*u;iMn*$<57myWOx|Utd?+NOP`3m6er*kq-Ra+#Dq6cLsw&;*kcZAn)(*03hMY%E}}; z4Ny3UO|AMwlA2M6X!(nai^#}GvMDJkA*<%*X2p7#O4R|Fm6a6*05`3trzfboySpWo zRvK{!@$vCBH8p^tw;*o_?{GMFc6KmsZ*S)^hyZjVAi~tu)kQ}~V~m|yEEdV|8OxnYRjK?12bTM--~hDf^XeZEXSI^X^8eJwHFM z=KZOp##M>jJwHE34k@0!y*+4A?gYDL5RU!u@GzFdK}|?VP=^7%mM-9ZeSK=JTJqh( zi1LGv2RO8_u%Koq3GSuHHE|sq0b;xKk9be++^p9 zLL1PBVrYL#V`n(nzx!i@BD$Z`U;H^n`O3T<451&ayxj_q!x0Ea;2(>?AGUTY{}S%C Q5C8xG07*qoM6N<$f~?EvzyJUM literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/menu/tag_rename@3x.png b/Telegram/Resources/icons/menu/tag_rename@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..ec18a3f00dc7c153811e9adb82c65696334fcb05 GIT binary patch literal 1615 zcmV-V2C(^wP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS=xk*GpRA>e5T3IM=Ulcb_NtrSx znH5T&ND*EPktd0SL>>q!LrO}@ix3$iZkcB(Ly-q#8S-G3@j;o&Jahl6yYF3&^ZCwq z&iM}R{r=}Xt$p@dzcuV>?RAcllK6-b5F;Q)K#YJG0Wkt%1jGo)83ASX@|KpC78Vvp zMn=lY9HiLe1Lyty{lUS(-rnBh<0B_QKFp@3rp3j@TU%Q{zv{WTxTvnKc64;)V=fyR z7@4fBtn2IRukz@fp1Zrdl#~=Uc5>s<(9r1U=y<2Fn%WSXekcJ$-$B#rMJz+S=MqPEIi~F?M!#1Q~)E9vFetY1I+>jCQD^yB^q#id~9rN%tB5UiS89336~yv?22RybFVj*ifh$jC@$e%ZaPt*rzO){>2ljckEW9XmzSHEnD8{>y%-#-Xw}Hb$oo##Erj6V z7;K>v6BCHAxw)yMqr+OWR7O2LJxGobHYq7dDl0<=%JXn6BqRjI36YVJ!JvzMS3p1j zB41rySzBAPm;KF&@;n^t?(Rl$LTqnutEi}OHsT|Js;VjkA0Hp*e88eGSH}zu4IdsJ zP#g(Z{U6!M`5mm@ot+(oO-)VZ27!`X9fMm2%GTA@Aw4`i%*_Jn+&(@&kTwwHo0}VZ zdwc1;5E!3%L`El7j0)}XIT=z`q4i2j)4!DiGwq$s;Wd&ettfpB_}7dQSa*Nnwy(jSXk)i z=f}VgWf(+;laqn-tqTR%I~EoehEkvsv7itH^(NA_va*8jr4iu#)6)||!Tv6dQ&UrO zd3hN*eSLkUalXArZuXA#_4T0?ZDO>vv|tzWAlTa4N}d)FvNy}#Q(j(PhzwP&_njZL zkej7raBs(9nVp@bK~mMjrI^-BZ6+orqG}|VZNQ=+oYzz+pasYYqN1W;jS<|2h6b8~ z>FH@W2FT0M&`>KYD;mQmH3e`iE-sE32gg@?d%L8e6%`faC2T4TTgcehm}CKXaBxr( zki3DpfW<600BCG#v^LkKySqD_U_=UTs2@%?I74AeAfuX)kWf%i03nc61X*QTS{ht- z)YN`k1uI8d;SDyA+S*zKX=`gkS}MVEeiQk!vNGgnNig4n|BCG%3V={QCH_1=KQlXq zIiCEb6zTyDgHPLsNyO!vig5dajGh3&x%}Y-!-)Y~xr>VnG(9{#z_OW{8SLUjKuXov z*oY}&US8hX+8Qea3_SBz3s_J#LS_dC2WE7Ce}80dZf<5~X6XI&BpB)$m?c1#&0q?4 zt*)*T-(d9kl|$HHTljDHP~XSxOY-;59)GZ*521R&r&dJGv1Dc92gT@KN zJQe5W<_PEQ?JX2rWPtwa2Fu{19+BGJ-DM*}<@uu00Op`Se*B=SXQpw5z-@q;lh*rn z#T;*MZy2QkrejBAGK_zP@ii5l8@`Xy}g(!2=j3rb|eM(9pZoX0}Bk=zy8Y+^(3UzkVh-v zPh#lhKl)pr)HQ~VA)#nLVxnUrAx1!qfEWQW0%8Qj2#667Bk*wq{sYEp=^K=<-GA#afw7i6h$C#u7B6-Y&L7PTJd=N4NxEu z7!HTK-L77*a~u~82Bmx1?e7;{b`FK1MwN|S|A`!_YgDRB@tPY1`yWL7|g)p5?v00f+26ltN zK+jPIjmP75yN#*+{2c{?sF(n5XSG_1IvR~s!x*>QJ(*148w>_?J81cQJ`;7hT+%Bl zSA=}Dsn_eFW;9;?R}6!VC$2`LfrZctV@xI!LQ|;}T~x)he7oH|9*-tPav(@rzh}zn zbjsy&Qt%5Qo6TM>7f?XNyX$m1Sg~X>>GSz;_ZP_uHzti&f+wc1f7K5=@C$1mLkAu0 R3%&pV002ovPDHLkV1k9|;gn5E`d&3pd#FP|#>` z1zI#h>||de^F+q3Y_o}}=AZfJd+*H?gggF!1EMI#aa`AR+qP+%dY;GLWnI@b zO#_DWhbBp~^6`8JUt7UOu@ptw4GGuIpu4R#jyf#&ya)`Qr_|0QzPZ VbH(UshyVZp00>D%PDHLkV1me1ee?hT diff --git a/Telegram/Resources/icons/settings/premium/tags@2x.png b/Telegram/Resources/icons/settings/premium/tags@2x.png index 183760ba79acad35d583baedc29ba951b8e321e4..194aec6497c97a0326f2ae720bb8e1776b044eeb 100644 GIT binary patch delta 985 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 B>xKXT delta 949 zcmV;m14{hK45tW?fPVv#Nkla~sczSx$ANub~YinyT7zD$}$Vg95Pd=Z2e}CWG+XKVO%F4sT zgCT=tKvPpwBofJHv)?+u&(F`r#l_y?{iE>gw9r z*)bfV1zcTSp{Oc9Mc&57#&kNZtx7yTJ3B-0_~C#!L<>Vvlve0%VPQdAPv{tyDsxq= zGCx1B%Gl`WsE`xsUO59oUw?mhcc=D2HwxqR^|hm;1Fusf z;NR=iJ2p5t_W~f#hr>jX6~flm)})IzB;4KI#q(03V&bsw?rtnb4W&o~puOYudWrH(!N$hM zBresizeToWidth(width() - 2 * _searchTagsLeft); + } resizeEmptyLabel(); moveCancelSearchButtons(); } diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_tags.cpp b/Telegram/SourceFiles/dialogs/dialogs_search_tags.cpp index 936dd61b3..d6a243e48 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_search_tags.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_search_tags.cpp @@ -214,7 +214,9 @@ void SearchTags::layout() { auto x = 0; auto y = 0; for (auto &tag : _tags) { - const auto width = xbase + tag.textWidth; + const auto width = xbase + (tag.promo + ? std::max(0, tag.textWidth - st::dialogsSearchTagPromoLeft - st::dialogsSearchTagPromoRight) + : tag.textWidth); if (x > 0 && x + width > _width) { x = 0; y += ybase + skip.y(); @@ -224,7 +226,7 @@ void SearchTags::layout() { } _height = y + ybase + st::dialogsSearchTagBottom; if (_tags.size() == 1 && _tags.front().promo) { - _additionalLeft = x; + _additionalLeft = x - skip.x() + st::dialogsSearchTagPromoSkip; const auto additionalWidth = _width - _additionalLeft; _additionalText = FillAdditionalText(_owner, additionalWidth); } else { @@ -335,7 +337,11 @@ void SearchTags::paint( inner.topLeft() + QPoint(skip, skip), QSize(st::reactionInlineImage, st::reactionInlineImage)); if (tag.promo) { - st::dialogsSearchTagLocked.paintInCenter(p, image); + st::dialogsSearchTagLocked.paintInCenter(p, QRect( + inner.x(), + inner.y() + skip, + size - st::dialogsSearchTagPromoLeft, + st::reactionInlineImage)); } else if (const auto custom = tag.custom.get()) { const auto textFg = tag.selected ? st::dialogsNameFgActive->c @@ -363,7 +369,7 @@ void SearchTags::paintAdditionalText(Painter &p, QPoint position) const { const auto height = st::dialogsSearchTagPromo.font->height; const auto y = position.y() + tag.y() + (tag.height() - height) / 2; p.setPen(st::windowSubTextFg); - _additionalText.drawLeft(p, x, y, _width - x, _width); + _additionalText.drawLeft(p, x, y, _width - _additionalLeft, _width); } void SearchTags::paintBackground( @@ -409,8 +415,11 @@ void SearchTags::paintText( ? st::dialogsTextFgActive : st::windowSubTextFg); p.setFont(st::reactionInlineTagFont); - const auto x = geometry.x() + st::reactionInlineTagNamePosition.x(); - const auto y = geometry.y() + st::reactionInlineTagNamePosition.y(); + const auto position = tag.promo + ? st::reactionInlineTagPromoPosition + : st::reactionInlineTagNamePosition; + const auto x = geometry.x() + position.x(); + const auto y = geometry.y() + position.y(); p.drawText(x, y + st::reactionInlineTagFont->ascent, tag.text); } diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp index c2c53681b..f3b5d1752 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp @@ -327,6 +327,8 @@ Widget::Widget( ) | rpl::start_with_next([=] { setSearchInChat((_openedForum && !_searchInChat) ? Key(_openedForum->history()) + : _searchInChat.sublist() + ? Key(session().data().history(session().user())) : _searchInChat, nullptr); applyFilterUpdate(true); }, lifetime()); diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp index 181c60bfd..898a645a8 100644 --- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp +++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp @@ -1449,14 +1449,14 @@ void ShowTagMenu( .sessionWindow = controller, }), }); - }, &st::menuIconFave); + }, &st::menuIconTagFilter); const auto editLabel = owner->reactions().myTagTitle(id).isEmpty() ? tr::lng_context_tag_add_name(tr::now) : tr::lng_context_tag_edit_name(tr::now); (*menu)->addAction(editLabel, [=] { controller->show(Box(EditTagBox, controller, id)); - }, &st::menuIconEdit); + }, &st::menuIconTagRename); const auto removeTag = [=] { if (const auto item = owner->message(itemId)) { @@ -1475,8 +1475,8 @@ void ShowTagMenu( (*menu)->menu(), tr::lng_context_remove_tag(tr::now), removeTag), - &st::menuIconDisableAttention, - &st::menuIconDisableAttention)); + &st::menuIconTagRemoveAttention, + &st::menuIconTagRemoveAttention)); if (const auto custom = id.custom()) { if (const auto set = owner->document(custom)->sticker()) { diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style index 38d1a55e5..1237f3e34 100644 --- a/Telegram/SourceFiles/ui/chat/chat.style +++ b/Telegram/SourceFiles/ui/chat/chat.style @@ -866,6 +866,7 @@ reactionInlineTagDot: 5px; reactionInlineTagDotSkip: 2px; reactionInlineTagFont: font(12px); reactionInlineTagNamePosition: point(26px, 2px); +reactionInlineTagPromoPosition: point(20px, 2px); reactionInlineBetween: 4px; reactionInlineInBubbleLeft: -3px; reactionInlineUserpicsPadding: margins(1px, 1px, 1px, 1px); diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style index bf378fb1e..dc870d498 100644 --- a/Telegram/SourceFiles/ui/menu_icons.style +++ b/Telegram/SourceFiles/ui/menu_icons.style @@ -147,6 +147,8 @@ menuIconEnlarge: icon {{ "menu/link_enlarge", menuIconColor }}; menuIconShrink: icon {{ "menu/link_shrink", menuIconColor }}; menuIconAsTopics: icon {{ "menu/mode_topics", menuIconColor }}; menuIconAsMessages: icon {{ "menu/mode_messages", menuIconColor }}; +menuIconTagFilter: icon{{ "menu/tag_filter", menuIconColor }}; +menuIconTagRename: icon{{ "menu/tag_rename", menuIconColor }}; menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }}; menuIconTTLAnyTextPosition: point(11px, 22px); @@ -182,6 +184,7 @@ menuIconLeaveAttention: icon {{ "menu/leave", menuIconAttentionColor }}; menuIconDisableAttention: icon {{ "menu/disable", menuIconAttentionColor }}; menuIconReportAttention: icon {{ "menu/report", menuIconAttentionColor }}; menuIconRestoreAttention: icon {{ "menu/restore", menuIconAttentionColor }}; +menuIconTagRemoveAttention: icon {{ "menu/tag_remove", menuIconAttentionColor }}; menuIconBlockSettings: icon {{ "menu/block", windowBgActive }}; menuIconInviteSettings: icon {{ "menu/invite", windowBgActive }};