[Scummvm-cvs-logs] SF.net SVN: scummvm:[44655] scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp

[thebluegr at users.sourceforge.net]

Revision: 44655
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44655&view=rev
Author:   thebluegr
Date:     2009-10-05 09:20:55 +0000 (Mon, 05 Oct 2009)

Log Message:
-----------
Proper check for window shadows

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp

Modified: scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp	2009-10-05 08:19:43 UTC (rev 44654)
+++ scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp	2009-10-05 09:20:55 UTC (rev 44655)
@@ -142,7 +142,7 @@
 	}
 	
 	r = dims;
-	if (style == kUser || (style & kNoFrame) == 0) {
+	if (style == kUser || !(style & kNoFrame)) {
 		r.grow(1);
 		if (style & kTitle) {
 			r.top -= 10;
@@ -192,7 +192,7 @@
 	_gfx->PenColor(0);
 	if ((wndStyle & kTransparent) == 0) {
 		// Store the shadow, if it exists
-		if ((wndStyle & kUser) == 0) {
+		if (!(wndStyle & kUser) && !(wndStyle & kNoFrame)) {
 			pWnd->restoreRect.bottom++;
 			pWnd->restoreRect.right++;
 		}
@@ -206,9 +206,9 @@
 	}
 	
 	// drawing frame,shadow and title
-	if ((wndStyle & kUser) == 0) {
+	if (!(wndStyle & kUser)) {
 		r = pWnd->dims;
-		if ((wndStyle & kNoFrame) == 0) {
+		if (!(wndStyle & kNoFrame)) {
 			r.translate(1, 1);
 			_gfx->FrameRect(r);// shadow
 			r.translate(-1, -1);
@@ -232,7 +232,7 @@
 			r.grow(-1);
 		}
 		
-		if ((wndStyle & kTransparent) == 0)
+		if (!(wndStyle & kTransparent))
 			_gfx->FillRect(r, 1, pWnd->backClr);
 
 		_gfx->ShowBits(pWnd->dims, 1);


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