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

Added two FIXMEs to global options dialog, related to theme selection

Browse Source 
svn-id: r35650
This commit is contained in:
Max Horn 2009-01-01 17:02:45 +00:00
parent 41dce61a30
commit c62efbcab3
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gui/options.cpp
View File

@ -847,6 +847,8 @@ void GlobalOptionsDialog::close() {
GUI::ThemeEngine::GraphicsMode selected = (GUI::ThemeEngine::GraphicsMode)_rendererPopUp->getSelectedTag(); GUI::ThemeEngine::GraphicsMode selected = (GUI::ThemeEngine::GraphicsMode)_rendererPopUp->getSelectedTag();
const char *cfg = GUI::ThemeEngine::findModeConfigName(selected); const char *cfg = GUI::ThemeEngine::findModeConfigName(selected);
if (!ConfMan.get("gui_renderer").equalsIgnoreCase(cfg)) { if (!ConfMan.get("gui_renderer").equalsIgnoreCase(cfg)) {
// FIXME: Actually, any changes (including the theme change) should
// only become active *after* the options dialog has closed.
g_gui.loadNewTheme(g_gui.theme()->getThemeFileName(), selected); g_gui.loadNewTheme(g_gui.theme()->getThemeFileName(), selected);
ConfMan.set("gui_renderer", cfg, _domain); ConfMan.set("gui_renderer", cfg, _domain);
} }
@ -930,12 +932,13 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
ThemeBrowser browser; ThemeBrowser browser;
if (browser.runModal() > 0) { if (browser.runModal() > 0) {
// User made his choice... // User made his choice...
const Common::String &theme = browser.getSelected(); Common::String theme = browser.getSelected();
if (!theme.equalsIgnoreCase(g_gui.theme()->getThemeFileName())) // FIXME: Actually, any changes (including the theme change) should
if (g_gui.loadNewTheme(theme)) { // only become active *after* the options dialog has closed.
_curTheme->setLabel(g_gui.theme()->getThemeName()); if (g_gui.loadNewTheme(theme)) {
ConfMan.set("gui_theme", theme); _curTheme->setLabel(g_gui.theme()->getThemeName());
} ConfMan.set("gui_theme", theme);
}
draw(); draw();
} }
break; break;