diff options
| author | Gilles Roudiere <gilles.roudiere@gmail.com> | 2017-11-24 13:53:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-24 13:53:10 +0100 |
| commit | 1406fb6ede644afc621f1f8e4ac2f4a7016f4681 (patch) | |
| tree | 22bcdbe92b52feb6a7eb2bba69b200696c939947 | |
| parent | bc75fae5798c85b4fb18cbcdc3fcbc45a644dae3 (diff) | |
| parent | f3588b6b65871b452686df70b1a486ec3ceb8e8c (diff) | |
Merge pull request #13241 from GodotExplorer/pr-menu-button-theme
Fix style error with MenuButton in default theme
| -rw-r--r-- | scene/resources/default_theme/default_theme.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index cd28c9d203..36988e0c4c 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -310,7 +310,7 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const theme->set_stylebox("pressed", "OptionButton", sb_optbutton_pressed); theme->set_stylebox("hover", "OptionButton", sb_optbutton_hover); theme->set_stylebox("disabled", "OptionButton", sb_optbutton_disabled); - theme->set_stylebox("focus", "OptionButton", sb_button_focus); + theme->set_stylebox("focus", "OptionButton", sb_optbutton_focus); theme->set_icon("arrow", "OptionButton", make_icon(option_arrow_png)); @@ -328,8 +328,8 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const theme->set_stylebox("normal", "MenuButton", sb_button_normal); theme->set_stylebox("pressed", "MenuButton", sb_button_pressed); - theme->set_stylebox("hover", "MenuButton", sb_button_pressed); - theme->set_stylebox("disabled", "MenuButton", make_empty_stylebox(0, 0, 0, 0)); + theme->set_stylebox("hover", "MenuButton", sb_button_hover); + theme->set_stylebox("disabled", "MenuButton", sb_button_disabled); theme->set_stylebox("focus", "MenuButton", sb_button_focus); theme->set_font("font", "MenuButton", default_font); |