From f30df9aa7059a336506a39de37b5b5f099e22c35 Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Tue, 25 Oct 2011 23:34:15 -0500
Subject: GUI: Enable EGA Undithering in global options dialog

GUIO_EGAUNDITHER is a positive flag unlike the rest of the GUIO
negative flags like GUIO_NOASPECT and GUIO_NOSPEECH.
This means the gui option is only enabled if the flag exists.

This caused the gui option to be disabled in the global options dialog due
to the flag not existing in the global confman domain.
It is an inconvenience and a regression IMHO to have to set this flag on
a game by game basis with no option to set it globally and have the games
override it.

Thanks Strangerke for making me clarify.

Thanks LordHoto for feedback on code style.
---
 gui/options.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gui')

diff --git a/gui/options.cpp b/gui/options.cpp
index 2291bb5ee9..4ded2edca3 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -216,7 +216,7 @@ void OptionsDialog::open() {
 #endif // SMALL_SCREEN_DEVICE
 
 		// EGA undithering setting
-		if (_guioptions.contains(GUIO_EGAUNDITHER)) {
+		if (_guioptions.contains(GUIO_EGAUNDITHER)  || _domain == Common::ConfigManager::kApplicationDomain) {
 			_disableDitheringCheckbox->setEnabled(true);
 			_disableDitheringCheckbox->setState(ConfMan.getBool("disable_dithering", _domain));
 		} else {
@@ -609,7 +609,7 @@ void OptionsDialog::setGraphicSettingsState(bool enabled) {
 	else
 		_aspectCheckbox->setEnabled(enabled);
 #endif
-	if (_guioptions.contains(GUIO_EGAUNDITHER))
+	if (_guioptions.contains(GUIO_EGAUNDITHER) && enabled)
 		_disableDitheringCheckbox->setEnabled(true);
 	else
 		_disableDitheringCheckbox->setEnabled(false);
-- 
cgit v1.2.3