diff options
author | Vicent Marti | 2008-08-13 17:46:00 +0000 |
---|---|---|
committer | Vicent Marti | 2008-08-13 17:46:00 +0000 |
commit | 2b52383534ecb5c3770dfb267d7238516f0ca144 (patch) | |
tree | 0dc6b6d060b0a489f5f1b88fe7c46d24ee4ad458 /gui/dialog.cpp | |
parent | 1d9f98d121e51943b4967cf6188062aae9195af4 (diff) | |
download | scummvm-rg350-2b52383534ecb5c3770dfb267d7238516f0ca144.tar.gz scummvm-rg350-2b52383534ecb5c3770dfb267d7238516f0ca144.tar.bz2 scummvm-rg350-2b52383534ecb5c3770dfb267d7238516f0ca144.zip |
Finished legacy API cleanup. Removed all legacy code.
Possible regressions.
svn-id: r33833
Diffstat (limited to 'gui/dialog.cpp')
-rw-r--r-- | gui/dialog.cpp | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/gui/dialog.cpp b/gui/dialog.cpp index 1e58c654eb..3b302ff36a 100644 --- a/gui/dialog.cpp +++ b/gui/dialog.cpp @@ -42,18 +42,15 @@ namespace GUI { * ... */ -Dialog::Dialog(int x, int y, int w, int h, bool dimsInactive_) +Dialog::Dialog(int x, int y, int w, int h) : GuiObject(x, y, w, h), - _mouseWidget(0), _focusedWidget(0), _dragWidget(0), _visible(false), _drawingHints(0), - _dimsInactive(dimsInactive_) { - _drawingHints = THEME_HINT_FIRST_DRAW | THEME_HINT_SAVE_BACKGROUND; -} + _mouseWidget(0), _focusedWidget(0), _dragWidget(0), _visible(false), + _backgroundType(GUI::Theme::kDialogBackgroundDefault) {} -Dialog::Dialog(const Common::String &name, bool dimsInactive_) +Dialog::Dialog(const Common::String &name) : GuiObject(name), - _mouseWidget(0), _focusedWidget(0), _dragWidget(0), _visible(false), _drawingHints(0), - _dimsInactive(dimsInactive_) { - _drawingHints = THEME_HINT_FIRST_DRAW | THEME_HINT_SAVE_BACKGROUND; + _mouseWidget(0), _focusedWidget(0), _dragWidget(0), _visible(false), + _backgroundType(GUI::Theme::kDialogBackgroundDefault) { // It may happen that we have 3x scaler in launcher (960xY) and then 640x480 // game will be forced to 1x. At this stage GUI will not be aware of @@ -113,11 +110,9 @@ void Dialog::reflowLayout() { // changed, so any cached image may be invalid. The subsequent redraw // should be treated as the very first draw. - _drawingHints |= THEME_HINT_FIRST_DRAW; Widget *w = _firstWidget; while (w) { w->reflowLayout(); - w->setHints(THEME_HINT_FIRST_DRAW); w = w->_next; } @@ -144,8 +139,7 @@ void Dialog::drawDialog() { if (!isVisible()) return; - g_gui.theme()->drawDialogBackground(Common::Rect(_x, _y, _x+_w, _y+_h), _drawingHints); - _drawingHints &= ~THEME_HINT_FIRST_DRAW; + g_gui.theme()->drawDialogBackground(Common::Rect(_x, _y, _x+_w, _y+_h), _backgroundType); // Draw all children Widget *w = _firstWidget; |