diff options
| author | Eugene Sandulenko | 2006-03-21 13:48:51 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2006-03-21 13:48:51 +0000 |
| commit | 3586905f93ab27bd1274ee432ff24281f2fd14bd (patch) | |
| tree | 9ae6b6404e0b5ea4fc6cd632f0d4297425f5cd11 /gui | |
| parent | 9031b27349c9ceaac6adce49e44b929cdc106529 (diff) | |
| download | scummvm-rg350-3586905f93ab27bd1274ee432ff24281f2fd14bd.tar.gz scummvm-rg350-3586905f93ab27bd1274ee432ff24281f2fd14bd.tar.bz2 scummvm-rg350-3586905f93ab27bd1274ee432ff24281f2fd14bd.zip | |
Fix bug #1455213: "GUI: ExtraPath won't display" and turn theme version
into #define.
svn-id: r21395
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/ThemeNew.cpp | 6 | ||||
| -rw-r--r-- | gui/theme-config.cpp | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/gui/ThemeNew.cpp b/gui/ThemeNew.cpp index e940740f34..2008d3ed2c 100644 --- a/gui/ThemeNew.cpp +++ b/gui/ThemeNew.cpp @@ -36,6 +36,8 @@ #define kShadowTr3 64 #define kShadowTr4 128 +#define THEME_VERSION 4 + using Graphics::Surface; /** Specifies the currently active 16bit pixel format, 555 or 565. */ @@ -171,9 +173,9 @@ _lastUsedBitMask(0), _forceRedraw(false), _font(0), _imageHandles(0), _images(0) Common::String temp = ""; _configFile.getKey("version", "theme", temp); - if (temp != "4") { + if (atoi(temp.c_str()) != THEME_VERSION) { // TODO: improve this detection and handle it nicer - warning("Theme config uses a different version (you have: '%s', needed is: '%d')", temp.c_str(), 4); + warning("Theme config uses a different version (you have: '%s', needed is: '%d')", temp.c_str(), THEME_VERSION); return; } diff --git a/gui/theme-config.cpp b/gui/theme-config.cpp index 4e6b8f2b7a..d55e2efecd 100644 --- a/gui/theme-config.cpp +++ b/gui/theme-config.cpp @@ -134,11 +134,12 @@ const char *Theme::_defaultConfigINI = "\n" "# paths tab\n" "yoffset=vBorder\n" +"glOff=((buttonHeight - kLineHeight) / 2 + 2)\n" "globaloptions_savebutton=5 yoffset (buttonWidth + 5) buttonHeight\n" -"globaloptions_savepath=(prev.x2 + 20) (vBorder + 3) (parent.w - (prev.w + 20) - 10) kLineHeight\n" +"globaloptions_savepath=(prev.x2 + 20) (yoffset + glOff) (parent.w - (prev.w + 20) - 10) kLineHeight\n" "yoffset=(yoffset + buttonHeight + 4)\n" "globaloptions_extrabutton=5 yoffset (buttonWidth + 5) buttonHeight\n" -"globaloptions_extrapath=(prev.x2 + 20) (vBorder + 3) (parent.w - (prev.w + 20) - 10) kLineHeight\n" +"globaloptions_extrapath=(prev.x2 + 20) (yoffset + glOff) (parent.w - (prev.w + 20) - 10) kLineHeight\n" "yoffset=(yoffset + buttonHeight + 4)\n" "globaloptions_keysbutton=5 yoffset (buttonWidth + 5) buttonHeight\n" "\n" |