godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix default editor/project Button styles after ToolButton removal 

Before this fix, all Buttons made with the default project theme
looked flat until hovered.
This commit is contained in:
Hugo Locurcio 2020-06-24 17:21:47 +02:00
parent 4c0b077faa
commit 9bd2d7a617
No known key found for this signature in database
GPG Key ID: 39E8F8BE30B0A49C
2 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editor/editor_themes.cpp
View File

@ -570,17 +570,8 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
theme->set_stylebox("focus", "PopupMenu", style_menu);
theme->set_stylebox("disabled", "PopupMenu", style_menu);
theme->set_stylebox("normal", "Button", style_menu);
theme->set_stylebox("hover", "Button", style_menu);
theme->set_stylebox("pressed", "Button", style_menu);
theme->set_stylebox("focus", "Button", style_menu);
theme->set_stylebox("disabled", "Button", style_menu);
theme->set_color("font_color", "MenuButton", font_color);
theme->set_color("font_color_hover", "MenuButton", font_color_hl);
theme->set_color("font_color", "Button", font_color);
theme->set_color("font_color_hover", "Button", font_color_hl);
theme->set_color("font_color_pressed", "Button", accent_color);
theme->set_stylebox("MenuHover", "EditorStyles", style_menu_hover_border);

16
scene/resources/default_theme/default_theme.cpp
View File

@ -219,22 +219,6 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
theme->set_constant("hseparation", "ColorPickerButton", 2 * scale);
// Button
theme->set_stylebox("normal", "Button", make_empty_stylebox(6, 4, 6, 4));
theme->set_stylebox("pressed", "Button", make_stylebox(button_pressed_png, 4, 4, 4, 4, 6, 4, 6, 4));
theme->set_stylebox("hover", "Button", make_stylebox(button_normal_png, 4, 4, 4, 4, 6, 4, 6, 4));
theme->set_stylebox("disabled", "Button", make_empty_stylebox(6, 4, 6, 4));
theme->set_stylebox("focus", "Button", focus);
theme->set_font("font", "Button", default_font);
theme->set_color("font_color", "Button", control_font_color);
theme->set_color("font_color_pressed", "Button", control_font_color_pressed);
theme->set_color("font_color_hover", "Button", control_font_color_hover);
theme->set_color("font_color_disabled", "Button", Color(0.9, 0.95, 1, 0.3));
theme->set_constant("hseparation", "Button", 3);
// OptionButton
Ref<StyleBox> sb_optbutton_normal = sb_expand(make_stylebox(option_button_normal_png, 4, 4, 21, 4, 6, 3, 9, 3), 2, 2, 2, 2);