diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-06-19 23:09:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-19 23:09:49 +0200 |
| commit | 6d8c14f849376905e1577f9fc3f9512bcffb1e3c (patch) | |
| tree | 1c0de1bac35046915575687e8d8993643d372474 /scene/resources | |
| parent | cb9d02a8d1b5bb71abcec6be0e75002c5ea656c4 (diff) | |
| parent | 31b7f02a29cdf4f1c30cfc37962f43f67380b9ad (diff) | |
Merge pull request #39690 from Calinou/remove-toolbutton
Remove ToolButton in favor of Button
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/default_theme/default_theme.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index fd5c861eb5..aebb0d7ba4 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -219,21 +219,21 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const theme->set_constant("hseparation", "ColorPickerButton", 2 * scale); - // ToolButton + // Button - theme->set_stylebox("normal", "ToolButton", make_empty_stylebox(6, 4, 6, 4)); - theme->set_stylebox("pressed", "ToolButton", make_stylebox(button_pressed_png, 4, 4, 4, 4, 6, 4, 6, 4)); - theme->set_stylebox("hover", "ToolButton", make_stylebox(button_normal_png, 4, 4, 4, 4, 6, 4, 6, 4)); - theme->set_stylebox("disabled", "ToolButton", make_empty_stylebox(6, 4, 6, 4)); - theme->set_stylebox("focus", "ToolButton", focus); - theme->set_font("font", "ToolButton", default_font); + 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", "ToolButton", control_font_color); - theme->set_color("font_color_pressed", "ToolButton", control_font_color_pressed); - theme->set_color("font_color_hover", "ToolButton", control_font_color_hover); - theme->set_color("font_color_disabled", "ToolButton", Color(0.9, 0.95, 1, 0.3)); + 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", "ToolButton", 3); + theme->set_constant("hseparation", "Button", 3); // OptionButton |