diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-01-27 09:39:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-27 09:39:23 +0100 |
| commit | 2ebbf62be6c2a298418b0a08714d3850f8cf3dce (patch) | |
| tree | d91010ee0afaf43290d578f2a59284a399624e83 | |
| parent | 2fa73106c14eca0967fdcd45d425a1f2cc54947b (diff) | |
| parent | 64971bcc8a5351c4a3f01888abf2a28d15f5b755 (diff) | |
Merge pull request #45495 from Chaosus/style_font_hover_pressed
Added missed Button `font_hover_pressed_color` style
| -rw-r--r-- | doc/classes/Button.xml | 5 | ||||
| -rw-r--r-- | scene/resources/default_theme/default_theme.cpp | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/classes/Button.xml b/doc/classes/Button.xml index a1ac82012f..8908c5f830 100644 --- a/doc/classes/Button.xml +++ b/doc/classes/Button.xml @@ -124,6 +124,9 @@ <theme_item name="font_hover_color" type="Color" default="Color( 0.94, 0.94, 0.94, 1 )"> Text [Color] used when the [Button] is being hovered. </theme_item> + <theme_item name="font_hover_pressed_color" type="Color" default="Color( 1, 1, 1, 1 )"> + Text [Color] used when the [Button] is being hovered and pressed. + </theme_item> <theme_item name="font_outline_color" type="Color" default="Color( 1, 1, 1, 1 )"> Text outline [Color] of the [Button]. </theme_item> @@ -149,7 +152,7 @@ Icon modulate [Color] used when the [Button] is being hovered and pressed. </theme_item> <theme_item name="icon_normal_color" type="Color" default="Color( 1, 1, 1, 1 )"> - Default icon [Color] of the [Button]. + Default icon modulate [Color] of the [Button]. </theme_item> <theme_item name="icon_pressed_color" type="Color" default="Color( 1, 1, 1, 1 )"> Icon modulate [Color] used when the [Button] is being pressed. diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index 80ecff52f1..242c3b8ec4 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -188,6 +188,7 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const theme->set_color("font_color", "Button", control_font_color); theme->set_color("font_pressed_color", "Button", control_font_pressed_color); theme->set_color("font_hover_color", "Button", control_font_hover_color); + theme->set_color("font_hover_pressed_color", "Button", control_font_pressed_color); theme->set_color("font_disabled_color", "Button", control_font_disabled_color); theme->set_color("font_outline_color", "Button", Color(1, 1, 1)); |