[Scummvm-cvs-logs] SF.net SVN: scummvm: [20841] scummvm/trunk/gui/ThemeNew.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 20841
Author:   eriktorbjorn
Date:     2006-02-24 11:38:16 -0800 (Fri, 24 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20841&view=rev

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/gui/ThemeNew.cpp
Modified: scummvm/trunk/gui/ThemeNew.cpp
===================================================================
--- scummvm/trunk/gui/ThemeNew.cpp	2006-02-24 19:33:23 UTC (rev 20840)
+++ scummvm/trunk/gui/ThemeNew.cpp	2006-02-24 19:38:16 UTC (rev 20841)
@@ -401,19 +401,19 @@
 	if (!_initOk)
 		return;
 	Common::Rect r2(r.left, r.top, r.right, r.top+_font->getFontHeight());
+	uint32 color;
 
 	restoreBackground(r2);
 	r2.bottom += 4;
 
 	if (inverted) {
 		_screen.fillRect(r, _colors[kTextInvertedBackground]);
-		_font->drawString(&_screen, str, r.left, r.top, r.width(), _colors[kTextInvertedColor], convertAligment(align), deltax, useEllipsis);
-		addDirtyRect(r2);
-		return;
+		color = _colors[kTextInvertedColor];
 	} else {
-		_font->drawString(&_screen, str, r.left, r.top, r.width(), getColor(state), convertAligment(align), deltax, useEllipsis);
+		color = getColor(state);
 	}
 
+	_font->drawString(&_screen, str, r.left, r.top, r.width(), color, convertAligment(align), deltax, useEllipsis);
 	addDirtyRect(r2);
 }