mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-03-06 15:46:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

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
parent aade26649b
commit 959dbb64ed
6 changed files with 7 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
UI/window-basic-settings.cpp
View File

@@ -398,9 +398,6 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
HookWidget(ui->systemTrayEnabled, CHECK_CHANGED, GENERAL_CHANGED);
HookWidget(ui->systemTrayWhenStarted,CHECK_CHANGED, GENERAL_CHANGED);
HookWidget(ui->systemTrayAlways, CHECK_CHANGED, GENERAL_CHANGED);
#ifdef _WIN32
HookWidget(ui->taskbarColor, CHECK_CHANGED, GENERAL_CHANGED);
#endif
HookWidget(ui->saveProjectors, CHECK_CHANGED, GENERAL_CHANGED);
HookWidget(ui->snappingEnabled, CHECK_CHANGED, GENERAL_CHANGED);
HookWidget(ui->screenSnapping, CHECK_CHANGED, GENERAL_CHANGED);
@@ -632,7 +629,6 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
delete ui->enableNewSocketLoop;
delete ui->enableLowLatencyMode;
delete ui->browserHWAccel;
delete ui->taskbarColor;
delete ui->sourcesGroup;
#if defined(__APPLE__) || HAVE_PULSEAUDIO
delete ui->disableAudioDucking;
@@ -647,7 +643,6 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
ui->enableNewSocketLoop = nullptr;
ui->enableLowLatencyMode = nullptr;
ui->browserHWAccel = nullptr;
ui->taskbarColor = nullptr;
ui->sourcesGroup = nullptr;
#if defined(__APPLE__) || HAVE_PULSEAUDIO
ui->disableAudioDucking = nullptr;
@@ -1203,11 +1198,7 @@ void OBSBasicSettings::LoadGeneralSettings()
bool systemTrayAlways = config_get_bool(
GetGlobalConfig(), "BasicWindow", "SysTrayMinimizeToTray");
ui->systemTrayAlways->setChecked(systemTrayAlways);
#ifdef _WIN32
bool taskbarColor = config_get_bool(GetGlobalConfig(), "BasicWindow",
"TaskbarStatusColor");
ui->taskbarColor->setChecked(taskbarColor);
#endif
bool saveProjectors = config_get_bool(GetGlobalConfig(), "BasicWindow",
"SaveProjectors");
ui->saveProjectors->setChecked(saveProjectors);
@@ -3003,15 +2994,7 @@ void OBSBasicSettings::SaveGeneralSettings()
config_set_bool(GetGlobalConfig(), "BasicWindow",
"SysTrayMinimizeToTray",
ui->systemTrayAlways->isChecked());
#ifdef _WIN32
if (WidgetChanged(ui->taskbarColor)) {
bool enable_color = ui->taskbarColor->isChecked();
config_set_bool(GetGlobalConfig(), "BasicWindow",
"TaskbarStatusColor", enable_color);
if (!enable_color)
main->taskProg->setVisible(enable_color);
}
#endif
if (WidgetChanged(ui->saveProjectors))
config_set_bool(GetGlobalConfig(), "BasicWindow",
"SaveProjectors",