libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 04:28:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- Fixes disabled transparency for classic theme.

Browse Source 
- Introduces check for define 'CT_NO_TRANSPARENCY' to disable transparency support.

svn-id: r22735
This commit is contained in:
Johannes Schickel 2006-05-29 13:12:04 +00:00
parent ba82b4a235
commit f3e74f88de
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gui/ThemeClassic.cpp
View File

@ -26,7 +26,7 @@ ThemeClassic::ThemeClassic(OSystem *system) : Theme() {
_system = system;
_initOk = false;
memset(&_screen, 0, sizeof(_screen));
#ifdef OLDGUI_TRANSPARENCY
#ifndef CT_NO_TRANSPARENCY
memset(&_dialog, 0, sizeof(_dialog));
#endif
_font = 0;
@ -97,7 +97,7 @@ void ThemeClassic::disable() {
}
void ThemeClassic::openDialog(bool topDialog) {
#ifdef OLDGUI_TRANSPARENCY
#ifndef CT_NO_TRANSPARENCY
if (!_dialog) {
_dialog = new DialogState;
assert(_dialog);
@ -110,7 +110,7 @@ void ThemeClassic::openDialog(bool topDialog) {
}
void ThemeClassic::closeDialog() {
#ifdef OLDGUI_TRANSPARENCY
#ifndef CT_NO_TRANSPARENCY
if (_dialog) {
_dialog->screen.free();
delete _dialog;
@ -143,11 +143,13 @@ void ThemeClassic::drawDialogBackground(const Common::Rect &r, uint16 hints, kSt
return;
restoreBackground(r);
#ifndef CT_NO_TRANSPARENCY
if ((hints & THEME_HINT_SAVE_BACKGROUND) && !(hints & THEME_HINT_FIRST_DRAW) && !_forceRedraw) {
addDirtyRect(r);
return;
}
#endif
box(r.left, r.top, r.width(), r.height(), _color, _shadowcolor);
addDirtyRect(r, (hints & THEME_HINT_SAVE_BACKGROUND) != 0);
@ -181,11 +183,13 @@ void ThemeClassic::drawWidgetBackground(const Common::Rect &r, uint16 hints, kWi
return;
restoreBackground(r);
#ifndef CT_NO_TRANSPARENCY
if ((hints & THEME_HINT_SAVE_BACKGROUND) && !(hints & THEME_HINT_FIRST_DRAW) && !_forceRedraw) {
addDirtyRect(r);
return;
}
#endif
switch (background) {
case kWidgetBackgroundBorder:
@ -452,7 +456,7 @@ void ThemeClassic::drawLineSeparator(const Common::Rect &r, kState state) {
void ThemeClassic::restoreBackground(Common::Rect r, bool special) {
r.clip(_screen.w, _screen.h);
r.clip(_drawArea);
#ifndef OLDGUI_TRANSPARENCY
#ifdef CT_NO_TRANSPARENCY
_screen.fillRect(r, _bgcolor);
#else
if (_dialog) {
@ -482,7 +486,7 @@ bool ThemeClassic::addDirtyRect(Common::Rect r, bool save, bool special) {
r.clip(_screen.w, _screen.h);
r.clip(_drawArea);
_system->copyRectToOverlay((OverlayColor*)_screen.getBasePtr(r.left, r.top), _screen.w, r.left, r.top, r.width(), r.height());
#ifdef OLDGUI_TRANSPARENCY
#ifndef CT_NO_TRANSPARENCY
if (_dialog && save) {
if (_dialog->screen.pixels) {
OverlayColor *dst = (OverlayColor*)_dialog->screen.getBasePtr(r.left, r.top);
@ -544,7 +548,7 @@ OverlayColor ThemeClassic::getColor(kState state) {
return usedColor;
}
#ifdef OLDGUI_TRANSPARENCY
#ifndef CT_NO_TRANSPARENCY
void ThemeClassic::blendScreenToDialog() {
Common::Rect rect(0, 0, _screen.w, _screen.h);

5
gui/theme.h
View File

@ -206,7 +206,8 @@ private:
int _loadedThemeX, _loadedThemeY;
};
#define OLDGUI_TRANSPARENCY
// enable this to disable transparency support for the classic theme
//#define CT_NO_TRANSPARENCY
class ThemeClassic : public Theme {
public:
@ -263,7 +264,7 @@ private:
OSystem *_system;
Graphics::Surface _screen;
#ifdef OLDGUI_TRANSPARENCY
#ifndef CT_NO_TRANSPARENCY
struct DialogState {
Graphics::Surface screen;
} *_dialog;