From c899729c12611660b14044e756ec63f266fae30d Mon Sep 17 00:00:00 2001 From: Daniel Escoz Date: Mon, 7 Sep 2020 00:06:33 +0200 Subject: [PATCH] UI: Ensure tray icon is themed in all cases --- UI/window-basic-main.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index c22412c86..1ac9f7606 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -5592,10 +5592,13 @@ inline void OBSBasic::OnDeactivate() } else if (outputHandler->Active() && trayIcon && trayIcon->isVisible()) { if (os_atomic_load_bool(&recording_paused)) - trayIcon->setIcon(QIcon(":/res/images/obs_paused.png")); + trayIcon->setIcon(QIcon::fromTheme( + "obs-tray-paused", + QIcon(":/res/images/obs_paused.png"))); else - trayIcon->setIcon( - QIcon(":/res/images/tray_active.png")); + trayIcon->setIcon(QIcon::fromTheme( + "obs-tray-active", + QIcon(":/res/images/tray_active.png"))); } } @@ -8084,7 +8087,9 @@ void OBSBasic::PauseRecording() ui->statusbar->RecordingPaused(); if (trayIcon && trayIcon->isVisible()) - trayIcon->setIcon(QIcon(":/res/images/obs_paused.png")); + trayIcon->setIcon(QIcon::fromTheme( + "obs-tray-paused", + QIcon(":/res/images/obs_paused.png"))); os_atomic_set_bool(&recording_paused, true); @@ -8113,8 +8118,9 @@ void OBSBasic::UnpauseRecording() ui->statusbar->RecordingUnpaused(); if (trayIcon && trayIcon->isVisible()) - trayIcon->setIcon( - QIcon(":/res/images/tray_active.png")); + trayIcon->setIcon(QIcon::fromTheme( + "obs-tray-active", + QIcon(":/res/images/tray_active.png"))); os_atomic_set_bool(&recording_paused, false);