From b25513a06ff88be0b3f4c928252b56c3da39cec7 Mon Sep 17 00:00:00 2001 From: AlexeyZavar Date: Mon, 27 Apr 2026 03:17:15 +0300 Subject: [PATCH] chore: change tray icon --- Telegram/Resources/icons/mac_tray_icon.png | Bin 452 -> 323 bytes Telegram/Resources/icons/mac_tray_icon@2x.png | Bin 884 -> 489 bytes Telegram/Resources/icons/mac_tray_icon@3x.png | Bin 1299 -> 688 bytes Telegram/Resources/icons/tray_monochrome.svg | 16 ++++++---------- .../ayu/ui/settings/settings_appearance.cpp | 2 +- .../platform/mac/main_window_mac.mm | 8 +++++++- Telegram/SourceFiles/platform/mac/tray_mac.mm | 10 ++++++++-- 7 files changed, 22 insertions(+), 14 deletions(-) mode change 100644 => 100755 Telegram/Resources/icons/mac_tray_icon.png mode change 100644 => 100755 Telegram/Resources/icons/mac_tray_icon@2x.png mode change 100644 => 100755 Telegram/Resources/icons/mac_tray_icon@3x.png diff --git a/Telegram/Resources/icons/mac_tray_icon.png b/Telegram/Resources/icons/mac_tray_icon.png old mode 100644 new mode 100755 index 5a812fb6406a51c49548d04d0befbd8698380c3f..39b5e23d0101beca7146461293af1523e119b072 GIT binary patch delta 296 zcmV+@0oVS-1H%H4B!3BTNLh0L01FcU01FcV0GgZ_00001b5ch_0Itp)=>Px#1ZP1_ zK>z@;j|==^1poj54s=CWbW?9;ba!ELWdKHLXKi7gv6f>1006#8L_t(|0qvAg4Z|Q1 zhObjl36+8bBp?9^H~rd5!Q8W?n6!$7#0{7816%BjWfq!HMI8Q{P%}#+lH{uc<*^&=N!&NO34E& zrP$DphPGqU5keS(I~w|zM?Xj@;Q{BogGov4 unxTOYrqWu!pdr-#Xzx<#XXk$C-+2Ou`wrF4(N~rL0000lH5B!2{FK}|sb0I`n?{9y$E00DbRL_t(I5$%&bu7W@i#}|SW1`94= zL19NDBqp{Tz*yQtg%{ue1}hUAV+c2(vf~UiG+qGdNTe{aBbmo;1b1D0F^1+PZ<5XK z{%7Vlll>47LQs$1P3)cc0RDs9ll}TAX0sUzf&djofwtRi3xA{+_*Hx~hQlG)whd{T z0&QU!a`_Tn;oW*X9wXOvk>fZ>RaGu5%Q8;G0#~ik=JPp3Q3O?0kp|1MgynJx)9I9M z7*?xQ7lQ>$l0*WNBw>=z=QC)UMgaT$p7G&AO*7Q|1mp9|^PEY-o73q8qtS>Y`@YZl z6-D_Sd^jB7c7MAui5Mh`B1znAHjEE%a3fTg^!nK`4v=LTEX#uRdJTqQw1J-IaZoJ8 zaoond6kx$GPLd=D0^INSPVjEG>jZ!FL24rT40Tb?>PzLcM(C_qJ2`!^Sit3SVLCTW zlZ$)g@_;UAqv02DJRS-BdcDG6Fz5%|6wq}YCX>lKC?g0>+x6V5eRO%>RQ!A3AG_AB UoMuvxjsO4v07*qoM6N<$fPx#1ZP1_ zK>z@;j|==^1poj54s=CWbW?9;ba!ELWdKHLXKi7gv6f>100Cr4L_t(|0qvO4t%EQO zMct=203$F0BQOFRzy>e^8!!Se2_rB9Y`_R^Tos8A+Qf<77Jn&6@<-JwJqj1ca038@ z3-JdRBMNI1g|&&o+C*V(J}#Uj3FLVWec!{fEHKYA6h*;W1GURYqLD-+iQBf}8T7s5 zdf$^g(zdPBy8j>uUG6N)pe)PBWv0)rtn2Fh+mG(#E7CO8jRZ+{T^A&|GfflczrQ1S zq^c@e;kvHHC4Y}F;$Ro1#WZ2Y0j&pz5e7}haRe^bF7QKfaLcgisc4Q-l!hAzXW_l* zZk7~hb_c$&w75qc{Dk4zJ%(XGUp(XBFT7XNH0Xn89KwaE%)rC$B%X1Q5vHPJ+m(Pg z$O%)?OsgCRSz#*LJ;gZ43)`X*7zcS_s(0-!Fb+Dx??~p4z&Pj#Q=Q#_0&&n2KHFu1 zIOqve(UfOilsx7R*T;BU-FEA%5Z|q76NR;j!rEL;_znmWnH!tVlgj`A002ovPDHLk FV1g8K#Kiyr delta 861 zcmV-j1ET!t1M~)vB!2{FK}|sb0I`n?{9y$E00S#YL_t(o3GJ6ZNP0mWz)$H9LW32x zI7vi;O$|*oHxv!wrnMA_gPSyz||wXTO4X@ObaO_x^T0Nn4W_53;q2@TK0ZD~ zY+O0cgv9bRXMagxuy8mGx3{-k7(HRJSd@W9o$mp=-EP?0+G;uNZ*On)jdp*3FXT?A z)9nSGoScM{lM{GKz{PGu`% zYRLJ(y??#E5Q#(pVMGnf)%yB6;AUil*zI;WIyw@WHOWs;PgVA;FU~g~m{oMST(G>n z49CaEfVK4D;Qv;Od8nMAg8bIH@cR|)6)~78-GsP89iVKy@wEbKbEpF^)J%v>nova zTPm=kL}x@AR95LK_lar(b0!sl%<`|%*;S8mumvl3RYKF zrF}Ly+5?Qv@s7N?xd~XWMQv_w?)LyIGlNy&;^Lx-8EU}oXkrghb7(7*O7r?V?Xzw zL{=c5uf#Q?Bsf21%T%u7h zf!QsA`38eq0?Q1B84P9(yg*)q;2q;no+}n9-KoD>?)OnWGW4i(k^H~MPn_5p1Y~|N zJ@4yIh+%oGBq4rq2gfm21HGm~!5$=`Wu;10d*ytV2j6&GRb>W%*!e z^8e`@B~O&&S+Uwa{S{!sPEfSO~xxgi~ae-IW zuPs8HPFiA~O6Q&%M3m{r*%a~M9Fqf^_9GLPtOn&%-$HWK<&`R3&Mhr7hRO)+URig?H`NS zu+^d-O18R65sOq7FB0Isn~`ziLWgUiV8}yW(Ps+`bYFEW;GH{%dqt4WsqO`fjxJds z!M)~_(2RAz>NO|3WJkGda9ir)VklO+NKiZHxB0XMlHISAR%D3p;q1D6sI6m}xZl%= zE8-WIXmcF_a>HW-6~xS3_Ppw1+PFbkX^%nOF2y}Ddfs!H7fkKCUHgTpvrF!hm+Wrg m+#0KY&B0jW4=nVPQ77oH;4hc9t}nn;#o+1c=d#Wzp$P!vy&ZJ` delta 1279 zcmVEz|SyA5qXuu z#;fEN3pR=88X+P=M1-8cZ-|Jrv^3Jw(?d2lH_7w!GdVmwB*n$WOh?r; z;(5e>^9c(JgXZRD*xlU)RyjI4;`QbKfRK}u1Jl#f@bdD)^55F_`uh6&Km-N`LPJ9X z?CtGY9aXxxyMMd;Js^^klVNCR2p%3Dl>Bz+M`)Z=-7}_!*=&aL@^V;NS#fYqOT*&g zA{Pj=n$`3>$ApH4lDfJ&QeR(BA|fJm-|FP#giD8EAW~CPNn>LpsjRFdzP`R(#4n14c3oBaL#H6>H4tE*O7szXDq4}|pigN}|4I6psk<)h2K`}=#St*ws5k^Kv;OXhf-X2Zg*Vfh`Iy&0Hf$r{ZO?q%}Yip~6 z9u5Af2Z6s*VPPR)_NKSsyzlJn1aEI|2ji=&tADxFOIvUUU2X?aR#pZ(J3Cwk+6&<$ zF*7rhX*BLKaRj<($>~yk#%MaZod~6 z7F6kTHK?nr>t{gNI)ZZ%v&Y`vUfAB=hR@GWnT?oHPEJljR8*9raT600GFjd)6%`eV z_ppVU)WptcVTHzV;?o&FQCK(wS(vRVuBE93# zt;i4%(v%?5f~wniszAyi=p}b;2#CkWMn`;=N^MXG!6ufz@nleI6XbJ^-uLRrshsy^B0vZb@(C&;LPUg!2sr@}5po`4 pjSvwbB0^3;M1-7&SR=l8`~&TYdbSuTrw0H4002ovPDHLkV1n^uZ887= diff --git a/Telegram/Resources/icons/tray_monochrome.svg b/Telegram/Resources/icons/tray_monochrome.svg index eb8c0fb5a2..2920012a98 100644 --- a/Telegram/Resources/icons/tray_monochrome.svg +++ b/Telegram/Resources/icons/tray_monochrome.svg @@ -1,10 +1,6 @@ - - - - - - - - - - + + + + + + \ No newline at end of file diff --git a/Telegram/SourceFiles/ayu/ui/settings/settings_appearance.cpp b/Telegram/SourceFiles/ayu/ui/settings/settings_appearance.cpp index cdf32c06d5..c41224c5c8 100644 --- a/Telegram/SourceFiles/ayu/ui/settings/settings_appearance.cpp +++ b/Telegram/SourceFiles/ayu/ui/settings/settings_appearance.cpp @@ -63,7 +63,7 @@ void BuildAppIcon(SectionBuilder &builder, AyuSectionBuilder &ayu) { }; }); -#ifdef Q_OS_WIN +#if defined Q_OS_WIN || defined Q_OS_MAC builder.addDivider(); builder.addSkip(); ayu.addSettingToggle({ diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm index 0232f25d08..31bc4af5ac 100644 --- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm +++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm @@ -44,6 +44,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include #include +// AyuGram includes +#include "ayu/ayu_settings.h" + + @interface MainWindowObserver : NSObject { } @@ -311,7 +315,9 @@ void MainWindow::unreadCounterChangedHook() { } void MainWindow::updateDockCounter() { - const auto counter = Core::App().unreadBadge(); + const auto counter = AyuSettings::getInstance().hideNotificationBadge() + ? 0 + : Core::App().unreadBadge(); const auto string = !counter ? QString() diff --git a/Telegram/SourceFiles/platform/mac/tray_mac.mm b/Telegram/SourceFiles/platform/mac/tray_mac.mm index 6f2d565826..aaea7786e1 100644 --- a/Telegram/SourceFiles/platform/mac/tray_mac.mm +++ b/Telegram/SourceFiles/platform/mac/tray_mac.mm @@ -22,6 +22,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #import #import +// AyuGram includes +#include "ayu/ayu_settings.h" + + @interface CommonDelegate : NSObject { } @@ -200,8 +204,10 @@ void UpdateIcon(const NSStatusItem *status) { auto resultActive = result; resultActive.detach(); - const auto counter = Core::App().unreadBadge(); - const auto muted = Core::App().unreadBadgeMuted(); + const auto &settings = AyuSettings::getInstance(); + + const auto counter = settings.hideNotificationBadge() ? 0 : Core::App().unreadBadge(); + const auto muted = settings.hideNotificationBadge() ? 0 : Core::App().unreadBadgeMuted(); const auto &bg = (muted ? st::trayCounterBgMute : st::trayCounterBg); const auto &fg = st::trayCounterFg;