diff options
author | Tobia Tesan | 2013-09-20 17:10:20 +0200 |
---|---|---|
committer | Tobia Tesan | 2013-09-21 23:22:35 +0200 |
commit | 59f4a9e7ac519405a728b9d9a448114c05fe4776 (patch) | |
tree | c7bb803584a8c5da384c595cc7cc17a6ed7adf05 /engines | |
parent | b22eaaa98a9620fae346b1bd1bf67311cb312ec0 (diff) | |
download | scummvm-rg350-59f4a9e7ac519405a728b9d9a448114c05fe4776.tar.gz scummvm-rg350-59f4a9e7ac519405a728b9d9a448114c05fe4776.tar.bz2 scummvm-rg350-59f4a9e7ac519405a728b9d9a448114c05fe4776.zip |
WINTERMUTE: Keep some attributes private in UIButton
Diffstat (limited to 'engines')
-rw-r--r-- | engines/wintermute/ui/ui_button.h | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/engines/wintermute/ui/ui_button.h b/engines/wintermute/ui/ui_button.h index b5002f3166..846121e320 100644 --- a/engines/wintermute/ui/ui_button.h +++ b/engines/wintermute/ui/ui_button.h @@ -37,31 +37,15 @@ namespace Wintermute { class UIButton : public UIObject { public: - bool _pixelPerfect; - bool _stayPressed; - bool _centerImage; - bool _oneTimePress; + uint32 _oneTimePressTime; DECLARE_PERSISTENT(UIButton, UIObject) void press(); virtual bool display() { return display(0, 0); } virtual bool display(int offsetX, int offsetY); - bool _press; - bool _hover; + void correctSize(); - TTextAlign _align; - BaseSprite *_imageHover; - BaseSprite *_imagePress; - BaseSprite *_imageDisable; - BaseSprite *_imageFocus; - BaseFont *_fontDisable; - BaseFont *_fontPress; - BaseFont *_fontHover; - BaseFont *_fontFocus; - UITiledImage *_backPress; - UITiledImage *_backHover; - UITiledImage *_backDisable; - UITiledImage *_backFocus; + UIButton(BaseGame *inGame = nullptr); virtual ~UIButton(); bool loadFile(const char *filename); @@ -73,6 +57,28 @@ public: virtual bool scSetProperty(const char *name, ScValue *value) override; virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name) override; virtual const char *scToString() override; + BaseFont *_fontDisable; + BaseFont *_fontPress; + BaseFont *_fontHover; + BaseFont *_fontFocus; + BaseSprite *_imageHover; + BaseSprite *_imagePress; + BaseSprite *_imageDisable; + BaseSprite *_imageFocus; + TTextAlign _align; + +private: + bool _pixelPerfect; + bool _stayPressed; + bool _centerImage; + bool _oneTimePress; + UITiledImage *_backPress; + UITiledImage *_backHover; + UITiledImage *_backDisable; + UITiledImage *_backFocus; + bool _press; + bool _hover; + }; } // End of namespace Wintermute |