4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Match Windows taskbar state to tray icon

Browse source 
This adds a status icon for active/paused outputs.

Stripped down version of #2442
This commit is contained in:
Matt Gajownik 2020-02-27 21:16:26 +11:00 • committed by Jim
commit a2c3896e1a
7 changed files with 45 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

29
UI/window-basic-main.cpp
View file

@ -2014,6 +2014,10 @@ void OBSBasic::OBSInit()
SystemTray(true);
#endif
#ifdef _WIN32
taskBtn->setWindow(windowHandle());
#endif
#ifdef __APPLE__
disableColorSpaceConversion(this);
#endif
@ -6489,6 +6493,10 @@ inline void OBSBasic::OnActivate()
App()->IncrementSleepInhibition();
UpdateProcessPriority();
#ifdef _WIN32
taskBtn->setOverlayIcon(QIcon::fromTheme(
"obs-active", QIcon(":/res/images/active.png")));
#endif
if (trayIcon && trayIcon->isVisible()) {
#ifdef __APPLE__
QIcon trayMask =
@ -6516,6 +6524,9 @@ inline void OBSBasic::OnDeactivate()
App()->DecrementSleepInhibition();
ClearProcessPriority();
#ifdef _WIN32
taskBtn->clearOverlayIcon();
#endif
if (trayIcon && trayIcon->isVisible()) {
#ifdef __APPLE__
QIcon trayIconFile =
@ -6540,6 +6551,11 @@ inline void OBSBasic::OnDeactivate()
#endif
trayIcon->setIcon(QIcon::fromTheme("obs-tray-paused",
trayIconFile));
#ifdef _WIN32
taskBtn->setOverlayIcon(QIcon::fromTheme(
"obs-paused",
QIcon(":/res/images/paused.png")));
#endif
} else {
#ifdef __APPLE__
QIcon trayIconFile =
@ -6551,6 +6567,11 @@ inline void OBSBasic::OnDeactivate()
#endif
trayIcon->setIcon(QIcon::fromTheme("obs-tray-active",
trayIconFile));
#ifdef _WIN32
taskBtn->setOverlayIcon(QIcon::fromTheme(
"obs-active",
QIcon(":/res/images/active.png")));
#endif
}
}
}
@ -9539,6 +9560,10 @@ void OBSBasic::PauseRecording()
ui->statusbar->RecordingPaused();
#ifdef _WIN32
taskBtn->setOverlayIcon(QIcon::fromTheme(
"obs-paused", QIcon(":/res/images/paused.png")));
#endif
if (trayIcon && trayIcon->isVisible()) {
#ifdef __APPLE__
QIcon trayIconFile =
@ -9579,6 +9604,10 @@ void OBSBasic::UnpauseRecording()
ui->statusbar->RecordingUnpaused();
#ifdef _WIN32
taskBtn->setOverlayIcon(QIcon::fromTheme(
"obs-active", QIcon(":/res/images/active.png")));
#endif
if (trayIcon && trayIcon->isVisible()) {
#ifdef __APPLE__
QIcon trayIconFile =