Several GFX tweaks/fixes.

svn-id: r33863

3 files changed, 7 insertions, 9 deletions

diff --git a/gui/ThemeRenderer.cpp b/gui/ThemeRenderer.cpp
index 5ead02ae9a..80e605ac85 100644
--- a/gui/ThemeRenderer.cpp
+++ b/gui/ThemeRenderer.cpp
@@ -53,7 +53,7 @@ const ThemeRenderer::DrawDataInfo ThemeRenderer::kDrawDataDefaults[] = {
 	{kDDWidgetBackgroundEditText, "widget_textedit", true, kDDNone},
 	{kDDWidgetBackgroundSlider, "widget_slider", true, kDDNone},
 
-	{kDDButtonIdle, "button_idle", true, kDDNone},
+	{kDDButtonIdle, "button_idle", true, kDDWidgetBackgroundSlider},
 	{kDDButtonHover, "button_hover", false, kDDButtonIdle},
 	{kDDButtonDisabled, "button_disabled", true, kDDNone},
 
@@ -503,7 +503,7 @@ void ThemeRenderer::queueDD(DrawData type, const Common::Rect &r, uint32 dynamic
 }
 
 void ThemeRenderer::queueDDText(TextData type, const Common::Rect &r, const Common::String &text, bool restoreBg,
-	bool elipsis, TextAlign alignH, TextAlignVertical alignV, int deltax) {
+	bool ellipsis, TextAlign alignH, TextAlignVertical alignV, int deltax) {
 		
 	if (_texts[type] == 0)
 		return;
@@ -517,6 +517,7 @@ void ThemeRenderer::queueDDText(TextData type, const Common::Rect &r, const Comm
 	q.alignV = alignV;
 	q.restoreBg = restoreBg;
 	q.deltax = deltax;
+	q.ellipsis = ellipsis;
 	
 	if (_buffering) {		
 		_textQueue.push_back(q);
@@ -565,7 +566,7 @@ void ThemeRenderer::drawDDText(const DrawQueueText &q) {
 		restoreBackground(q.area);
 	
 	_vectorRenderer->setFgColor(_texts[q.type]->_color.r, _texts[q.type]->_color.g, _texts[q.type]->_color.b);
-	_vectorRenderer->drawString(_texts[q.type]->_fontPtr, q.text, q.area, q.alignH, q.alignV, q.deltax, q.elipsis);
+	_vectorRenderer->drawString(_texts[q.type]->_fontPtr, q.text, q.area, q.alignH, q.alignV, q.deltax, q.ellipsis);
 	addDirtyRect(q.area);
 }
 
@@ -743,9 +744,6 @@ void ThemeRenderer::drawSurface(const Common::Rect &r, const Graphics::Surface &
 		return;
 	
 	queueBitmap(&surface, r, themeTrans);
-	
-//	_vectorRenderer->blitSubSurface(&surface, r);
-//	addDirtyRect(r);
 }
 
 void ThemeRenderer::drawWidgetBackground(const Common::Rect &r, uint16 hints, WidgetBackground background, WidgetStateInfo state) {
@@ -800,7 +798,7 @@ void ThemeRenderer::drawTab(const Common::Rect &r, int tabHeight, int tabWidth,
 
 void ThemeRenderer::drawText(const Common::Rect &r, const Common::String &str, WidgetStateInfo state, TextAlign align, bool inverted, int deltax, bool useEllipsis, FontStyle font) {
 	if (!ready())
-		return;
+		return;	
 		
 	if (inverted) {
 		queueDD(kDDTextSelectionBackground, r);
diff --git a/gui/ThemeRenderer.h b/gui/ThemeRenderer.h
index 4fe968752c..2b77121da0 100644
--- a/gui/ThemeRenderer.h
+++ b/gui/ThemeRenderer.h
@@ -94,7 +94,7 @@ protected:
 	friend class GUI::GuiObject;
 
 	/** Constant value to expand dirty rectangles, to make sure they are fully copied */
-	static const int kDirtyRectangleThreshold = 0;
+	static const int kDirtyRectangleThreshold = 1;
 	
 	/** Sets whether backcaching is enabled */
 	static const bool kEnableBackCaching = true;
@@ -193,7 +193,7 @@ protected:
 		
 		GUI::Theme::TextAlign alignH;
 		GUI::Theme::TextAlignVertical alignV;
-		bool elipsis;
+		bool ellipsis;
 		bool restoreBg;
 		int deltax;
 	};
diff --git a/gui/themes/scummodern.zip b/gui/themes/scummodern.zip
index e12c89830b..66e0a736e8 100644
--- a/gui/themes/scummodern.zip
+++ b/gui/themes/scummodern.zip