aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/gui
diff options
context:
space:
mode:
authorFilippos Karapetis2009-10-05 09:20:55 +0000
committerFilippos Karapetis2009-10-05 09:20:55 +0000
commitd37f4ea07d110994bb8e3b2897263213fd33c142 (patch)
treee9ff8e2b0ad067f2533e190499496bb885a42628 /engines/sci/gui
parent93833ee86a48e53ae2d38fc66a3539b9cf727f2e (diff)
downloadscummvm-rg350-d37f4ea07d110994bb8e3b2897263213fd33c142.tar.gz
scummvm-rg350-d37f4ea07d110994bb8e3b2897263213fd33c142.tar.bz2
scummvm-rg350-d37f4ea07d110994bb8e3b2897263213fd33c142.zip
Proper check for window shadows
svn-id: r44655
Diffstat (limited to 'engines/sci/gui')
-rw-r--r--engines/sci/gui/gui_windowmgr.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/gui/gui_windowmgr.cpp b/engines/sci/gui/gui_windowmgr.cpp
index 0092e878e7..b66f6ffee0 100644
--- a/engines/sci/gui/gui_windowmgr.cpp
+++ b/engines/sci/gui/gui_windowmgr.cpp
@@ -142,7 +142,7 @@ GuiWindow *SciGuiWindowMgr::NewWindow(const Common::Rect &dims, const Common::Re
}
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 @@ void SciGuiWindowMgr::DrawWindow(GuiWindow *pWnd) {
_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 @@ void SciGuiWindowMgr::DrawWindow(GuiWindow *pWnd) {
}
// 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 @@ void SciGuiWindowMgr::DrawWindow(GuiWindow *pWnd) {
r.grow(-1);
}
- if ((wndStyle & kTransparent) == 0)
+ if (!(wndStyle & kTransparent))
_gfx->FillRect(r, 1, pWnd->backClr);
_gfx->ShowBits(pWnd->dims, 1);