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

[Tanoku at users.sourceforge.net]

Revision: 33029
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33029&view=rev
Author:   Tanoku
Date:     2008-07-13 04:07:56 -0700 (Sun, 13 Jul 2008)

Log Message:
-----------
More widgets.

Modified Paths:
--------------
    scummvm/branches/gsoc2008-gui/gui/ThemeDefaultXML.cpp
    scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp
    scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.h

Modified: scummvm/branches/gsoc2008-gui/gui/ThemeDefaultXML.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/ThemeDefaultXML.cpp	2008-07-13 10:53:39 UTC (rev 33028)
+++ scummvm/branches/gsoc2008-gui/gui/ThemeDefaultXML.cpp	2008-07-13 11:07:56 UTC (rev 33029)
@@ -79,6 +79,10 @@
 		"<drawstep func = 'square' fill = 'gradient' gradient_start = '206, 121, 99' gradient_end = '173, 40, 8' shadow = 0 />"
 		"<drawstep func = 'circle' radius = 'auto' fill = 'foreground' />"
 	"</drawdata>"
+	
+	"<drawdata id = 'widget_default' cache = false>"
+		"<drawstep func = 'roundedsq' gradient_factor = 6 radius = '4' fill = 'gradient' gradient_start = '206, 121, 99' gradient_end = '173, 40, 8' shadow = 0 />"
+	"</drawdata>"
 "</render_info>"
 
 "<layout_info>"

Modified: scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp	2008-07-13 10:53:39 UTC (rev 33028)
+++ scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp	2008-07-13 11:07:56 UTC (rev 33029)
@@ -44,13 +44,16 @@
 	"special_bg",
 	"plain_bg",
 	"default_bg",
+	
+	"widget_default",
+	"widget_small",
+	"widget_textedit",
+	"widget_slider",
 
 	"button_idle",
 	"button_hover",
 	"button_disabled",
 
-	"surface",
-
 	"slider_full",
 	"slider_empty",
 
@@ -60,8 +63,6 @@
 	"tab",
 
 	"scrollbar_base",
-	"scrollbar_top",
-	"scrollbar_bottom",
 	"scrollbar_handle",
 
 	"popup",
@@ -404,7 +405,25 @@
 void ThemeRenderer::drawWidgetBackground(const Common::Rect &r, uint16 hints, WidgetBackground background, WidgetStateInfo state) {
 	if (!ready())
 		return;
-
+		
+	switch (background) {
+	case kWidgetBackgroundBorderSmall:
+		drawDD(kDDWidgetBackgroundSmall, r);
+		break;
+		
+	case kWidgetBackgroundEditText:
+		drawDD(kDDWidgetBackgroundEditText, r);
+		break;
+		
+	case kWidgetBackgroundSlider:
+		drawDD(kDDWidgetBackgroundSlider, r);
+		break;
+		
+	default:
+		drawDD(kDDWidgetBackgroundDefault, r);
+		break;
+	}
+	
 	debugWidgetPosition("Widget Background", r);
 }
 

Modified: scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.h
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.h	2008-07-13 10:53:39 UTC (rev 33028)
+++ scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.h	2008-07-13 11:07:56 UTC (rev 33029)
@@ -86,13 +86,16 @@
 		kDDSpecialColorBackground,
 		kDDPlainColorBackground,
 		kDDDefaultBackground,
+		
+		kDDWidgetBackgroundDefault,
+		kDDWidgetBackgroundSmall,
+		kDDWidgetBackgroundEditText,
+		kDDWidgetBackgroundSlider,
 
 		kDDButtonIdle,
 		kDDButtonHover,
 		kDDButtonDisabled,
 
-		kDDSurface,
-
 		kDDSliderFull,
 		kDDSliderEmpty,
 
@@ -102,8 +105,6 @@
 		kDDTab,
 
 		kDDScrollbarBase,
-		kDDScrollbarButtonTop,
-		kDDScrollbarButtonBottom,
 		kDDScrollbarHandle,
 
 		kDDPopUp,


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