diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-05-30 15:04:01 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-05-30 15:08:24 +0300 |
| commit | 07121956f882dce22235868a25e0c2df96fb828a (patch) | |
| tree | 5078133e95d7b55c4811e09c9dc4f53261e62fe9 /src/gui/widgets/button.cpp | |
| parent | f57b683f8f9909ba7787c33a4953869a2ce04a5c (diff) | |
| download | manaplus-07121956f882dce22235868a25e0c2df96fb828a.tar.gz manaplus-07121956f882dce22235868a25e0c2df96fb828a.tar.bz2 manaplus-07121956f882dce22235868a25e0c2df96fb828a.tar.xz manaplus-07121956f882dce22235868a25e0c2df96fb828a.zip | |
Move theme colors enum into separate file.
Diffstat (limited to 'src/gui/widgets/button.cpp')
| -rw-r--r-- | src/gui/widgets/button.cpp | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index d40d8ab68..0d7bafd74 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -108,14 +108,14 @@ Button::Button(const Widget2 *const widget) : mDescription(), mTextChunk(), mVertexes2(new ImageCollection), - mEnabledColor(getThemeColor(Theme::BUTTON)), - mEnabledColor2(getThemeColor(Theme::BUTTON_OUTLINE)), - mDisabledColor(getThemeColor(Theme::BUTTON_DISABLED)), - mDisabledColor2(getThemeColor(Theme::BUTTON_DISABLED_OUTLINE)), - mHighlightedColor(getThemeColor(Theme::BUTTON_HIGHLIGHTED)), - mHighlightedColor2(getThemeColor(Theme::BUTTON_HIGHLIGHTED_OUTLINE)), - mPressedColor(getThemeColor(Theme::BUTTON_PRESSED)), - mPressedColor2(getThemeColor(Theme::BUTTON_PRESSED_OUTLINE)), + mEnabledColor(getThemeColor(ThemeColorId::BUTTON)), + mEnabledColor2(getThemeColor(ThemeColorId::BUTTON_OUTLINE)), + mDisabledColor(getThemeColor(ThemeColorId::BUTTON_DISABLED)), + mDisabledColor2(getThemeColor(ThemeColorId::BUTTON_DISABLED_OUTLINE)), + mHighlightedColor(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED)), + mHighlightedColor2(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), + mPressedColor(getThemeColor(ThemeColorId::BUTTON_PRESSED)), + mPressedColor2(getThemeColor(ThemeColorId::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), mImageSet(nullptr), mAlignment(Graphics::CENTER), @@ -151,14 +151,14 @@ Button::Button(const Widget2 *const widget, mDescription(), mTextChunk(), mVertexes2(new ImageCollection), - mEnabledColor(getThemeColor(Theme::BUTTON)), - mEnabledColor2(getThemeColor(Theme::BUTTON_OUTLINE)), - mDisabledColor(getThemeColor(Theme::BUTTON_DISABLED)), - mDisabledColor2(getThemeColor(Theme::BUTTON_DISABLED_OUTLINE)), - mHighlightedColor(getThemeColor(Theme::BUTTON_HIGHLIGHTED)), - mHighlightedColor2(getThemeColor(Theme::BUTTON_HIGHLIGHTED_OUTLINE)), - mPressedColor(getThemeColor(Theme::BUTTON_PRESSED)), - mPressedColor2(getThemeColor(Theme::BUTTON_PRESSED_OUTLINE)), + mEnabledColor(getThemeColor(ThemeColorId::BUTTON)), + mEnabledColor2(getThemeColor(ThemeColorId::BUTTON_OUTLINE)), + mDisabledColor(getThemeColor(ThemeColorId::BUTTON_DISABLED)), + mDisabledColor2(getThemeColor(ThemeColorId::BUTTON_DISABLED_OUTLINE)), + mHighlightedColor(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED)), + mHighlightedColor2(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), + mPressedColor(getThemeColor(ThemeColorId::BUTTON_PRESSED)), + mPressedColor2(getThemeColor(ThemeColorId::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), mImageSet(nullptr), mAlignment(Graphics::CENTER), @@ -200,14 +200,14 @@ Button::Button(const Widget2 *const widget, mDescription(), mTextChunk(), mVertexes2(new ImageCollection), - mEnabledColor(getThemeColor(Theme::BUTTON)), - mEnabledColor2(getThemeColor(Theme::BUTTON_OUTLINE)), - mDisabledColor(getThemeColor(Theme::BUTTON_DISABLED)), - mDisabledColor2(getThemeColor(Theme::BUTTON_DISABLED_OUTLINE)), - mHighlightedColor(getThemeColor(Theme::BUTTON_HIGHLIGHTED)), - mHighlightedColor2(getThemeColor(Theme::BUTTON_HIGHLIGHTED_OUTLINE)), - mPressedColor(getThemeColor(Theme::BUTTON_PRESSED)), - mPressedColor2(getThemeColor(Theme::BUTTON_PRESSED_OUTLINE)), + mEnabledColor(getThemeColor(ThemeColorId::BUTTON)), + mEnabledColor2(getThemeColor(ThemeColorId::BUTTON_OUTLINE)), + mDisabledColor(getThemeColor(ThemeColorId::BUTTON_DISABLED)), + mDisabledColor2(getThemeColor(ThemeColorId::BUTTON_DISABLED_OUTLINE)), + mHighlightedColor(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED)), + mHighlightedColor2(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), + mPressedColor(getThemeColor(ThemeColorId::BUTTON_PRESSED)), + mPressedColor2(getThemeColor(ThemeColorId::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), mImageSet(nullptr), mAlignment(Graphics::CENTER), @@ -249,14 +249,14 @@ Button::Button(const Widget2 *const widget, mDescription(), mTextChunk(), mVertexes2(new ImageCollection), - mEnabledColor(getThemeColor(Theme::BUTTON)), - mEnabledColor2(getThemeColor(Theme::BUTTON_OUTLINE)), - mDisabledColor(getThemeColor(Theme::BUTTON_DISABLED)), - mDisabledColor2(getThemeColor(Theme::BUTTON_DISABLED_OUTLINE)), - mHighlightedColor(getThemeColor(Theme::BUTTON_HIGHLIGHTED)), - mHighlightedColor2(getThemeColor(Theme::BUTTON_HIGHLIGHTED_OUTLINE)), - mPressedColor(getThemeColor(Theme::BUTTON_PRESSED)), - mPressedColor2(getThemeColor(Theme::BUTTON_PRESSED_OUTLINE)), + mEnabledColor(getThemeColor(ThemeColorId::BUTTON)), + mEnabledColor2(getThemeColor(ThemeColorId::BUTTON_OUTLINE)), + mDisabledColor(getThemeColor(ThemeColorId::BUTTON_DISABLED)), + mDisabledColor2(getThemeColor(ThemeColorId::BUTTON_DISABLED_OUTLINE)), + mHighlightedColor(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED)), + mHighlightedColor2(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), + mPressedColor(getThemeColor(ThemeColorId::BUTTON_PRESSED)), + mPressedColor2(getThemeColor(ThemeColorId::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), mImageSet(nullptr), mAlignment(Graphics::CENTER), @@ -298,14 +298,14 @@ Button::Button(const Widget2 *const widget, mDescription(), mTextChunk(), mVertexes2(new ImageCollection), - mEnabledColor(getThemeColor(Theme::BUTTON)), - mEnabledColor2(getThemeColor(Theme::BUTTON_OUTLINE)), - mDisabledColor(getThemeColor(Theme::BUTTON_DISABLED)), - mDisabledColor2(getThemeColor(Theme::BUTTON_DISABLED_OUTLINE)), - mHighlightedColor(getThemeColor(Theme::BUTTON_HIGHLIGHTED)), - mHighlightedColor2(getThemeColor(Theme::BUTTON_HIGHLIGHTED_OUTLINE)), - mPressedColor(getThemeColor(Theme::BUTTON_PRESSED)), - mPressedColor2(getThemeColor(Theme::BUTTON_PRESSED_OUTLINE)), + mEnabledColor(getThemeColor(ThemeColorId::BUTTON)), + mEnabledColor2(getThemeColor(ThemeColorId::BUTTON_OUTLINE)), + mDisabledColor(getThemeColor(ThemeColorId::BUTTON_DISABLED)), + mDisabledColor2(getThemeColor(ThemeColorId::BUTTON_DISABLED_OUTLINE)), + mHighlightedColor(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED)), + mHighlightedColor2(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), + mPressedColor(getThemeColor(ThemeColorId::BUTTON_PRESSED)), + mPressedColor2(getThemeColor(ThemeColorId::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), mImageSet(nullptr), mAlignment(Graphics::CENTER), |