diff options
author | Johannes Schickel | 2007-11-04 03:38:30 +0000 |
---|---|---|
committer | Johannes Schickel | 2007-11-04 03:38:30 +0000 |
commit | 0ec41a2d8022f5af042bffec7513e8f2d5e36a1b (patch) | |
tree | 8aeb8e4a2c770182c2d7ef08541a8f433e8e6cdd /gui/ThemeClassic.h | |
parent | 7cf5a578275f97f490c85e25409562718e23482f (diff) | |
download | scummvm-rg350-0ec41a2d8022f5af042bffec7513e8f2d5e36a1b.tar.gz scummvm-rg350-0ec41a2d8022f5af042bffec7513e8f2d5e36a1b.tar.bz2 scummvm-rg350-0ec41a2d8022f5af042bffec7513e8f2d5e36a1b.zip |
- made Widget::_flags private
- reworked state (enabled/disabled/highlighted) handling of widgets
- cleanup in ModernTheme.cpp
svn-id: r29403
Diffstat (limited to 'gui/ThemeClassic.h')
-rw-r--r-- | gui/ThemeClassic.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/gui/ThemeClassic.h b/gui/ThemeClassic.h index 966f45ba8a..0450da5aee 100644 --- a/gui/ThemeClassic.h +++ b/gui/ThemeClassic.h @@ -58,20 +58,20 @@ public: int getStringWidth(const Common::String &str, FontStyle font) const { if (_initOk) return _font->getStringWidth(str); return 0; } int getCharWidth(byte c, FontStyle font) const { if (_initOk) return _font->getCharWidth(c); return 0; } - void drawDialogBackground(const Common::Rect &r, uint16 hints, State state); - void drawText(const Common::Rect &r, const Common::String &str, State state, TextAlign align, bool inverted, int deltax, bool useEllipsis, FontStyle font); - void drawChar(const Common::Rect &r, byte ch, const Graphics::Font *font, State state); - - void drawWidgetBackground(const Common::Rect &r, uint16 hints, WidgetBackground background, State state); - void drawButton(const Common::Rect &r, const Common::String &str, State state, uint16 hints); - void drawSurface(const Common::Rect &r, const Graphics::Surface &surface, State state, int alpha, bool themeTrans); - void drawSlider(const Common::Rect &r, int width, State state); - void drawCheckbox(const Common::Rect &r, const Common::String &str, bool checked, State state); - void drawTab(const Common::Rect &r, int tabHeight, int tabWidth, const Common::Array<Common::String> &tabs, int active, uint16 hints, int titleVPad, State state); - void drawScrollbar(const Common::Rect &r, int sliderY, int sliderHeight, ScrollbarState, State state); - void drawPopUpWidget(const Common::Rect &r, const Common::String &sel, int deltax, State state, TextAlign align); - void drawCaret(const Common::Rect &r, bool erase, State state); - void drawLineSeparator(const Common::Rect &r, State state); + void drawDialogBackground(const Common::Rect &r, uint16 hints, WidgetStateInfo state); + void drawText(const Common::Rect &r, const Common::String &str, WidgetStateInfo state, TextAlign align, bool inverted, int deltax, bool useEllipsis, FontStyle font); + void drawChar(const Common::Rect &r, byte ch, const Graphics::Font *font, WidgetStateInfo state); + + void drawWidgetBackground(const Common::Rect &r, uint16 hints, WidgetBackground background, WidgetStateInfo state); + void drawButton(const Common::Rect &r, const Common::String &str, WidgetStateInfo state, uint16 hints); + void drawSurface(const Common::Rect &r, const Graphics::Surface &surface, WidgetStateInfo state, int alpha, bool themeTrans); + void drawSlider(const Common::Rect &r, int width, WidgetStateInfo state); + void drawCheckbox(const Common::Rect &r, const Common::String &str, bool checked, WidgetStateInfo state); + void drawTab(const Common::Rect &r, int tabHeight, int tabWidth, const Common::Array<Common::String> &tabs, int active, uint16 hints, int titleVPad, WidgetStateInfo state); + void drawScrollbar(const Common::Rect &r, int sliderY, int sliderHeight, ScrollbarState, WidgetStateInfo state); + void drawPopUpWidget(const Common::Rect &r, const Common::String &sel, int deltax, WidgetStateInfo state, TextAlign align); + void drawCaret(const Common::Rect &r, bool erase, WidgetStateInfo state); + void drawLineSeparator(const Common::Rect &r, WidgetStateInfo state); void restoreBackground(Common::Rect r, bool special = false); bool addDirtyRect(Common::Rect r, bool save = false, bool special = false); |