mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-07-25 14:46:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

UI: Remove support for toggling Aero

Browse Source 
We no longer support Windows 7 and Aero (DWM composition) is
permanently enabled for all newer versions, so this code is obsolete.
This commit is contained in:
Richard Stanway
2022-08-24 02:16:40 +02:00
committed by Jim
parent da3a81a637
commit 7e0ade0df0
6 changed files with 0 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,13 +259,6 @@ static CodecDesc GetDefaultCodecDesc(const ff_format_desc *formatDesc,
id);
}
#ifdef _WIN32
void OBSBasicSettings::ToggleDisableAero(bool checked)
{
SetAeroEnabled(!checked);
}
#endif
static void PopulateAACBitrates(initializer_list<QComboBox *> boxes)
{
auto &bitrateMap = GetAACEncoderBitrateMap();
@@ -598,20 +591,6 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
}
#ifdef _WIN32
uint32_t winVer = GetWindowsVersion();
if (winVer > 0 && winVer < 0x602) {
// Older than Windows 8
toggleAero = new QCheckBox(
QTStr("Basic.Settings.Video.DisableAero"), this);
QFormLayout *videoLayout = reinterpret_cast<QFormLayout *>(
ui->videoPage->layout());
videoLayout->addRow(nullptr, toggleAero);
HookWidget(toggleAero, CHECK_CHANGED, VIDEO_CHANGED);
connect(toggleAero, &QAbstractButton::toggled, this,
&OBSBasicSettings::ToggleDisableAero);
}
if (!SetDisplayAffinitySupported()) {
delete ui->hideOBSFromCapture;
ui->hideOBSFromCapture = nullptr;
@@ -1705,16 +1684,6 @@ void OBSBasicSettings::LoadVideoSettings()
LoadFPSData();
LoadDownscaleFilters();
#ifdef _WIN32
if (toggleAero) {
bool disableAero =
config_get_bool(main->Config(), "Video", "DisableAero");
toggleAero->setChecked(disableAero);
aeroWasDisabled = disableAero;
}
#endif
loading = false;
}
@@ -3290,13 +3259,6 @@ void OBSBasicSettings::SaveVideoSettings()
SaveSpinBox(ui->fpsNumerator, "Video", "FPSNum");
SaveSpinBox(ui->fpsDenominator, "Video", "FPSDen");
SaveComboData(ui->downscaleFilter, "Video", "ScaleType");
#ifdef _WIN32
if (toggleAero) {
SaveCheckBox(toggleAero, "Video", "DisableAero");
aeroWasDisabled = toggleAero->isChecked();
}
#endif
}
void OBSBasicSettings::SaveAdvancedSettings()
@@ -3896,10 +3858,6 @@ bool OBSBasicSettings::QueryChanges()
App()->SetTheme(savedTheme);
LoadSettings(true);
#ifdef _WIN32
if (toggleAero)
SetAeroEnabled(!aeroWasDisabled);
#endif
restart = false;
}
@@ -3951,10 +3909,6 @@ void OBSBasicSettings::on_buttonBox_clicked(QAbstractButton *button)
if (val == QDialogButtonBox::RejectRole) {
if (savedTheme != App()->GetTheme())
App()->SetTheme(savedTheme);
#ifdef _WIN32
if (toggleAero)
SetAeroEnabled(!aeroWasDisabled);
#endif
}
ClearChanged();
close();