From acadfe0a4960f3ac6f32c6488d3545d2baea9ddd Mon Sep 17 00:00:00 2001 From: Michael Alexsander Silva Dias Date: Tue, 30 Apr 2019 16:16:41 -0300 Subject: Add "disabled" icon for 'CheckButton' --- scene/gui/check_button.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'scene/gui') diff --git a/scene/gui/check_button.cpp b/scene/gui/check_button.cpp index 35e3119473..a2d0f388c4 100644 --- a/scene/gui/check_button.cpp +++ b/scene/gui/check_button.cpp @@ -34,13 +34,15 @@ #include "servers/visual_server.h" Size2 CheckButton::get_icon_size() const { - Ref on = Control::get_icon("on"); - Ref off = Control::get_icon("off"); + + Ref on = Control::get_icon(is_disabled() ? "on_disabled" : "on"); + Ref 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 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 on = Control::get_icon("on"); - Ref off = Control::get_icon("off"); + Ref on = Control::get_icon(is_disabled() ? "on_disabled" : "on"); + Ref off = Control::get_icon(is_disabled() ? "off_disabled" : "off"); Ref sb = get_stylebox("normal"); Vector2 ofs; -- cgit v1.2.3