opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

UI: Move taskbar overlay functions into platform.hpp

Browse Source 
Refactors the existing implementation for Windows into
platform-windows.cpp, allowing for other OS implementations in the
future.
This commit is contained in:
gxalpha
2022-05-20 20:16:56 +10:00
committed by Matt Gajownik
parent 5ac6c03a8a
commit 41521b2816
6 changed files with 61 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/window-basic-main.cpp
+7 -28
View File
@@ -2011,9 +2011,7 @@ void OBSBasic::OBSInit()
SystemTray(true);
#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
taskBtn->setWindow(windowHandle());
#endif
TaskbarOverlayInit();
#ifdef __APPLE__
disableColorSpaceConversion(this);
@@ -6713,10 +6711,7 @@ inline void OBSBasic::OnActivate(bool force)
App()->IncrementSleepInhibition();
UpdateProcessPriority();
#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
taskBtn->setOverlayIcon(QIcon::fromTheme(
"obs-active", QIcon(":/res/images/active.png")));
#endif
TaskbarOverlaySetStatus(TaskbarOverlayStatusActive);
if (trayIcon && trayIcon->isVisible()) {
#ifdef __APPLE__
QIcon trayMask =
@@ -6744,9 +6739,7 @@ inline void OBSBasic::OnDeactivate()
App()->DecrementSleepInhibition();
ClearProcessPriority();
#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
taskBtn->clearOverlayIcon();
#endif
TaskbarOverlaySetStatus(TaskbarOverlayStatusInactive);
if (trayIcon && trayIcon->isVisible()) {
#ifdef __APPLE__
QIcon trayIconFile =
@@ -6771,11 +6764,7 @@ inline void OBSBasic::OnDeactivate()
#endif
trayIcon->setIcon(QIcon::fromTheme("obs-tray-paused",
trayIconFile));
#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
taskBtn->setOverlayIcon(QIcon::fromTheme(
"obs-paused",
QIcon(":/res/images/paused.png")));
#endif
TaskbarOverlaySetStatus(TaskbarOverlayStatusPaused);
} else {
#ifdef __APPLE__
QIcon trayIconFile =
@@ -6787,11 +6776,7 @@ inline void OBSBasic::OnDeactivate()
#endif
trayIcon->setIcon(QIcon::fromTheme("obs-tray-active",
trayIconFile));
#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
taskBtn->setOverlayIcon(QIcon::fromTheme(
"obs-active",
QIcon(":/res/images/active.png")));
#endif
TaskbarOverlaySetStatus(TaskbarOverlayStatusActive);
}
}
}
@@ -9773,10 +9758,7 @@ void OBSBasic::PauseRecording()
ui->statusbar->RecordingPaused();
#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
taskBtn->setOverlayIcon(QIcon::fromTheme(
"obs-paused", QIcon(":/res/images/paused.png")));
#endif
TaskbarOverlaySetStatus(TaskbarOverlayStatusPaused);
if (trayIcon && trayIcon->isVisible()) {
#ifdef __APPLE__
QIcon trayIconFile =
@@ -9820,10 +9802,7 @@ void OBSBasic::UnpauseRecording()
ui->statusbar->RecordingUnpaused();
#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
taskBtn->setOverlayIcon(QIcon::fromTheme(
"obs-active", QIcon(":/res/images/active.png")));
#endif
TaskbarOverlaySetStatus(TaskbarOverlayStatusActive);
if (trayIcon && trayIcon->isVisible()) {
#ifdef __APPLE__
QIcon trayIconFile =