maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #34315 from YeldhamDev/editor_theme_optionbutton_arrow

Browse source 
Fix OptionButton's arrow margin in editor theme
This commit is contained in:
Rémi Verschelde 2019-12-13 00:36:29 +01:00 committed by GitHub
parent ec97535ea3 5004b8b81e
commit 0da0eec6cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
editor/editor_themes.cpp
View file

@ -587,11 +587,24 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
theme->set_color("icon_color_pressed", "Button", icon_color_pressed);
// OptionButton
theme->set_stylebox("normal", "OptionButton", style_widget);
theme->set_stylebox("hover", "OptionButton", style_widget_hover);
theme->set_stylebox("pressed", "OptionButton", style_widget_pressed);
theme->set_stylebox("focus", "OptionButton", style_widget_focus);
theme->set_stylebox("disabled", "OptionButton", style_widget_disabled);
Ref<StyleBoxFlat> style_option_button_normal = style_widget->duplicate();
Ref<StyleBoxFlat> style_option_button_hover = style_widget_hover->duplicate();
Ref<StyleBoxFlat> style_option_button_pressed = style_widget_pressed->duplicate();
Ref<StyleBoxFlat> style_option_button_focus = style_widget_focus->duplicate();
Ref<StyleBoxFlat> style_option_button_disabled = style_widget_disabled->duplicate();
int option_button_arrow_margin = theme->get_icon("GuiOptionArrow", "EditorIcons")->get_size().width + (default_margin_size + 4) * EDSCALE;
style_option_button_normal->set_default_margin(MARGIN_RIGHT, option_button_arrow_margin);
style_option_button_hover->set_default_margin(MARGIN_RIGHT, option_button_arrow_margin);
style_option_button_pressed->set_default_margin(MARGIN_RIGHT, option_button_arrow_margin);
style_option_button_focus->set_default_margin(MARGIN_RIGHT, option_button_arrow_margin);
style_option_button_disabled->set_default_margin(MARGIN_RIGHT, option_button_arrow_margin);
theme->set_stylebox("normal", "OptionButton", style_option_button_normal);
theme->set_stylebox("hover", "OptionButton", style_option_button_hover);
theme->set_stylebox("pressed", "OptionButton", style_option_button_pressed);
theme->set_stylebox("focus", "OptionButton", style_option_button_focus);
theme->set_stylebox("disabled", "OptionButton", style_option_button_disabled);
theme->set_color("font_color", "OptionButton", font_color);
theme->set_color("font_color_hover", "OptionButton", font_color_hl);