diff options
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/button.cpp | 15 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/tab.h | 2 | ||||
| -rw-r--r-- | src/gui/widgets/window.h | 2 |
3 files changed, 12 insertions, 7 deletions
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index 98140e71c..634e47ce2 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -111,7 +111,8 @@ Button::Button(const Widget2 *const widget) : mDisabledColor(getThemeColor(ThemeColorId::BUTTON_DISABLED)), mDisabledColor2(getThemeColor(ThemeColorId::BUTTON_DISABLED_OUTLINE)), mHighlightedColor(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED)), - mHighlightedColor2(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), + mHighlightedColor2(getThemeColor( + ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), mPressedColor(getThemeColor(ThemeColorId::BUTTON_PRESSED)), mPressedColor2(getThemeColor(ThemeColorId::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), @@ -154,7 +155,8 @@ Button::Button(const Widget2 *const widget, mDisabledColor(getThemeColor(ThemeColorId::BUTTON_DISABLED)), mDisabledColor2(getThemeColor(ThemeColorId::BUTTON_DISABLED_OUTLINE)), mHighlightedColor(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED)), - mHighlightedColor2(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), + mHighlightedColor2(getThemeColor( + ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), mPressedColor(getThemeColor(ThemeColorId::BUTTON_PRESSED)), mPressedColor2(getThemeColor(ThemeColorId::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), @@ -203,7 +205,8 @@ Button::Button(const Widget2 *const widget, mDisabledColor(getThemeColor(ThemeColorId::BUTTON_DISABLED)), mDisabledColor2(getThemeColor(ThemeColorId::BUTTON_DISABLED_OUTLINE)), mHighlightedColor(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED)), - mHighlightedColor2(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), + mHighlightedColor2(getThemeColor( + ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), mPressedColor(getThemeColor(ThemeColorId::BUTTON_PRESSED)), mPressedColor2(getThemeColor(ThemeColorId::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), @@ -252,7 +255,8 @@ Button::Button(const Widget2 *const widget, mDisabledColor(getThemeColor(ThemeColorId::BUTTON_DISABLED)), mDisabledColor2(getThemeColor(ThemeColorId::BUTTON_DISABLED_OUTLINE)), mHighlightedColor(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED)), - mHighlightedColor2(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), + mHighlightedColor2(getThemeColor( + ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), mPressedColor(getThemeColor(ThemeColorId::BUTTON_PRESSED)), mPressedColor2(getThemeColor(ThemeColorId::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), @@ -301,7 +305,8 @@ Button::Button(const Widget2 *const widget, mDisabledColor(getThemeColor(ThemeColorId::BUTTON_DISABLED)), mDisabledColor2(getThemeColor(ThemeColorId::BUTTON_DISABLED_OUTLINE)), mHighlightedColor(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED)), - mHighlightedColor2(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), + mHighlightedColor2(getThemeColor( + ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), mPressedColor(getThemeColor(ThemeColorId::BUTTON_PRESSED)), mPressedColor2(getThemeColor(ThemeColorId::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h index 69cb7cf95..65ebc57b7 100644 --- a/src/gui/widgets/tabs/tab.h +++ b/src/gui/widgets/tabs/tab.h @@ -122,7 +122,7 @@ class Tab notfinal : public BasicContainer, mTabColor = color1; mTabOutlineColor = color2; mRedraw = true; - } + } /** * Set the highlighted color for the tab's text. diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h index 84931b88d..e062de671 100644 --- a/src/gui/widgets/window.h +++ b/src/gui/widgets/window.h @@ -289,7 +289,7 @@ class Window notfinal : public BasicContainer2, void setSaveVisible(const bool save) { mSaveVisible = save; } - virtual void postInit() override + void postInit() override { mInit = true; } /** |