diff options
author | Eugene Sandulenko | 2016-04-21 21:37:31 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2016-04-21 21:37:31 +0200 |
commit | c1bf8f9e559f939136588f4ce472565ff456ecaf (patch) | |
tree | 4aa76775db4cc65254879a89235cbe6310c7a5e3 /engines/wage/gui.cpp | |
parent | f3f9a57d2a6a5a8efeb4f3881a688cd263ae0f45 (diff) | |
download | scummvm-rg350-c1bf8f9e559f939136588f4ce472565ff456ecaf.tar.gz scummvm-rg350-c1bf8f9e559f939136588f4ce472565ff456ecaf.tar.bz2 scummvm-rg350-c1bf8f9e559f939136588f4ce472565ff456ecaf.zip |
WAGE: Cleanup
Diffstat (limited to 'engines/wage/gui.cpp')
-rw-r--r-- | engines/wage/gui.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp index 2446be9945..b9635fb086 100644 --- a/engines/wage/gui.cpp +++ b/engines/wage/gui.cpp @@ -151,7 +151,6 @@ Gui::Gui(WageEngine *engine) { _scene = NULL; _sceneDirty = true; _consoleDirty = true; - _bordersDirty = true; _menuDirty = true; _cursorDirty = false; _consoleFullRedraw = true; @@ -163,7 +162,6 @@ Gui::Gui(WageEngine *engine) { _consoleLineHeight = 8; // Dummy value which makes sense _consoleNumLines = 24; // Dummy value _builtInFonts = false; - _sceneIsActive = false; _cursorX = 0; _cursorY = 0; @@ -262,10 +260,12 @@ void Gui::draw() { _sceneWindow->setDimensions(*_scene->_designBounds); _sceneWindow->setTitle(_scene->_name); + _sceneWindow->setDirty(true); _consoleWindow->setDimensions(*_scene->_textBounds); + _consoleWindow->setDirty(true); } - if (_sceneDirty || _bordersDirty) { + if (_sceneDirty) { drawDesktop(); _wm.setFullRefresh(true); } @@ -287,13 +287,12 @@ void Gui::draw() { _sceneDirty = false; _consoleDirty = false; - _bordersDirty = false; _menuDirty = false; _consoleFullRedraw = false; } void Gui::drawScene() { - if (!_sceneDirty && !_bordersDirty) + if (!_sceneDirty) return; _scene->paint(_sceneWindow->getSurface(), 0, 0); @@ -304,11 +303,6 @@ void Gui::drawScene() { _menuDirty = true; _consoleFullRedraw = true; - _sceneArea.left = _scene->_designBounds->left + kBorderWidth - 2; - _sceneArea.top = _scene->_designBounds->top + kBorderWidth - 2; - _sceneArea.setWidth(_scene->_designBounds->width() - 2 * kBorderWidth); - _sceneArea.setHeight(_scene->_designBounds->height() - 2 * kBorderWidth); - _consoleTextArea.left = _scene->_textBounds->left + kBorderWidth - 2; _consoleTextArea.top = _scene->_textBounds->top + kBorderWidth - 2; _consoleTextArea.setWidth(_scene->_textBounds->width() - 2 * kBorderWidth); @@ -342,7 +336,7 @@ bool Gui::processSceneEvents(WindowClick click, Common::Event &event) { // Render console void Gui::drawConsole() { - if (!_consoleDirty && !_consoleFullRedraw && !_bordersDirty && !_sceneDirty) + if (!_consoleDirty && !_consoleFullRedraw && !_sceneDirty) return; renderConsole(_consoleWindow->getSurface(), Common::Rect(kBorderWidth - 2, kBorderWidth - 2, @@ -545,7 +539,6 @@ void Gui::mouseUp(int x, int y) { if (_menu->mouseRelease(x, y)) { _sceneDirty = true; _consoleDirty = true; - _bordersDirty = true; _menuDirty = true; } |