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

[lordhoto at users.sourceforge.net]

Revision: 24237
          http://svn.sourceforge.net/scummvm/?rev=24237&view=rev
Author:   lordhoto
Date:     2006-10-08 14:15:38 -0700 (Sun, 08 Oct 2006)

Log Message:
-----------
Fixed disabled blending for classic theme.

Modified Paths:
--------------
    scummvm/trunk/gui/ThemeClassic.cpp

Modified: scummvm/trunk/gui/ThemeClassic.cpp
===================================================================
--- scummvm/trunk/gui/ThemeClassic.cpp	2006-10-08 21:03:19 UTC (rev 24236)
+++ scummvm/trunk/gui/ThemeClassic.cpp	2006-10-08 21:15:38 UTC (rev 24237)
@@ -123,7 +123,10 @@
 		_dialog->screen.create(_screen.w, _screen.h, sizeof(OverlayColor));
 	}
 	memcpy(_dialog->screen.pixels, _screen.pixels, _screen.pitch*_screen.h);
-	blendScreenToDialog();
+	if (!_enableBlending)
+		_dialog->screen.fillRect(Common::Rect(0, 0, _screen.w, _screen.h), _bgcolor);
+	else
+		blendScreenToDialog();
 #endif
 }
 
@@ -486,7 +489,7 @@
 #ifdef CT_NO_TRANSPARENCY
 	_screen.fillRect(r, _bgcolor);
 #else
-	if (_dialog && _enableBlending) {
+	if (_dialog && !_enableBlending) {
 		if (!_dialog->screen.pixels) {
 			_screen.fillRect(r, _bgcolor);
 			return;
@@ -502,6 +505,8 @@
 			dst += _screen.w;
 		}
 	} else {
+		if (_dialog)
+			_dialog->screen.fillRect(r, _bgcolor);
 		_screen.fillRect(r, _bgcolor);
 	}
 #endif


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