[Scummvm-cvs-logs] CVS: scummvm/gui ThemeNew.cpp,1.15,1.16

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Tue Jan 31 01:46:11 CET 2006


Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25453

Modified Files:
	ThemeNew.cpp 
Log Message:
Tabs look better with dialog surfaces than with widget surfaces. There's
still room for improvements, though...


Index: ThemeNew.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/ThemeNew.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ThemeNew.cpp	31 Jan 2006 08:41:51 -0000	1.15
+++ ThemeNew.cpp	31 Jan 2006 09:45:36 -0000	1.16
@@ -446,11 +446,11 @@
 void ThemeNew::drawTab(const Common::Rect &r, const Common::String &str, bool active, kState state) {
 	if (!_initOk)
 		return;
+	drawRectMasked(r, surface(kDialogBkgdCorner), surface(kDialogBkgdTop), surface(kDialogBkgdLeft), surface(kDialogBkgd),
+				(state == kStateDisabled) ? 128 : 256, _colors[kTabBackgroundStart], _colors[kTabBackgroundEnd], 2);
 	if (active) {
 		_font->drawString(&_screen, str, r.left, r.top+2, r.width(), getColor(kStateHighlight), Graphics::kTextAlignCenter, 0, true);
 	} else {
-		drawRectMasked(r, surface(kWidgetBkgdCorner), surface(kWidgetBkgdTop), surface(kWidgetBkgdLeft), surface(kWidgetBkgd),
-					(state == kStateDisabled) ? 128 : 256, _colors[kTabBackgroundStart], _colors[kTabBackgroundEnd], 2);
 		_font->drawString(&_screen, str, r.left, r.top+2, r.width(), getColor(state), Graphics::kTextAlignCenter, 0, true);
 	}
 	addDirtyRect(r);





More information about the Scummvm-git-logs mailing list