aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorStrangerke2011-10-23 21:44:39 +0200
committerStrangerke2011-10-23 21:45:02 +0200
commitcfa42fee80e422004d4df953e15d8b171e05e50e (patch)
tree76a128036d1730baaa26466ca4ecc2bb84181c0c /gui
parent3a196478c69b635c7c1c2d121b30d9710f8bd1e5 (diff)
downloadscummvm-rg350-cfa42fee80e422004d4df953e15d8b171e05e50e.tar.gz
scummvm-rg350-cfa42fee80e422004d4df953e15d8b171e05e50e.tar.bz2
scummvm-rg350-cfa42fee80e422004d4df953e15d8b171e05e50e.zip
LAUNCHER: Add GUIO_NOASPECT to SCUMM engine
Diffstat (limited to 'gui')
-rw-r--r--gui/options.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/gui/options.cpp b/gui/options.cpp
index ad2e3d92d0..d1eac64948 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -195,13 +195,18 @@ void OptionsDialog::open() {
#ifdef SMALL_SCREEN_DEVICE
_fullscreenCheckbox->setState(true);
_fullscreenCheckbox->setEnabled(false);
+ _aspectCheckbox->setState(false);
_aspectCheckbox->setEnabled(false);
#else // !SMALL_SCREEN_DEVICE
// Fullscreen setting
_fullscreenCheckbox->setState(ConfMan.getBool("fullscreen", _domain));
// Aspect ratio setting
- _aspectCheckbox->setState(ConfMan.getBool("aspect_ratio", _domain));
+ if (_guioptions.contains(GUIO_NOASPECT)) {
+ _aspectCheckbox->setState(false);
+ _aspectCheckbox->setEnabled(false);
+ } else
+ _aspectCheckbox->setState(ConfMan.getBool("aspect_ratio", _domain));
#endif // SMALL_SCREEN_DEVICE
_disableDitheringCheckbox->setState(ConfMan.getBool("disable_dithering", _domain));
}
@@ -585,7 +590,10 @@ void OptionsDialog::setGraphicSettingsState(bool enabled) {
_renderModePopUp->setEnabled(enabled);
#ifndef SMALL_SCREEN_DEVICE
_fullscreenCheckbox->setEnabled(enabled);
- _aspectCheckbox->setEnabled(enabled);
+ if (_guioptions.contains(GUIO_NOASPECT))
+ _aspectCheckbox->setEnabled(false);
+ else
+ _aspectCheckbox->setEnabled(enabled);
#endif
_disableDitheringCheckbox->setEnabled(enabled);
}