mirror of
https://github.com/godotengine/godot
synced 2024-09-05 17:59:56 +00:00
Add "disabled" icon for 'CheckButton'
This commit is contained in:
parent
262924296b
commit
acadfe0a49
|
@ -585,7 +585,9 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
|
|||
theme->set_stylebox("hover", "CheckButton", style_menu);
|
||||
|
||||
theme->set_icon("on", "CheckButton", theme->get_icon("GuiToggleOn", "EditorIcons"));
|
||||
theme->set_icon("on_disabled", "CheckButton", theme->get_icon("GuiToggleOnDisabled", "EditorIcons"));
|
||||
theme->set_icon("off", "CheckButton", theme->get_icon("GuiToggleOff", "EditorIcons"));
|
||||
theme->set_icon("off_disabled", "CheckButton", theme->get_icon("GuiToggleOffDisabled", "EditorIcons"));
|
||||
|
||||
theme->set_color("font_color", "CheckButton", font_color);
|
||||
theme->set_color("font_color_hover", "CheckButton", font_color_hl);
|
||||
|
|
|
@ -34,13 +34,15 @@
|
|||
#include "servers/visual_server.h"
|
||||
|
||||
Size2 CheckButton::get_icon_size() const {
|
||||
Ref<Texture> on = Control::get_icon("on");
|
||||
Ref<Texture> off = Control::get_icon("off");
|
||||
|
||||
Ref<Texture> on = Control::get_icon(is_disabled() ? "on_disabled" : "on");
|
||||
Ref<Texture> off = Control::get_icon(is_disabled() ? "off_disabled" : "off");
|
||||
Size2 tex_size = Size2(0, 0);
|
||||
if (!on.is_null())
|
||||
tex_size = Size2(on->get_width(), on->get_height());
|
||||
if (!off.is_null())
|
||||
tex_size = Size2(MAX(tex_size.width, off->get_width()), MAX(tex_size.height, off->get_height()));
|
||||
|
||||
return tex_size;
|
||||
}
|
||||
|
||||
|
@ -49,9 +51,8 @@ Size2 CheckButton::get_minimum_size() const {
|
|||
Size2 minsize = Button::get_minimum_size();
|
||||
Size2 tex_size = get_icon_size();
|
||||
minsize.width += tex_size.width;
|
||||
if (get_text().length() > 0) {
|
||||
if (get_text().length() > 0)
|
||||
minsize.width += get_constant("hseparation");
|
||||
}
|
||||
Ref<StyleBox> sb = get_stylebox("normal");
|
||||
minsize.height = MAX(minsize.height, tex_size.height + sb->get_margin(MARGIN_TOP) + sb->get_margin(MARGIN_BOTTOM));
|
||||
|
||||
|
@ -67,8 +68,8 @@ void CheckButton::_notification(int p_what) {
|
|||
|
||||
RID ci = get_canvas_item();
|
||||
|
||||
Ref<Texture> on = Control::get_icon("on");
|
||||
Ref<Texture> off = Control::get_icon("off");
|
||||
Ref<Texture> on = Control::get_icon(is_disabled() ? "on_disabled" : "on");
|
||||
Ref<Texture> off = Control::get_icon(is_disabled() ? "off_disabled" : "off");
|
||||
|
||||
Ref<StyleBox> sb = get_stylebox("normal");
|
||||
Vector2 ofs;
|
||||
|
|
|
@ -359,7 +359,9 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
|
|||
theme->set_stylebox("focus", "CheckButton", focus);
|
||||
|
||||
theme->set_icon("on", "CheckButton", make_icon(toggle_on_png));
|
||||
theme->set_icon("on_disabled", "CheckButton", make_icon(toggle_on_disabled_png));
|
||||
theme->set_icon("off", "CheckButton", make_icon(toggle_off_png));
|
||||
theme->set_icon("off_disabled", "CheckButton", make_icon(toggle_off_disabled_png));
|
||||
|
||||
theme->set_font("font", "CheckButton", default_font);
|
||||
|
||||
|
|
File diff suppressed because one or more lines are too long
BIN
scene/resources/default_theme/toggle_off_disabled.png
Normal file
BIN
scene/resources/default_theme/toggle_off_disabled.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.6 KiB |
BIN
scene/resources/default_theme/toggle_on_disabled.png
Normal file
BIN
scene/resources/default_theme/toggle_on_disabled.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.7 KiB |
Loading…
Reference in a new issue