From 8bfaacf587016e4dd58c0938fca0c9a7520f2bcd Mon Sep 17 00:00:00 2001
From: Vicent Marti
Date: Mon, 21 Jul 2008 16:14:06 +0000
Subject: Cleanup. Fix: Scroll widget background.

svn-id: r33174
---
 gui/ThemeDefaultXML.cpp |  4 ++--
 gui/ThemeRenderer.cpp   | 14 ++++++--------
 gui/newgui.cpp          |  3 ---
 3 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'gui')

diff --git a/gui/ThemeDefaultXML.cpp b/gui/ThemeDefaultXML.cpp
index afb559f950..77a65cfdc6 100644
--- a/gui/ThemeDefaultXML.cpp
+++ b/gui/ThemeDefaultXML.cpp
@@ -93,7 +93,7 @@ bool ThemeRenderer::loadDefaultXML() {
 	
 	
 	"<drawdata id = 'popup_hover' cache = false>"
-		"<drawstep func = 'square' stroke = 0 fg_color = '0, 0, 0' fill = 'gradient' gradient_start = '214, 113, 8' gradient_end = '240, 200, 25' shadow = 3 />"
+		"<drawstep func = 'square' stroke = 0 fg_color = '0, 0, 0' fill = 'gradient' gradient_start = '214, 113, 8' gradient_end = '240, 200, 25' shadow = 0 />"
 		"<drawstep func = 'triangle' fg_color = '0, 0, 0' fill = 'foreground' width = '12' height = '12' xpos = '-16' ypos = 'center' orientation = 'bottom' />"
 		"<text vertical_align = 'center' horizontal_align = 'right' color = '255, 255, 255' />"
 	"</drawdata>"
@@ -109,7 +109,7 @@ bool ThemeRenderer::loadDefaultXML() {
 
 	"<drawdata id = 'button_hover' cache = false>"
 		"<text vertical_align = 'center' horizontal_align = 'center' color = '255, 255, 255' />"
-		"<drawstep func = 'roundedsq' radius = '8' stroke = '1' fill = 'gradient' gradient_start = '206, 121, 99' gradient_end = '173, 40, 8' shadow = 3 />"
+		"<drawstep func = 'roundedsq' radius = '8' stroke = '1' fill = 'gradient' gradient_start = '206, 121, 99' gradient_end = '173, 40, 8' shadow = 0 />"
 	"</drawdata>"
 	
 	"<drawdata id = 'button_disabled' cache = false>"
diff --git a/gui/ThemeRenderer.cpp b/gui/ThemeRenderer.cpp
index 5b1e919f56..d2956c8a22 100644
--- a/gui/ThemeRenderer.cpp
+++ b/gui/ThemeRenderer.cpp
@@ -54,7 +54,7 @@ const ThemeRenderer::DrawDataInfo ThemeRenderer::kDrawData[] = {
 	{kDDButtonHover, "button_hover", false, kDDButtonIdle},
 	{kDDButtonDisabled, "button_disabled", true, kDDNone},
 
-	{kDDSliderFull, "slider_full", false, kDDWidgetBackgroundSlider},
+	{kDDSliderFull, "slider_full", false, kDDNone},
 
 	{kDDCheckboxEnabled, "checkbox_enabled", false, kDDCheckboxDisabled},
 	{kDDCheckboxDisabled, "checkbox_disabled", true, kDDNone},
@@ -306,18 +306,15 @@ void ThemeRenderer::queueDD(DrawData type, const Common::Rect &r, uint32 dynamic
 	q.dynData = dynamic;
 	
 	if (_buffering) {
-		warning("Queued up a '%s' for the %s", kDrawData[type].name, _widgets[type]->_buffer ? "buffer" : "screen");
-		
-		if (_widgets[type]->_buffer)
-			_bufferQueue.push_back(q);
-		else {
-			if (kDrawData[type].parent != kDDNone)
+		if (_widgets[type]->_buffer) {
+			_bufferQueue.push_back(q);	
+		} else {
+			if (kDrawData[type].parent != kDDNone && kDrawData[type].parent != type)
 				queueDD(kDrawData[type].parent, r);
 
 			_screenQueue.push_back(q);
 		}
 	} else {
-		warning("Drawing a '%s' directly!", kDrawData[type].name);
 		drawDD(q, !_widgets[type]->_buffer, _widgets[type]->_buffer);
 	}
 }
@@ -439,6 +436,7 @@ void ThemeRenderer::drawSlider(const Common::Rect &r, int width, WidgetStateInfo
 	Common::Rect r2 = r;
 	r2.setWidth(MIN((int16)width, r.width()));
 
+	drawWidgetBackground(r, 0, kWidgetBackgroundSlider, kStateEnabled);
 	queueDD(kDDSliderFull, r2);
 }
 
diff --git a/gui/newgui.cpp b/gui/newgui.cpp
index e689617418..acbf14cae2 100644
--- a/gui/newgui.cpp
+++ b/gui/newgui.cpp
@@ -194,7 +194,6 @@ void NewGui::redraw() {
 		case kRedrawCloseDialog:
 		case kRedrawFull:
 		case kRedrawTopDialog:
-			warning("Full screen redraw. Oops");
 			_theme->clearAll();
 			_theme->closeAllDialogs();
 
@@ -207,8 +206,6 @@ void NewGui::redraw() {
 			//_theme->startBuffering();
 			_dialogStack.top()->drawDialog();
 			_theme->finishBuffering();
-			
-			warning("Dialog opened");
 			break;
 
 		default:
-- 
cgit v1.2.3