aboutsummaryrefslogtreecommitdiff
path: root/gui/widget.h
diff options
context:
space:
mode:
authorBastien Bouclet2018-04-19 19:42:13 +0200
committerGitHub2018-04-19 19:42:13 +0200
commit41ba608c6c7a6fe2defe29677781c2bb598e2c43 (patch)
treecf38e3fb2bfcac701364f0bde8848e7fd7692d8d /gui/widget.h
parent9bee9e1ba66db0ca27f13a7a09f839521c1e8b3f (diff)
parent4d29ce21d01176f523d6f3b05aefa1b011fc756c (diff)
downloadscummvm-rg350-41ba608c6c7a6fe2defe29677781c2bb598e2c43.tar.gz
scummvm-rg350-41ba608c6c7a6fe2defe29677781c2bb598e2c43.tar.bz2
scummvm-rg350-41ba608c6c7a6fe2defe29677781c2bb598e2c43.zip
Merge pull request #1156 from bgK/gui-simplify-text
GUI: Unify clip and non-clip draw calls
Diffstat (limited to 'gui/widget.h')
-rw-r--r--gui/widget.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/gui/widget.h b/gui/widget.h
index e57f3cde51..f87816b2e3 100644
--- a/gui/widget.h
+++ b/gui/widget.h
@@ -123,7 +123,6 @@ public:
virtual int16 getAbsX() const { return _x + _boss->getChildX(); }
virtual int16 getAbsY() const { return _y + _boss->getChildY(); }
- virtual Common::Rect getBossClipRect() const;
virtual void setPos(int x, int y) { _x = x; _y = y; }
virtual void setSize(int w, int h) { _w = w; _h = h; }
@@ -240,7 +239,6 @@ public:
~PicButtonWidget();
void setGfx(const Graphics::Surface *gfx, int statenum = kPicButtonStateEnabled);
- void setAGfx(const Graphics::TransparentSurface *gfx, int statenum = kPicButtonStateEnabled, ThemeEngine::AutoScaleMode mode = ThemeEngine::kAutoScaleNone);
void setGfx(int w, int h, int r, int g, int b, int statenum = kPicButtonStateEnabled);
void useAlpha(int alpha) { _alpha = alpha; }
@@ -251,12 +249,9 @@ protected:
void drawWidget();
Graphics::Surface _gfx[kPicButtonStateMax + 1];
- Graphics::TransparentSurface _agfx[kPicButtonStateMax + 1];
int _alpha;
bool _transparency;
bool _showButton;
- bool _isAlpha;
- ThemeEngine::AutoScaleMode _mode;
};
/* CheckboxWidget */
@@ -375,7 +370,6 @@ public:
void setGfx(const Graphics::Surface *gfx);
void setGfx(int w, int h, int r, int g, int b);
- void setAGfx(const Graphics::TransparentSurface *gfx, ThemeEngine::AutoScaleMode mode = ThemeEngine::kAutoScaleNone);
void useAlpha(int alpha) { _alpha = alpha; }
void useThemeTransparency(bool enable) { _transparency = enable; }
@@ -384,10 +378,8 @@ protected:
void drawWidget();
Graphics::Surface _gfx;
- Graphics::TransparentSurface _agfx;
int _alpha;
bool _transparency;
- ThemeEngine::AutoScaleMode _mode;
};
/* ContainerWidget */