aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2006-10-08 21:15:38 +0000
committerJohannes Schickel2006-10-08 21:15:38 +0000
commitcb0e8b577dd06a57c4f3fac298523cf169f9f9a9 (patch)
tree9a4f6697224345819d22f35d73b6331d520f2b17
parent7721c0d0392c1d47c7f36cd26fa5d2ea485e6e2e (diff)
downloadscummvm-rg350-cb0e8b577dd06a57c4f3fac298523cf169f9f9a9.tar.gz
scummvm-rg350-cb0e8b577dd06a57c4f3fac298523cf169f9f9a9.tar.bz2
scummvm-rg350-cb0e8b577dd06a57c4f3fac298523cf169f9f9a9.zip
Fixed disabled blending for classic theme.
svn-id: r24237
-rw-r--r--gui/ThemeClassic.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/gui/ThemeClassic.cpp b/gui/ThemeClassic.cpp
index b8c99dc9ff..7bea40c715 100644
--- a/gui/ThemeClassic.cpp
+++ b/gui/ThemeClassic.cpp
@@ -123,7 +123,10 @@ void ThemeClassic::openDialog(bool topDialog) {
_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 @@ void ThemeClassic::restoreBackground(Common::Rect r, bool special) {
#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 @@ void ThemeClassic::restoreBackground(Common::Rect r, bool special) {
dst += _screen.w;
}
} else {
+ if (_dialog)
+ _dialog->screen.fillRect(r, _bgcolor);
_screen.fillRect(r, _bgcolor);
}
#endif