[Scummvm-cvs-logs] SF.net SVN: scummvm: [21395] scummvm/trunk/gui

sev at users.sourceforge.net sev at users.sourceforge.net
Tue Mar 21 05:50:03 CET 2006


Revision: 21395
Author:   sev
Date:     2006-03-21 05:48:51 -0800 (Tue, 21 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21395&view=rev

Log Message:
-----------
Fix bug #1455213: "GUI: ExtraPath won't display" and turn theme version
into #define.

Modified Paths:
--------------
    scummvm/trunk/gui/ThemeNew.cpp
    scummvm/trunk/gui/theme-config.cpp
Modified: scummvm/trunk/gui/ThemeNew.cpp
===================================================================
--- scummvm/trunk/gui/ThemeNew.cpp	2006-03-20 19:01:39 UTC (rev 21394)
+++ scummvm/trunk/gui/ThemeNew.cpp	2006-03-21 13:48:51 UTC (rev 21395)
@@ -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 @@
 
 	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;
 	}
 	

Modified: scummvm/trunk/gui/theme-config.cpp
===================================================================
--- scummvm/trunk/gui/theme-config.cpp	2006-03-20 19:01:39 UTC (rev 21394)
+++ scummvm/trunk/gui/theme-config.cpp	2006-03-21 13:48:51 UTC (rev 21395)
@@ -134,11 +134,12 @@
 "\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"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list