[Scummvm-git-logs] scummvm master -> 9acdbe42af5ceefc8c4b4f681cfedf440fe4ad70

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9acdbe42af GUI: Update "edit game" for new graphics options (#2512)


Commit: 9acdbe42af5ceefc8c4b4f681cfedf440fe4ad70
    https://github.com/scummvm/scummvm/commit/9acdbe42af5ceefc8c4b4f681cfedf440fe4ad70
Author: Torbjörn Andersson (eriktorbjorn at telia.com)
Date: 2020-10-12T18:44:15+02:00

Commit Message:
GUI: Update "edit game" for new graphics options (#2512)

Make the new graphics options in "edit game" disabled until the user
asks to override the global settings. (Most of these were added during
the ScummVM/ResidualVM merger, I guess.)

Changed paths:
    gui/editgamedialog.cpp
    gui/options.cpp


diff --git a/gui/editgamedialog.cpp b/gui/editgamedialog.cpp
index 74f5e05872..4f05087f21 100644
--- a/gui/editgamedialog.cpp
+++ b/gui/editgamedialog.cpp
@@ -382,8 +382,13 @@ void EditGameDialog::open() {
 
 	e = ConfMan.hasKey("gfx_mode", _domain) ||
 		ConfMan.hasKey("render_mode", _domain) ||
+		ConfMan.hasKey("stretch_mode", _domain) ||
+		ConfMan.hasKey("aspect_ratio", _domain) ||
 		ConfMan.hasKey("fullscreen", _domain) ||
-		ConfMan.hasKey("aspect_ratio", _domain);
+		ConfMan.hasKey("vsync", _domain) ||
+		ConfMan.hasKey("filtering", _domain) ||
+		ConfMan.hasKey("renderer", _domain) ||
+		ConfMan.hasKey("antialiasing", _domain);
 	_globalGraphicsOverride->setState(e);
 
 	if (g_system->hasFeature(OSystem::kFeatureShader)) {
diff --git a/gui/options.cpp b/gui/options.cpp
index 72580e2d4e..d2d4af7d66 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -978,7 +978,12 @@ void OptionsDialog::setGraphicSettingsState(bool enabled) {
 	_renderModePopUp->setEnabled(enabled);
 	_stretchPopUpDesc->setEnabled(enabled);
 	_stretchPopUp->setEnabled(enabled);
+	_vsyncCheckbox->setEnabled(enabled);
 	_filteringCheckbox->setEnabled(enabled);
+	_rendererTypePopUpDesc->setEnabled(enabled);
+	_rendererTypePopUp->setEnabled(enabled);
+	_antiAliasPopUpDesc->setEnabled(enabled);
+	_antiAliasPopUp->setEnabled(enabled);
 
 	if (g_system->hasFeature(OSystem::kFeatureFullscreenMode))
 		_fullscreenCheckbox->setEnabled(enabled);