UI: Remove support for toggling Aero

We no longer support Windows 7 and Aero (DWM composition) is
permanently enabled for all newer versions, so this code is obsolete.

UI/data/locale/en-US.ini

@@ -1048,7 +1048,6 @@ Basic.Settings.Video.BaseResolution="Base (Canvas) Resolution"
 Basic.Settings.Video.ScaledResolution="Output (Scaled) Resolution"
 Basic.Settings.Video.DownscaleFilter="Downscale Filter"
 Basic.Settings.Video.DownscaleFilter.Unavailable="[Resolutions match, no downscaling required]"
-Basic.Settings.Video.DisableAeroWindows="Disable Aero (Windows only)"
 Basic.Settings.Video.FPS="FPS"
 Basic.Settings.Video.FPSCommon="Common FPS Values"
 Basic.Settings.Video.FPSInteger="Integer FPS Value"
@@ -1058,7 +1057,6 @@ Basic.Settings.Video.Denominator="Denominator"
 Basic.Settings.Video.Renderer="Renderer"
 Basic.Settings.Video.InvalidResolution="Invalid resolution value. Must be [width]x[height] (i.e. 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="Video output is currently active. Please turn off any outputs to change video settings."
-Basic.Settings.Video.DisableAero="Disable Aero"
 
 # scale filters
 Basic.Settings.Video.DownscaleFilter.Bilinear="Bilinear (Fastest, but blurry if scaling)"

UI/platform-windows.cpp

@@ -176,33 +176,6 @@ uint32_t GetWindowsBuild()
 	return build;
 }
 
-void SetAeroEnabled(bool enable)
-{
-	static HRESULT(WINAPI * func)(UINT) = nullptr;
-	static bool failed = false;
-
-	if (!func) {
-		if (failed) {
-			return;
-		}
-
-		HMODULE dwm = LoadLibraryW(L"dwmapi");
-		if (!dwm) {
-			failed = true;
-			return;
-		}
-
-		func = reinterpret_cast<decltype(func)>(
-			GetProcAddress(dwm, "DwmEnableComposition"));
-		if (!func) {
-			failed = true;
-			return;
-		}
-	}
-
-	func(enable ? DWM_EC_ENABLECOMPOSITION : DWM_EC_DISABLECOMPOSITION);
-}
-
 bool IsAlwaysOnTop(QWidget *window)
 {
 	DWORD exStyle = GetWindowLong((HWND)window->winId(), GWL_EXSTYLE);

UI/platform.hpp

@@ -55,7 +55,6 @@ CheckIfAlreadyRunning(bool &already_running);
 #ifdef _WIN32
 uint32_t GetWindowsVersion();
 uint32_t GetWindowsBuild();
-void SetAeroEnabled(bool enable);
 void SetProcessPriority(const char *priority);
 void SetWin32DropStyle(QWidget *window);
 bool DisableAudioDucking(bool disable);

UI/window-basic-main.cpp

@@ -1893,15 +1893,6 @@ void OBSBasic::OBSInit()
 					  Qt::QueuedConnection,
 					  Q_ARG(bool, previewEnabled));
 
-#ifdef _WIN32
-	uint32_t winVer = GetWindowsVersion();
-	if (winVer > 0 && winVer < 0x602) {
-		bool disableAero =
-			config_get_bool(basicConfig, "Video", "DisableAero");
-		SetAeroEnabled(!disableAero);
-	}
-#endif
-
 	RefreshSceneCollections();
 	RefreshProfiles();
 	disableSaving--;
@@ -2717,17 +2708,6 @@ OBSBasic::~OBSBasic()
 			ui->lockDocks->isChecked());
 	config_save_safe(App()->GlobalConfig(), "tmp", nullptr);
 
-#ifdef _WIN32
-	uint32_t winVer = GetWindowsVersion();
-	if (winVer > 0 && winVer < 0x602) {
-		bool disableAero =
-			config_get_bool(basicConfig, "Video", "DisableAero");
-		if (disableAero) {
-			SetAeroEnabled(true);
-		}
-	}
-#endif
-
 #ifdef BROWSER_AVAILABLE
 	DestroyPanelCookieManager();
 	delete cef;

UI/window-basic-settings.cpp

@@ -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();

UI/window-basic-settings.hpp

@@ -218,12 +218,6 @@ private:
 		EnableApplyButton(false);
 	}
 
-#ifdef _WIN32
-	bool aeroWasDisabled = false;
-	QCheckBox *toggleAero = nullptr;
-	void ToggleDisableAero(bool checked);
-#endif
-
 	void HookWidget(QWidget *widget, const char *signal, const char *slot);
 
 	bool QueryChanges();