diff options
| author | George L. Albany <Megacake1234@gmail.com> | 2024-10-27 13:25:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-27 13:25:03 +0000 |
| commit | 6e3e9dfb9857b751f59fd4b40c55e9262ff5a864 (patch) | |
| tree | d064b49a4766ab69a0ac6e195868ad4b3443bab3 /scene/gui/button.cpp | |
| parent | bec9ffacba1385b0ba808f6dbb66abb7dc53639d (diff) | |
| parent | 953af98c795066a5a450a3401cc8a4fbc6c12620 (diff) | |
| download | redot-engine-6e3e9dfb9857b751f59fd4b40c55e9262ff5a864.tar.gz | |
Merge pull request #814 from Spartan322/merge/61accf0
Merge commit godotengine/godot@61accf0
Diffstat (limited to 'scene/gui/button.cpp')
| -rw-r--r-- | scene/gui/button.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp index 23ae1e9f63..f9dea97d04 100644 --- a/scene/gui/button.cpp +++ b/scene/gui/button.cpp @@ -298,19 +298,12 @@ void Button::_notification(int p_what) { } } break; case DRAW_HOVER_PRESSED: { - // Edge case for CheckButton and CheckBox. - if (has_theme_stylebox("hover_pressed")) { - if (has_theme_color(SNAME("font_hover_pressed_color"))) { - font_color = theme_cache.font_hover_pressed_color; - } - if (has_theme_color(SNAME("icon_hover_pressed_color"))) { - icon_modulate_color = theme_cache.icon_hover_pressed_color; - } - - break; + font_color = theme_cache.font_hover_pressed_color; + if (has_theme_color(SNAME("icon_hover_pressed_color"))) { + icon_modulate_color = theme_cache.icon_hover_pressed_color; } - } - [[fallthrough]]; + + } break; case DRAW_PRESSED: { if (has_theme_color(SNAME("font_pressed_color"))) { font_color = theme_cache.font_pressed_color; |