diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-07-18 18:14:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-18 18:14:23 +0200 |
| commit | 9cf72d0ae174badab07b1461f576955725375046 (patch) | |
| tree | 4386712fb6d3b1016170542242da807998dc61b3 /scene | |
| parent | ae80d57b319a67b0dad7544082fe1362a0c1d6da (diff) | |
| parent | 337c1238b9a4da1c0ccb0547a1be370c4ac6a56c (diff) | |
Merge pull request #9700 from djrm/button_fixes
Fixed button flat behavior when not in normal state.
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/button.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp index a456759281..03798c01a2 100644 --- a/scene/gui/button.cpp +++ b/scene/gui/button.cpp @@ -89,7 +89,8 @@ void Button::_notification(int p_what) { case DRAW_PRESSED: { style = get_stylebox("pressed"); - style->draw(ci, Rect2(Point2(0, 0), size)); + if (!flat) + style->draw(ci, Rect2(Point2(0, 0), size)); if (has_color("font_color_pressed")) color = get_color("font_color_pressed"); else @@ -101,7 +102,8 @@ void Button::_notification(int p_what) { case DRAW_HOVER: { style = get_stylebox("hover"); - style->draw(ci, Rect2(Point2(0, 0), size)); + if (!flat) + style->draw(ci, Rect2(Point2(0, 0), size)); color = get_color("font_color_hover"); if (has_color("icon_color_hover")) color_icon = get_color("icon_color_hover"); @@ -110,7 +112,8 @@ void Button::_notification(int p_what) { case DRAW_DISABLED: { style = get_stylebox("disabled"); - style->draw(ci, Rect2(Point2(0, 0), size)); + if (!flat) + style->draw(ci, Rect2(Point2(0, 0), size)); color = get_color("font_color_disabled"); if (has_color("icon_color_disabled")) color_icon = get_color("icon_color_disabled"); |