mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-02-18 15:04:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "UI: Match Windows taskbar state to tray icon"

Browse Source 
This reverts commit d442fda3fc.
This commit is contained in:
jp9000
2020-07-11 06:12:51 -07:00
parent 959dbb64ed
commit ebb093b8a3
7 changed files with 6 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
UI/window-basic-main.cpp
View File

@@ -1837,11 +1837,6 @@ void OBSBasic::OBSInit()
SystemTray(true);
#endif
#ifdef _WIN32
taskBtn->setWindow(windowHandle());
taskProg->setRange(0, 1);
#endif
bool has_last_version = config_has_user_value(App()->GlobalConfig(),
"General", "LastVersion");
bool first_run =
@@ -5392,13 +5387,6 @@ inline void OBSBasic::OnActivate()
App()->IncrementSleepInhibition();
UpdateProcessPriority();
#ifdef _WIN32
taskProg->show();
taskProg->resume();
taskProg->setValue(1);
taskBtn->setOverlayIcon(QIcon::fromTheme(
"obs-active", QIcon(":/res/images/active.png")));
#endif
if (trayIcon)
trayIcon->setIcon(QIcon::fromTheme(
"obs-tray-active",
@@ -5420,34 +5408,12 @@ inline void OBSBasic::OnDeactivate()
if (trayIcon)
trayIcon->setIcon(QIcon::fromTheme(
"obs-tray", QIcon(":/res/images/obs.png")));
#ifdef _WIN32
taskProg->hide();
taskBtn->clearOverlayIcon();
#endif
} else {
if (os_atomic_load_bool(&recording_paused)) {
#ifdef _WIN32
taskProg->show();
taskProg->pause();
taskBtn->setOverlayIcon(QIcon::fromTheme(
"obs-paused",
QIcon(":/res/images/paused.png")));
#endif
if (trayIcon)
trayIcon->setIcon(
QIcon(":/res/images/obs_paused.png"));
} else {
#ifdef _WIN32
taskProg->show();
taskProg->resume();
taskBtn->setOverlayIcon(QIcon::fromTheme(
"obs-active",
QIcon(":/res/images/active.png")));
#endif
if (trayIcon)
trayIcon->setIcon(
QIcon(":/res/images/tray_active.png"));
}
} else if (trayIcon) {
if (os_atomic_load_bool(&recording_paused))
trayIcon->setIcon(QIcon(":/res/images/obs_paused.png"));
else
trayIcon->setIcon(
QIcon(":/res/images/tray_active.png"));
}
}
@@ -7915,11 +7881,6 @@ void OBSBasic::PauseRecording()
ui->statusbar->RecordingPaused();
#ifdef _WIN32
taskProg->pause();
taskBtn->setOverlayIcon(QIcon::fromTheme(
"obs-paused", QIcon(":/res/images/paused.png")));
#endif
if (trayIcon)
trayIcon->setIcon(QIcon(":/res/images/obs_paused.png"));
@@ -7949,11 +7910,6 @@ void OBSBasic::UnpauseRecording()
ui->statusbar->RecordingUnpaused();
#ifdef _WIN32
taskProg->resume();
taskBtn->setOverlayIcon(QIcon::fromTheme(
"obs-active", QIcon(":/res/images/active.png")));
#endif
if (trayIcon)
trayIcon->setIcon(
QIcon(":/res/images/tray_active.png"));