소스 검색

Merge pull request #45495 from Chaosus/style_font_hover_pressed

Added missed Button `font_hover_pressed_color` style
Rémi Verschelde 4 년 전
부모
커밋
2ebbf62be6
2개의 변경된 파일5개의 추가작업 그리고 1개의 파일을 삭제
  1. 4 1
      doc/classes/Button.xml
  2. 1 0
      scene/resources/default_theme/default_theme.cpp

+ 4 - 1
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 )">
 		<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.
 			Text [Color] used when the [Button] is being hovered.
 		</theme_item>
 		</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 )">
 		<theme_item name="font_outline_color" type="Color" default="Color( 1, 1, 1, 1 )">
 			Text outline [Color] of the [Button].
 			Text outline [Color] of the [Button].
 		</theme_item>
 		</theme_item>
@@ -149,7 +152,7 @@
 			Icon modulate [Color] used when the [Button] is being hovered and pressed.
 			Icon modulate [Color] used when the [Button] is being hovered and pressed.
 		</theme_item>
 		</theme_item>
 		<theme_item name="icon_normal_color" type="Color" default="Color( 1, 1, 1, 1 )">
 		<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>
 		<theme_item name="icon_pressed_color" type="Color" default="Color( 1, 1, 1, 1 )">
 		<theme_item name="icon_pressed_color" type="Color" default="Color( 1, 1, 1, 1 )">
 			Icon modulate [Color] used when the [Button] is being pressed.
 			Icon modulate [Color] used when the [Button] is being pressed.

+ 1 - 0
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_color", "Button", control_font_color);
 	theme->set_color("font_pressed_color", "Button", control_font_pressed_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_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_disabled_color", "Button", control_font_disabled_color);
 	theme->set_color("font_outline_color", "Button", Color(1, 1, 1));
 	theme->set_color("font_outline_color", "Button", Color(1, 1, 1));