From 35e6f5e17a20a4c57c4766bbfdbba90441725fbe Mon Sep 17 00:00:00 2001 From: PatTheMav Date: Thu, 12 Nov 2020 23:39:32 +0100 Subject: [PATCH] UI: Update tray icons to use masks on macOS --- UI/forms/images/obs_macos.png | Bin 0 -> 11224 bytes UI/forms/images/obs_paused_macos.png | Bin 0 -> 10798 bytes UI/forms/images/tray_active_macos.png | Bin 0 -> 11588 bytes UI/forms/obs.qrc | 3 + UI/window-basic-main.cpp | 97 ++++++++++++++++++++------ 5 files changed, 78 insertions(+), 22 deletions(-) create mode 100644 UI/forms/images/obs_macos.png create mode 100644 UI/forms/images/obs_paused_macos.png create mode 100644 UI/forms/images/tray_active_macos.png diff --git a/UI/forms/images/obs_macos.png b/UI/forms/images/obs_macos.png new file mode 100644 index 0000000000000000000000000000000000000000..57f2e0a7bc74311a0838693d0755c8c36a9cddf7 GIT binary patch literal 11224 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 literal 0 HcmV?d00001 diff --git a/UI/forms/images/tray_active_macos.png b/UI/forms/images/tray_active_macos.png new file mode 100644 index 0000000000000000000000000000000000000000..5864c61a144189354ccc1d069478465074a3cf73 GIT binary patch literal 11588 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/down.svg images/up.svg images/obs.png + images/obs_macos.png images/obs_paused.png + images/obs_paused_macos.png images/tray_active.png + images/tray_active_macos.png images/expand.svg images/unlocked.svg images/locked.svg diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index 98ce9fb9e..3423762da 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -5619,10 +5619,19 @@ inline void OBSBasic::OnActivate() App()->IncrementSleepInhibition(); UpdateProcessPriority(); - if (trayIcon && trayIcon->isVisible()) + if (trayIcon && trayIcon->isVisible()) { +#ifdef __APPLE__ + QIcon trayMask = + QIcon(":/res/images/tray_active_macos.png"); + trayMask.setIsMask(true); + trayIcon->setIcon( + QIcon::fromTheme("obs-tray", trayMask)); +#else trayIcon->setIcon(QIcon::fromTheme( "obs-tray-active", QIcon(":/res/images/tray_active.png"))); +#endif + } } } @@ -5637,19 +5646,42 @@ inline void OBSBasic::OnDeactivate() App()->DecrementSleepInhibition(); ClearProcessPriority(); - if (trayIcon && trayIcon->isVisible()) - trayIcon->setIcon(QIcon::fromTheme( - "obs-tray", QIcon(":/res/images/obs.png"))); + if (trayIcon && trayIcon->isVisible()) { +#ifdef __APPLE__ + QIcon trayIconFile = + QIcon(":/res/images/obs_macos.png"); + trayIconFile.setIsMask(true); +#else + QIcon trayIconFile = QIcon(":/res/images/obs.png"); +#endif + trayIcon->setIcon( + QIcon::fromTheme("obs-tray", trayIconFile)); + } } else if (outputHandler->Active() && trayIcon && trayIcon->isVisible()) { - if (os_atomic_load_bool(&recording_paused)) - trayIcon->setIcon(QIcon::fromTheme( - "obs-tray-paused", - QIcon(":/res/images/obs_paused.png"))); - else - trayIcon->setIcon(QIcon::fromTheme( - "obs-tray-active", - QIcon(":/res/images/tray_active.png"))); + if (os_atomic_load_bool(&recording_paused)) { +#ifdef __APPLE__ + QIcon trayIconFile = + QIcon(":/res/images/obs_paused_macos.png"); + trayIconFile.setIsMask(true); +#else + QIcon trayIconFile = + QIcon(":/res/images/obs_paused.png"); +#endif + trayIcon->setIcon(QIcon::fromTheme("obs-tray-paused", + trayIconFile)); + } else { +#ifdef __APPLE__ + QIcon trayIconFile = + QIcon(":/res/images/tray_active_macos.png"); + trayIconFile.setIsMask(true); +#else + QIcon trayIconFile = + QIcon(":/res/images/tray_active.png"); +#endif + trayIcon->setIcon(QIcon::fromTheme("obs-tray-active", + trayIconFile)); + } } } @@ -7536,9 +7568,14 @@ void OBSBasic::ToggleShowHide() void OBSBasic::SystemTrayInit() { +#ifdef __APPLE__ + QIcon trayIconFile = QIcon(":/res/images/obs_macos.png"); + trayIconFile.setIsMask(true); +#else + QIcon trayIconFile = QIcon(":/res/images/obs.png"); +#endif trayIcon.reset(new QSystemTrayIcon( - QIcon::fromTheme("obs-tray", QIcon(":/res/images/obs.png")), - this)); + QIcon::fromTheme("obs-tray", trayIconFile), this)); trayIcon->setToolTip("OBS Studio"); showHide = new QAction(QTStr("Basic.SystemTray.Show"), trayIcon.data()); @@ -8114,10 +8151,18 @@ void OBSBasic::PauseRecording() ui->statusbar->RecordingPaused(); - if (trayIcon && trayIcon->isVisible()) - trayIcon->setIcon(QIcon::fromTheme( - "obs-tray-paused", - QIcon(":/res/images/obs_paused.png"))); + if (trayIcon && trayIcon->isVisible()) { +#ifdef __APPLE__ + QIcon trayIconFile = + QIcon(":/res/images/obs_paused_macos.png"); + trayIconFile.setIsMask(true); +#else + QIcon trayIconFile = + QIcon(":/res/images/obs_paused.png"); +#endif + trayIcon->setIcon(QIcon::fromTheme("obs-tray-paused", + trayIconFile)); + } os_atomic_set_bool(&recording_paused, true); @@ -8145,10 +8190,18 @@ void OBSBasic::UnpauseRecording() ui->statusbar->RecordingUnpaused(); - if (trayIcon && trayIcon->isVisible()) - trayIcon->setIcon(QIcon::fromTheme( - "obs-tray-active", - QIcon(":/res/images/tray_active.png"))); + if (trayIcon && trayIcon->isVisible()) { +#ifdef __APPLE__ + QIcon trayIconFile = + QIcon(":/res/images/tray_active_macos.png"); + trayIconFile.setIsMask(true); +#else + QIcon trayIconFile = + QIcon(":/res/images/tray_active.png"); +#endif + trayIcon->setIcon(QIcon::fromTheme("obs-tray-active", + trayIconFile)); + } os_atomic_set_bool(&recording_paused, false);