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 5a812fb640..39b5e23d01 Binary files a/Telegram/Resources/icons/mac_tray_icon.png and b/Telegram/Resources/icons/mac_tray_icon.png differ diff --git a/Telegram/Resources/icons/mac_tray_icon@2x.png b/Telegram/Resources/icons/mac_tray_icon@2x.png old mode 100644 new mode 100755 index 968fcc6eb7..b7c6fdaeb8 Binary files a/Telegram/Resources/icons/mac_tray_icon@2x.png and b/Telegram/Resources/icons/mac_tray_icon@2x.png differ diff --git a/Telegram/Resources/icons/mac_tray_icon@3x.png b/Telegram/Resources/icons/mac_tray_icon@3x.png old mode 100644 new mode 100755 index 49d95a3d0d..8cd06e8b16 Binary files a/Telegram/Resources/icons/mac_tray_icon@3x.png and b/Telegram/Resources/icons/mac_tray_icon@3x.png differ 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;