[Scummvm-cvs-logs] SF.net SVN: scummvm:[33707] scummvm/branches/gsoc2008-gui/gui

[Tanoku at users.sourceforge.net]

Revision: 33707
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33707&view=rev
Author:   Tanoku
Date:     2008-08-08 21:52:16 +0000 (Fri, 08 Aug 2008)

Log Message:
-----------
Fixed: About dialog in all resolutions.

Modified Paths:
--------------
    scummvm/branches/gsoc2008-gui/gui/about.cpp
    scummvm/branches/gsoc2008-gui/gui/themes/default.inc
    scummvm/branches/gsoc2008-gui/gui/themes/modern.stx

Modified: scummvm/branches/gsoc2008-gui/gui/about.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/about.cpp	2008-08-08 18:48:12 UTC (rev 33706)
+++ scummvm/branches/gsoc2008-gui/gui/about.cpp	2008-08-08 21:52:16 UTC (rev 33707)
@@ -29,10 +29,11 @@
 #include "common/system.h"
 #include "common/util.h"
 #include "gui/about.h"
-#include "gui/eval.h"
 #include "gui/newgui.h"
 #include "gui/widget.h"
 
+#include "gui/ThemeEval.h"
+
 namespace GUI {
 
 enum {
@@ -85,9 +86,9 @@
 	const int screenW = g_system->getOverlayWidth();
 	const int screenH = g_system->getOverlayHeight();
 
-	_xOff = g_gui.evaluator()->getVar("aboutXOff");
-	_yOff = g_gui.evaluator()->getVar("aboutYOff");
-	int outerBorder = g_gui.evaluator()->getVar("aboutOuterBorder");
+	_xOff = g_gui.xmlEval()->getVar("Globals.About.XOffset", 5);
+	_yOff = g_gui.xmlEval()->getVar("Globals.About.YOffset", 5);
+	int outerBorder = g_gui.xmlEval()->getVar("Globals.About.OuterBorder");
 
 	_w = screenW - 2 * outerBorder;
 	_h = screenH - 2 * outerBorder;
@@ -316,9 +317,9 @@
 	const int screenW = g_system->getOverlayWidth();
 	const int screenH = g_system->getOverlayHeight();
 
-	_xOff = g_gui.evaluator()->getVar("aboutXOff");
-	_yOff = g_gui.evaluator()->getVar("aboutYOff");
-	int outerBorder = g_gui.evaluator()->getVar("aboutOuterBorder");
+	_xOff = g_gui.xmlEval()->getVar("Globals.About.XOffset", 5);
+	_yOff = g_gui.xmlEval()->getVar("Globals.About.YOffset", 5);
+	int outerBorder = g_gui.xmlEval()->getVar("Globals.About.OuterBorder");
 
 	_w = screenW - 2 * outerBorder;
 	_h = screenH - 2 * outerBorder;

Modified: scummvm/branches/gsoc2008-gui/gui/themes/default.inc
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/themes/default.inc	2008-08-08 18:48:12 UTC (rev 33706)
+++ scummvm/branches/gsoc2008-gui/gui/themes/default.inc	2008-08-08 21:52:16 UTC (rev 33707)
@@ -404,6 +404,8 @@
 "<def var = 'Padding.Left' value = '16' /> "
 "<def var = 'Padding.Right' value = '16' /> "
 "<def var = 'Padding.Top' value = '16' /> "
+"<def var = 'About.OuterBorder' value = '80'/> "
+"<def resolution = '320xY' var = 'About.OuterBorder' value = '16'/> "
 "<def var = 'ListWidget.hlLeftPadding' value = '0'/> "
 "<def var = 'ListWidget.hlRightPadding' value = '16'/> "
 "<def var = 'PopUpWidget.labelSpacing' value = '10' /> "

Modified: scummvm/branches/gsoc2008-gui/gui/themes/modern.stx
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/themes/modern.stx	2008-08-08 18:48:12 UTC (rev 33706)
+++ scummvm/branches/gsoc2008-gui/gui/themes/modern.stx	2008-08-08 21:52:16 UTC (rev 33707)
@@ -467,6 +467,9 @@
 		<def var = 'Padding.Right' value = '16' />
 		<def var = 'Padding.Top' value = '16' />
 		
+		<def var = 'About.OuterBorder' value = '80'/>
+		<def resolution = '320xY' var = 'About.OuterBorder' value = '16'/>
+		
 		<def var = 'ListWidget.hlLeftPadding' value = '0'/>
 		<def var = 'ListWidget.hlRightPadding' value = '16'/>
 		<def var = 'PopUpWidget.labelSpacing' value = '10' />


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