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

[Tanoku at users.sourceforge.net]

Revision: 34002
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34002&view=rev
Author:   Tanoku
Date:     2008-08-18 19:06:58 +0000 (Mon, 18 Aug 2008)

Log Message:
-----------
Misc GFX fixes.
Bugfix: Theme folder loading.

Modified Paths:
--------------
    scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp
    scummvm/branches/gsoc2008-gui/gui/themebrowser.cpp
    scummvm/branches/gsoc2008-gui/gui/themes/scummclassic/classic_gfx.stx
    scummvm/branches/gsoc2008-gui/gui/themes/scummclassic.zip
    scummvm/branches/gsoc2008-gui/gui/themes/scummodern/scummodern_gfx.stx
    scummvm/branches/gsoc2008-gui/gui/themes/scummodern/scummodern_layout.stx
    scummvm/branches/gsoc2008-gui/gui/themes/scummodern.zip

Modified: scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp	2008-08-18 18:16:43 UTC (rev 34001)
+++ scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp	2008-08-18 19:06:58 UTC (rev 34002)
@@ -483,9 +483,9 @@
 		}
 	} else {
 #endif
-		FilesystemNode node(themeName);
+        
+        FilesystemNode node(themeName);
 		if (node.exists() && node.isReadable() && node.isDirectory()) {
-			
 			FSList fslist;
 			if (!node.getChildren(fslist, FilesystemNode::kListFilesOnly))
 				return false;
@@ -795,7 +795,7 @@
 	
 	if (!sel.empty()) {
 		Common::Rect text(r.left, r.top, r.right - 16, r.bottom);
-		queueDDText(getTextData(dd), text, sel, false, false, _widgets[dd]->_textAlignH, _widgets[dd]->_textAlignV);
+		queueDDText(getTextData(dd), text, sel, false, false, _widgets[dd]->_textAlignH, _widgets[dd]->_textAlignV, deltax);
 	}
 }
 

Modified: scummvm/branches/gsoc2008-gui/gui/themebrowser.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/themebrowser.cpp	2008-08-18 18:16:43 UTC (rev 34001)
+++ scummvm/branches/gsoc2008-gui/gui/themebrowser.cpp	2008-08-18 19:06:58 UTC (rev 34002)
@@ -189,7 +189,7 @@
 }
 
 bool ThemeBrowser::isTheme(const FilesystemNode &node, Entry &out) {
-	out.file = node.getName();	
+	out.file = node.getPath();	
 	
 #ifdef USE_ZLIB
 	if (!out.file.hasSuffix(".zip") && !node.isDirectory())

Modified: scummvm/branches/gsoc2008-gui/gui/themes/scummclassic/classic_gfx.stx
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/themes/scummclassic/classic_gfx.stx	2008-08-18 18:16:43 UTC (rev 34001)
+++ scummvm/branches/gsoc2008-gui/gui/themes/scummclassic/classic_gfx.stx	2008-08-18 19:06:58 UTC (rev 34002)
@@ -234,7 +234,7 @@
 		/>
 		<text	font = 'text_default'
 				vertical_align = 'center'
-				horizontal_align = 'right'
+				horizontal_align = 'left'
 		/>
 	</drawdata>
 
@@ -255,7 +255,7 @@
 		/>
 		<text	font = 'text_hover'
 				vertical_align = 'center'
-				horizontal_align = 'right'
+				horizontal_align = 'left'
 		/>
 	</drawdata>
 

Modified: scummvm/branches/gsoc2008-gui/gui/themes/scummodern/scummodern_gfx.stx
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/themes/scummodern/scummodern_gfx.stx	2008-08-18 18:16:43 UTC (rev 34001)
+++ scummvm/branches/gsoc2008-gui/gui/themes/scummodern/scummodern_gfx.stx	2008-08-18 19:06:58 UTC (rev 34002)
@@ -300,7 +300,7 @@
 		/>
 		<text	font = 'text_default'
 				vertical_align = 'center'
-				horizontal_align = 'right'
+				horizontal_align = 'left'
 		/>
 	</drawdata>
 
@@ -325,7 +325,7 @@
 		/>
 		<text	font = 'text_hover'
 				vertical_align = 'center'
-				horizontal_align = 'right'
+				horizontal_align = 'left'
 		/>
 	</drawdata>
 
@@ -472,4 +472,16 @@
 					shadow = 3
 		/>
 	</drawdata>
+	
+	<drawdata id = 'widget_small' cache = false>
+		<drawstep	func = 'roundedsq'
+					radius = 8
+					stroke = 0
+					gradient_start = 'blandyellow'
+					gradient_end = 'xtrabrightred'
+					gradient_factor = '6'
+					fill = 'gradient'
+					shadow = 3
+		/>
+	</drawdata>
 </render_info>
\ No newline at end of file

Modified: scummvm/branches/gsoc2008-gui/gui/themes/scummodern/scummodern_layout.stx
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/themes/scummodern/scummodern_layout.stx	2008-08-18 18:16:43 UTC (rev 34001)
+++ scummvm/branches/gsoc2008-gui/gui/themes/scummodern/scummodern_layout.stx	2008-08-18 19:06:58 UTC (rev 34002)
@@ -261,13 +261,13 @@
 			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
 				<widget name = 'mcFontButton'
 						type = 'Button'
+				/>	
+				<widget name = 'mcFontPath'
+						height = 'Globals.Line.Height'
 				/>
 				<widget name = 'mcFontClearButton'
 						height = 'Globals.Line.Height'
 						width = 'Globals.Line.Height'
-				/>		
-				<widget name = 'mcFontPath'
-						height = 'Globals.Line.Height'
 				/>
 			</layout>
 			<widget name = 'mcMixedCheckbox'


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