libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-02 15:16:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

When the screen changes, redraw all dialogs *immediately* rather than waiting

Browse Source 
for the main loop to check for _needRedraw. Otherwise subsequent events can
cause widgets to be redrawn before the theme has had a chance to re-open the
dialogs, and this could cause at least the modern theme to crash.

svn-id: r22860
This commit is contained in:
Torbjörn Andersson 2006-06-03 10:48:37 +00:00
parent 3114f19d94
commit ca84620745
2 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
gui/newgui.cpp
View File

@ -131,6 +131,31 @@ NewGui::NewGui() : _needRedraw(false),
_theme->resetDrawArea();
}
void NewGui::redraw() {
int i;
// Restore the overlay to its initial state, then draw all dialogs.
// This is necessary to get the blending right.
_theme->clearAll();
for (i = 0; i < _dialogStack.size(); ++i) {
_theme->closeDialog();
}
for (i = 0; i < _dialogStack.size(); i++) {
// Special treatment when topmost dialog has dimsInactive() set to false
// This is the case for PopUpWidget which should not dim a dialog
// which it belongs to
if ((i == _dialogStack.size() - 2) && !_dialogStack[i + 1]->dimsInactive())
_theme->openDialog(true);
else if ((i != (_dialogStack.size() - 1)) || !_dialogStack[i]->dimsInactive())
_theme->openDialog(false);
else
_theme->openDialog(true);
_dialogStack[i]->drawDialog();
}
}
void NewGui::runLoop() {
Dialog *activeDialog = _dialogStack.top();
bool didSaveState = false;
@ -145,7 +170,6 @@ void NewGui::runLoop() {
didSaveState = true;
}
int i;
bool useStandardCurs = !_theme->ownCursor();
if (useStandardCurs) {
@ -163,26 +187,7 @@ void NewGui::runLoop() {
while (!_dialogStack.empty() && activeDialog == _dialogStack.top()) {
if (_needRedraw) {
// Restore the overlay to its initial state, then draw all dialogs.
// This is necessary to get the blending right.
_theme->clearAll();
for (i = 0; i < _dialogStack.size(); ++i) {
_theme->closeDialog();
}
for (i = 0; i < _dialogStack.size(); i++) {
// Special treatment when topmost dialog has dimsInactive() set to false
// This is the case for PopUpWidget which should not dim a dialog
// which it belongs to
if ((i == _dialogStack.size() - 2) && !_dialogStack[i + 1]->dimsInactive())
_theme->openDialog(true);
else if ((i != (_dialogStack.size() - 1)) || !_dialogStack[i]->dimsInactive())
_theme->openDialog(false);
else
_theme->openDialog(true);
_dialogStack[i]->drawDialog();
}
redraw();
_needRedraw = false;
}
@ -256,11 +261,14 @@ void NewGui::runLoop() {
case OSystem::EVENT_SCREEN_CHANGED:
// reinit the whole theme
_theme->refresh();
_needRedraw = true;
// refresh all dialogs
for (i = 0; i < _dialogStack.size(); ++i) {
for (int i = 0; i < _dialogStack.size(); ++i) {
_dialogStack[i]->handleScreenChanged();
}
// We need to redraw immediately. Otherwise
// some other event may cause a widget to be
// redrawn before redraw() has been called.
redraw();
break;
}
}

2
gui/newgui.h
View File

@ -120,6 +120,8 @@ protected:
void openDialog(Dialog *dialog);
void closeTopDialog();
void redraw();
void loop();
void animateCursor();