diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-12-30 18:00:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-30 18:00:37 +0100 |
| commit | 7b412eb8390d73313bfc6ba4997e3533802186cf (patch) | |
| tree | 4528f87410ba735ec8a81043d07d193e93bb1c66 /editor | |
| parent | 583d96cb964d37cca39e3bc0e9a4372d6693dfec (diff) | |
| parent | fd2c181a3560eebfeae3ac53c55309f505dde849 (diff) | |
| download | redot-engine-7b412eb8390d73313bfc6ba4997e3533802186cf.tar.gz | |
Merge pull request #34653 from YeldhamDev/optionbutton_margin_auto
Make OptionButton itself take into account the arrow margin instead of relying on the theme
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_themes.cpp | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 6ac20e6719..b203ca8bc0 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -587,24 +587,11 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { theme->set_color("icon_color_pressed", "Button", icon_color_pressed); // OptionButton - 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_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); theme->set_color("font_color", "OptionButton", font_color); theme->set_color("font_color_hover", "OptionButton", font_color_hl); |