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

Revert "Merge pull request #3110 from WizardCM/taskbar-color-setting"

Browse source 
This reverts commit 04e01458e5, reversing
changes made to b83a9dd0d6.
This commit is contained in:
jp9000 2020-07-11 06:05:35 -07:00
commit 959dbb64ed
6 changed files with 7 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5393,8 +5393,7 @@ inline void OBSBasic::OnActivate()
UpdateProcessPriority();
#ifdef _WIN32
if (taskbarStatusColor())
taskProg->show();
taskProg->show();
taskProg->resume();
taskProg->setValue(1);
taskBtn->setOverlayIcon(QIcon::fromTheme(
@ -5428,8 +5427,7 @@ inline void OBSBasic::OnDeactivate()
} else {
if (os_atomic_load_bool(&recording_paused)) {
#ifdef _WIN32
if (taskbarStatusColor())
taskProg->show();
taskProg->show();
taskProg->pause();
taskBtn->setOverlayIcon(QIcon::fromTheme(
"obs-paused",
@ -5440,8 +5438,7 @@ inline void OBSBasic::OnDeactivate()
QIcon(":/res/images/obs_paused.png"));
} else {
#ifdef _WIN32
if (taskbarStatusColor())
taskProg->show();
taskProg->show();
taskProg->resume();
taskBtn->setOverlayIcon(QIcon::fromTheme(
"obs-active",
@ -7455,13 +7452,7 @@ bool OBSBasic::sysTrayMinimizeToTray()
return config_get_bool(GetGlobalConfig(), "BasicWindow",
"SysTrayMinimizeToTray");
}
#ifdef _WIN32
bool OBSBasic::taskbarStatusColor()
{
return config_get_bool(GetGlobalConfig(), "BasicWindow",
"TaskbarStatusColor");
}
#endif
void OBSBasic::on_actionCopySource_triggered()
{
copyStrings.clear();