aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--backends/keymapper/remap-dialog.cpp2
-rw-r--r--engines/scumm/dialogs.cpp12
-rw-r--r--gui/browser.cpp3
-rw-r--r--gui/console.cpp34
-rw-r--r--gui/dialog.cpp8
-rw-r--r--gui/dialog.h1
-rw-r--r--gui/downloaddialog.cpp7
-rw-r--r--gui/editgamedialog.cpp25
-rw-r--r--gui/filebrowser-dialog.cpp3
-rw-r--r--gui/fluidsynth-dialog.cpp3
-rw-r--r--gui/gui-manager.cpp4
-rw-r--r--gui/gui-manager.h2
-rw-r--r--gui/launcher.cpp8
-rw-r--r--gui/object.h2
-rw-r--r--gui/options.cpp18
-rw-r--r--gui/remotebrowser.cpp9
-rw-r--r--gui/saveload-dialog.cpp16
-rw-r--r--gui/storagewizarddialog.cpp2
-rw-r--r--gui/themebrowser.cpp2
-rw-r--r--gui/widget.cpp2
-rw-r--r--gui/widgets/list.cpp2
-rw-r--r--gui/widgets/scrollcontainer.cpp2
-rw-r--r--gui/widgets/tab.cpp6
23 files changed, 84 insertions, 89 deletions
diff --git a/backends/keymapper/remap-dialog.cpp b/backends/keymapper/remap-dialog.cpp
index 78a95207ad..9c52a922c5 100644
--- a/backends/keymapper/remap-dialog.cpp
+++ b/backends/keymapper/remap-dialog.cpp
@@ -451,7 +451,7 @@ void RemapDialog::refreshKeymap() {
}
// need to redraw entire Dialog so that invisible
// widgets disappear
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 8acb6eb6de..1af752326a 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -358,7 +358,7 @@ void HelpDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 da
_prevButton->setFlags(WIDGET_ENABLED);
}
displayKeyBindings();
- draw();
+ g_gui.scheduleTopDialogRedraw();
break;
case kPrevCmd:
_page--;
@@ -369,7 +369,7 @@ void HelpDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 da
_prevButton->clearFlags(WIDGET_ENABLED);
}
displayKeyBindings();
- draw();
+ g_gui.scheduleTopDialogRedraw();
break;
default:
ScummDialog::handleCommand(sender, cmd, data);
@@ -553,7 +553,7 @@ void ValueDisplayDialog::handleKeyDown(Common::KeyState state) {
setResult(_value);
_timer = g_system->getMillis() + kDisplayDelay;
- draw();
+ g_gui.scheduleTopDialogRedraw();
} else {
close();
}
@@ -581,7 +581,7 @@ void SubtitleSettingsDialog::handleKeyDown(Common::KeyState state) {
cycleValue();
reflowLayout();
- draw();
+ g_gui.scheduleTopDialogRedraw();
} else {
close();
}
@@ -634,7 +634,7 @@ void DebugInputDialog::handleKeyDown(Common::KeyState state) {
buffer.deleteLastChar();
Common::String total = mainText + ' ' + buffer;
setInfoText(total);
- draw();
+ g_gui.scheduleTopDialogRedraw();
reflowLayout();
} else if (state.keycode == Common::KEYCODE_RETURN) {
done = 1;
@@ -643,7 +643,7 @@ void DebugInputDialog::handleKeyDown(Common::KeyState state) {
} else if ((state.ascii >= '0' && state.ascii <= '9') || (state.ascii >= 'A' && state.ascii <= 'Z') || (state.ascii >= 'a' && state.ascii <= 'z') || state.ascii == '.' || state.ascii == ' ') {
buffer += state.ascii;
Common::String total = mainText + ' ' + buffer;
- draw();
+ g_gui.scheduleTopDialogRedraw();
reflowLayout();
setInfoText(total);
}
diff --git a/gui/browser.cpp b/gui/browser.cpp
index bbfe485ba4..67b0dd9174 100644
--- a/gui/browser.cpp
+++ b/gui/browser.cpp
@@ -21,6 +21,7 @@
*/
#include "gui/browser.h"
+#include "gui/gui-manager.h"
#include "gui/widgets/list.h"
#include "common/config-manager.h"
@@ -191,7 +192,7 @@ void BrowserDialog::updateListing() {
_fileList->scrollTo(0);
// Finally, redraw
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
} // End of namespace GUI
diff --git a/gui/console.cpp b/gui/console.cpp
index 5d28f5a581..942ef615ab 100644
--- a/gui/console.cpp
+++ b/gui/console.cpp
@@ -214,7 +214,7 @@ void ConsoleDialog::reflowLayout() {
updateScrollBuffer();
Dialog::reflowLayout();
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
void ConsoleDialog::handleTickle() {
@@ -237,13 +237,13 @@ void ConsoleDialog::handleTickle() {
// End the slide
_slideMode = kNoSlideMode;
_y = 0;
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
} else if (_slideMode == kUpSlideMode && _y <= -_h) {
// End the slide
//_slideMode = kNoSlideMode;
close();
} else
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
_scrollBar->handleTickle();
@@ -292,7 +292,7 @@ void ConsoleDialog::handleKeyDown(Common::KeyState state) {
print(PROMPT);
_promptStartPos = _promptEndPos = _currentPos;
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
if (!keepRunning)
slideUpAndClose();
break;
@@ -377,7 +377,7 @@ void ConsoleDialog::handleKeyDown(Common::KeyState state) {
} else {
_currentPos = _promptEndPos;
}
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
break;
case Common::KEYCODE_KP2:
@@ -405,7 +405,7 @@ void ConsoleDialog::handleKeyDown(Common::KeyState state) {
_scrollLine = _firstLineInBuffer + _linesPerPage - 1;
}
updateScrollBuffer();
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
break;
@@ -446,7 +446,7 @@ void ConsoleDialog::handleKeyDown(Common::KeyState state) {
} else {
_currentPos = _promptStartPos;
}
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
break;
case Common::KEYCODE_KP8:
@@ -471,7 +471,7 @@ void ConsoleDialog::handleKeyDown(Common::KeyState state) {
if (_scrollLine < _firstLineInBuffer + _linesPerPage - 1)
_scrollLine = _firstLineInBuffer + _linesPerPage - 1;
updateScrollBuffer();
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
break;
@@ -508,7 +508,7 @@ void ConsoleDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data
int newPos = (int)data + _linesPerPage - 1 + _firstLineInBuffer;
if (newPos != _scrollLine) {
_scrollLine = newPos;
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
break;
}
@@ -518,25 +518,25 @@ void ConsoleDialog::specialKeys(int keycode) {
switch (keycode) {
case Common::KEYCODE_a:
_currentPos = _promptStartPos;
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
break;
case Common::KEYCODE_d:
if (_currentPos < _promptEndPos) {
killChar();
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
break;
case Common::KEYCODE_e:
_currentPos = _promptEndPos;
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
break;
case Common::KEYCODE_k:
killLine();
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
break;
case Common::KEYCODE_w:
killLastWord();
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
break;
}
}
@@ -626,7 +626,7 @@ void ConsoleDialog::historyScroll(int direction) {
// Ensure once more the caret is visible (in case of very long history entries)
scrollToCurrent();
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
void ConsoleDialog::nextLine() {
@@ -704,7 +704,7 @@ void ConsoleDialog::print(const char *str) {
while (*str)
printCharIntern(*str++);
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
void ConsoleDialog::drawCaret(bool erase) {
@@ -733,7 +733,7 @@ void ConsoleDialog::scrollToCurrent() {
} else if (line > _scrollLine) {
_scrollLine = line;
updateScrollBuffer();
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
}
diff --git a/gui/dialog.cpp b/gui/dialog.cpp
index 7434118404..408387b662 100644
--- a/gui/dialog.cpp
+++ b/gui/dialog.cpp
@@ -153,14 +153,6 @@ void Dialog::releaseFocus() {
}
}
-void Dialog::markAsDirty() {
- //TANOKU - FIXME when is this enabled? what does this do?
- // Update: called on tab drawing, mainly...
- // we can pass this as open a new dialog or something
-// g_gui._needRedraw = true;
- g_gui._redrawStatus = GUI::GuiManager::kRedrawTopDialog;
-}
-
void Dialog::markWidgetsAsDirty() {
Widget *w = _firstWidget;
while (w) {
diff --git a/gui/dialog.h b/gui/dialog.h
index cb6e13f974..8f3b2343f5 100644
--- a/gui/dialog.h
+++ b/gui/dialog.h
@@ -88,7 +88,6 @@ protected:
virtual void open();
virtual void close();
- void markAsDirty() override;
/** Recursively mark all the widgets in this dialog as dirty so they are redrawn */
void markWidgetsAsDirty();
diff --git a/gui/downloaddialog.cpp b/gui/downloaddialog.cpp
index dc6d7ff95f..4df7dc7707 100644
--- a/gui/downloaddialog.cpp
+++ b/gui/downloaddialog.cpp
@@ -29,6 +29,7 @@
#include "gui/browser.h"
#include "gui/chooser.h"
#include "gui/editgamedialog.h"
+#include "gui/gui-manager.h"
#include "gui/launcher.h"
#include "gui/message.h"
#include "gui/remotebrowser.h"
@@ -81,7 +82,7 @@ void DownloadDialog::open() {
if (!selectDirectories())
close();
reflowLayout();
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
void DownloadDialog::close() {
@@ -101,7 +102,7 @@ void DownloadDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
case kDownloadProgressCmd:
if (!_close) {
refreshWidgets();
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
break;
case kDownloadEndedCmd:
@@ -196,7 +197,7 @@ void DownloadDialog::handleTickle() {
int32 progress = (int32)(100 * CloudMan.getDownloadingProgress());
if (_progressBar->getValue() != progress) {
refreshWidgets();
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
Dialog::handleTickle();
diff --git a/gui/editgamedialog.cpp b/gui/editgamedialog.cpp
index b99b53c686..4192c4058a 100644
--- a/gui/editgamedialog.cpp
+++ b/gui/editgamedialog.cpp
@@ -28,6 +28,7 @@
#include "common/system.h"
#include "gui/browser.h"
+#include "gui/gui-manager.h"
#include "gui/message.h"
#ifdef ENABLE_EVENTRECORDER
#include "gui/onscreendialog.h"
@@ -424,26 +425,26 @@ void EditGameDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
switch (cmd) {
case kCmdGlobalGraphicsOverride:
setGraphicSettingsState(data != 0);
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
break;
case kCmdGlobalAudioOverride:
setAudioSettingsState(data != 0);
setSubtitleSettingsState(data != 0);
if (_globalVolumeOverride == NULL)
setVolumeSettingsState(data != 0);
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
break;
case kCmdGlobalMIDIOverride:
setMIDISettingsState(data != 0);
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
break;
case kCmdGlobalMT32Override:
setMT32SettingsState(data != 0);
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
break;
case kCmdGlobalVolumeOverride:
setVolumeSettingsState(data != 0);
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
break;
case kCmdChooseSoundFontCmd:
{
@@ -459,7 +460,7 @@ void EditGameDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
else
_soundFontClearButton->setEnabled(false);
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
break;
}
@@ -477,9 +478,9 @@ void EditGameDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
// FSList files = dir.listDir(FSNode::kListFilesOnly);
_gamePathWidget->setLabel(dir.getPath());
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
break;
}
@@ -491,9 +492,9 @@ void EditGameDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
// User made his choice...
Common::FSNode dir(browser.getResult());
_extraPathWidget->setLabel(dir.getPath());
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
break;
}
// Change path for stored save game (perm and temp) data
@@ -508,9 +509,9 @@ void EditGameDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
MessageDialog warningMessage(_("Saved games sync feature doesn't work with non-default directories. If you want your saved games to sync, use default directory."));
warningMessage.runModal();
#endif
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
break;
}
diff --git a/gui/filebrowser-dialog.cpp b/gui/filebrowser-dialog.cpp
index 95fc4d9e0a..0c7f55a46e 100644
--- a/gui/filebrowser-dialog.cpp
+++ b/gui/filebrowser-dialog.cpp
@@ -30,6 +30,7 @@
#include "common/translation.h"
#include "gui/widgets/list.h"
+#include "gui/gui-manager.h"
#include "gui/message.h"
namespace GUI {
@@ -154,7 +155,7 @@ void FileBrowserDialog::updateListing() {
_fileList->scrollTo(0);
// Finally, redraw
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
} // End of namespace GUI
diff --git a/gui/fluidsynth-dialog.cpp b/gui/fluidsynth-dialog.cpp
index fb729971ed..921449eee8 100644
--- a/gui/fluidsynth-dialog.cpp
+++ b/gui/fluidsynth-dialog.cpp
@@ -21,6 +21,7 @@
*/
#include "gui/fluidsynth-dialog.h"
+#include "gui/gui-manager.h"
#include "gui/message.h"
#include "gui/widgets/tab.h"
#include "gui/widgets/popup.h"
@@ -218,7 +219,7 @@ void FluidSynthSettingsDialog::handleCommand(CommandSender *sender, uint32 cmd,
if (alert.runModal() == GUI::kMessageOK) {
resetSettings();
readSettings();
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
break;
}
diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index 08417c3b6e..7c00c68189 100644
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@ -590,8 +590,8 @@ void GuiManager::processEvent(const Common::Event &event, Dialog *const activeDi
}
}
-void GuiManager::doFullRedraw() {
- _redrawStatus = kRedrawFull;
+void GuiManager::scheduleTopDialogRedraw() {
+ _redrawStatus = kRedrawTopDialog;
}
void GuiManager::giveFocusToDialog(Dialog *dialog) {
diff --git a/gui/gui-manager.h b/gui/gui-manager.h
index 82a8aa9cfd..07ea474628 100644
--- a/gui/gui-manager.h
+++ b/gui/gui-manager.h
@@ -75,7 +75,7 @@ public:
void runLoop();
void processEvent(const Common::Event &event, Dialog *const activeDialog);
- void doFullRedraw();
+ void scheduleTopDialogRedraw();
bool isActive() const { return ! _dialogStack.empty(); }
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 5f73776392..4fe1ae79c8 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -323,7 +323,7 @@ void LauncherDialog::addGame() {
selectTarget(newTarget);
}
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
// We need to update the buttons here, so "Mass add" will revert to "Add game"
@@ -427,7 +427,7 @@ void LauncherDialog::removeGame(int item) {
// Update the ListWidget and force a redraw
updateListing();
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
}
@@ -452,7 +452,7 @@ void LauncherDialog::editGame(int item) {
// Update the ListWidget, reselect the edited game and force a redraw
updateListing();
selectTarget(editDialog.getDomain());
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
}
@@ -614,7 +614,7 @@ bool LauncherDialog::doGameDetection(const Common::String &path) {
// Update the ListWidget, select the new item, and force a redraw
updateListing();
selectTarget(editDialog.getDomain());
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
} else {
// User aborted, remove the the new domain again
ConfMan.removeGameDomain(domain);
diff --git a/gui/object.h b/gui/object.h
index af64697d15..40ea2da636 100644
--- a/gui/object.h
+++ b/gui/object.h
@@ -87,8 +87,6 @@ public:
virtual bool isVisible() const = 0;
- virtual void markAsDirty() = 0;
-
virtual void reflowLayout();
virtual void removeWidget(Widget *widget);
diff --git a/gui/options.cpp b/gui/options.cpp
index 38ad185f50..6083a2ccbf 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -773,7 +773,7 @@ void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data
case kClearSoundFontCmd:
_soundFont->setLabel(_c("None", "soundfont"));
_soundFontClearButton->setEnabled(false);
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
break;
case kKbdMouseSpeedChanged:
_kbdMouseSpeedLabel->setLabel(_(kbdMouseSpeedLabels[_kbdMouseSpeedSlider->getValue()]));
@@ -1936,7 +1936,7 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
error.runModal();
return;
}
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
break;
}
@@ -1946,7 +1946,7 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
// User made his choice...
Common::FSNode dir(browser.getResult());
_themePath->setLabel(dir.getPath());
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
break;
}
@@ -1956,7 +1956,7 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
// User made his choice...
Common::FSNode dir(browser.getResult());
_extraPath->setLabel(dir.getPath());
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
break;
}
@@ -1967,7 +1967,7 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
// User made his choice...
Common::FSNode dir(browser.getResult());
_pluginsPath->setLabel(dir.getPath());
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
break;
}
@@ -1982,7 +1982,7 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
if (path.empty())
path = "/"; // absolute root
_rootPath->setLabel(path);
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
break;
}
@@ -2013,7 +2013,7 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
else
_soundFontClearButton->setEnabled(false);
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
break;
}
@@ -2107,7 +2107,7 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
if (_serverPort) {
_serverPort->setEditString(Common::String::format("%u", Networking::LocalWebserver::DEFAULT_SERVER_PORT));
}
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
break;
}
#endif // USE_SDL_NET
@@ -2144,7 +2144,7 @@ void GlobalOptionsDialog::handleTickle() {
#endif
if (_redrawCloudTab) {
setupCloudTab();
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
_redrawCloudTab = false;
}
#endif
diff --git a/gui/remotebrowser.cpp b/gui/remotebrowser.cpp
index 1d503001e0..0bbc21d66f 100644
--- a/gui/remotebrowser.cpp
+++ b/gui/remotebrowser.cpp
@@ -21,6 +21,7 @@
*/
#include "gui/remotebrowser.h"
+#include "gui/gui-manager.h"
#include "gui/widgets/list.h"
#include "common/config-manager.h"
@@ -28,9 +29,9 @@
#include "common/algorithm.h"
#include "common/translation.h"
-#include <backends/networking/curl/request.h>
-#include <backends/cloud/storage.h>
-#include <backends/cloud/cloudmanager.h>
+#include "backends/networking/curl/request.h"
+#include "backends/cloud/storage.h"
+#include "backends/cloud/cloudmanager.h"
#include "message.h"
namespace GUI {
@@ -162,7 +163,7 @@ void RemoteBrowserDialog::updateListing() {
_fileList->setEnabled(!_navigationLocked);
// Finally, redraw
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
void RemoteBrowserDialog::goUp() {
diff --git a/gui/saveload-dialog.cpp b/gui/saveload-dialog.cpp
index 6d2a43bfb3..8d59a6318a 100644
--- a/gui/saveload-dialog.cpp
+++ b/gui/saveload-dialog.cpp
@@ -60,7 +60,7 @@ SaveLoadCloudSyncProgressDialog::SaveLoadCloudSyncProgressDialog(bool canRunInBa
new ButtonWidget(this, "SaveLoadCloudSyncProgress.Cancel", "Cancel", 0, kCancelSyncCmd, Common::ASCII_ESCAPE); // Cancel dialog
ButtonWidget *backgroundButton = new ButtonWidget(this, "SaveLoadCloudSyncProgress.Background", "Run in background", 0, kBackgroundSyncCmd, Common::ASCII_RETURN); // Confirm dialog
backgroundButton->setEnabled(canRunInBackground);
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
SaveLoadCloudSyncProgressDialog::~SaveLoadCloudSyncProgressDialog() {
@@ -601,7 +601,7 @@ void SaveLoadChooserSimple::updateSelection(bool redraw) {
_chooseButton->markAsDirty();
_deleteButton->markAsDirty();
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
}
@@ -703,7 +703,7 @@ void SaveLoadChooserSimple::updateSaveList() {
else
_chooseButton->setEnabled(false);
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
// SaveLoadChooserGrid implementation
@@ -761,13 +761,13 @@ void SaveLoadChooserGrid::handleCommand(CommandSender *sender, uint32 cmd, uint3
case kNextCmd:
++_curPage;
updateSaves();
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
break;
case kPrevCmd:
--_curPage;
updateSaves();
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
break;
case kNewSaveCmd:
@@ -788,13 +788,13 @@ void SaveLoadChooserGrid::handleMouseWheel(int x, int y, int direction) {
if (_nextButton->isEnabled()) {
++_curPage;
updateSaves();
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
} else {
if (_prevButton->isEnabled()) {
--_curPage;
updateSaves();
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
}
}
@@ -802,7 +802,7 @@ void SaveLoadChooserGrid::handleMouseWheel(int x, int y, int direction) {
void SaveLoadChooserGrid::updateSaveList() {
SaveLoadChooserDialog::updateSaveList();
updateSaves();
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
void SaveLoadChooserGrid::open() {
diff --git a/gui/storagewizarddialog.cpp b/gui/storagewizarddialog.cpp
index e7a684c5a1..fe5a1090cd 100644
--- a/gui/storagewizarddialog.cpp
+++ b/gui/storagewizarddialog.cpp
@@ -231,7 +231,7 @@ void StorageWizardDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
_codeWidget[i]->setEditString(subcode);
}
handleCommand(sender, kCodeBoxCmd, data);
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
break;
}
diff --git a/gui/themebrowser.cpp b/gui/themebrowser.cpp
index d21979cac4..6705c07dfe 100644
--- a/gui/themebrowser.cpp
+++ b/gui/themebrowser.cpp
@@ -115,7 +115,7 @@ void ThemeBrowser::updateListing() {
_fileList->setSelected(currentThemeIndex);
// Finally, redraw
- markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
} // End of namespace GUI
diff --git a/gui/widget.cpp b/gui/widget.cpp
index fa3767b605..9993d64dbb 100644
--- a/gui/widget.cpp
+++ b/gui/widget.cpp
@@ -206,7 +206,7 @@ void Widget::setEnabled(bool e) {
else
clearFlags(WIDGET_ENABLED);
- _boss->markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
}
diff --git a/gui/widgets/list.cpp b/gui/widgets/list.cpp
index 16d91f9a1e..b4a5f4bf0b 100644
--- a/gui/widgets/list.cpp
+++ b/gui/widgets/list.cpp
@@ -744,7 +744,7 @@ void ListWidget::setFilter(const String &filter, bool redraw) {
// Such a widget could also (optionally) draw a border (or even different
// kinds of borders) around the objects it groups; and also a 'title'
// (I am borrowing these "ideas" from the NSBox class in Cocoa :).
- _boss->markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
}
diff --git a/gui/widgets/scrollcontainer.cpp b/gui/widgets/scrollcontainer.cpp
index 00eadff78d..d6b1b740fd 100644
--- a/gui/widgets/scrollcontainer.cpp
+++ b/gui/widgets/scrollcontainer.cpp
@@ -102,7 +102,7 @@ void ScrollContainerWidget::handleCommand(CommandSender *sender, uint32 cmd, uin
case kSetPositionCmd:
_scrolledY = _verticalScroll->_currentPos;
reflowLayout();
- g_gui.doFullRedraw();
+ g_gui.scheduleTopDialogRedraw();
break;
}
}
diff --git a/gui/widgets/tab.cpp b/gui/widgets/tab.cpp
index 9b045daf51..dfcb919264 100644
--- a/gui/widgets/tab.cpp
+++ b/gui/widgets/tab.cpp
@@ -154,7 +154,7 @@ void TabWidget::removeTab(int tabID) {
}
// Finally trigger a redraw
- _boss->markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
void TabWidget::setActiveTab(int tabID) {
@@ -174,7 +174,7 @@ void TabWidget::setActiveTab(int tabID) {
while (_lastVisibleTab < tabID)
setFirstVisible(_firstVisibleTab + 1, false);
- _boss->markAsDirty();
+ g_gui.scheduleTopDialogRedraw();
}
}
@@ -246,7 +246,7 @@ void TabWidget::setFirstVisible(int tabID, bool adjustIfRoom) {
computeLastVisibleTab(adjustIfRoom);
- _boss->markAsDirty(); // TODO: Necessary?
+ g_gui.scheduleTopDialogRedraw(); // TODO: Necessary?
}
void TabWidget::reflowLayout() {
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-11 11:40:38 +0000