aboutsummaryrefslogtreecommitdiff
path: root/gui/newgui.cpp
diff options
context:
space:
mode:
authorMax Horn2005-05-15 17:08:44 +0000
committerMax Horn2005-05-15 17:08:44 +0000
commit2425e657a2dc1a22b3e0502b37fd9e584e3abf51 (patch)
tree04755a0fdab571bf1a476f7998498fbaabf1550d /gui/newgui.cpp
parent2d40452a119fd9a0ed4b482b92c9c8df5978c917 (diff)
downloadscummvm-rg350-2425e657a2dc1a22b3e0502b37fd9e584e3abf51.tar.gz
scummvm-rg350-2425e657a2dc1a22b3e0502b37fd9e584e3abf51.tar.bz2
scummvm-rg350-2425e657a2dc1a22b3e0502b37fd9e584e3abf51.zip
Add a switch which allows turning off the automatic GUI scaling easily
svn-id: r18112
Diffstat (limited to 'gui/newgui.cpp')
-rw-r--r--gui/newgui.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/gui/newgui.cpp b/gui/newgui.cpp
index a7fa7cd674..73346392a3 100644
--- a/gui/newgui.cpp
+++ b/gui/newgui.cpp
@@ -49,8 +49,10 @@ enum {
};
+#define USE_AUTO_SCALING true
+
// Constructor
-NewGui::NewGui() : _scaleEnable(true), _needRedraw(false),
+NewGui::NewGui() : _scaleEnable(USE_AUTO_SCALING), _needRedraw(false),
_stateIsSaved(false), _font(0), _cursorAnimateCounter(0), _cursorAnimateTimer(0) {
_system = &OSystem::instance();
@@ -106,7 +108,7 @@ void NewGui::runLoop() {
// EVENT_SCREEN_CHANGED is received. However, not yet all backends support
// that event, so we also do it "manually" whenever a run loop is entered.
updateColors();
- _scaleEnable = activeDialog->wantsScaling();
+ _scaleEnable = USE_AUTO_SCALING && activeDialog->wantsScaling();
updateScaleFactor();
if (!_stateIsSaved) {
@@ -125,7 +127,7 @@ void NewGui::runLoop() {
for (int i = 0; i < _dialogStack.size(); i++) {
// For each dialog we draw we have to ensure the correct
// scaling mode is active.
- _scaleEnable = _dialogStack[i]->wantsScaling();
+ _scaleEnable = USE_AUTO_SCALING && _dialogStack[i]->wantsScaling();
updateScaleFactor();
_dialogStack[i]->drawDialog();
}