asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix CheckBox minimum size

Browse source
This commit is contained in:
volzhs 2017-12-11 15:37:29 +09:00
parent 3c04d7798c
commit 2afa2bc389
4 changed files with 58 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scene/gui/button.cpp
View file

@ -140,11 +140,11 @@ void Button::_notification(int p_what) {
Point2 icon_ofs = (!_icon.is_null()) ? Point2(_icon->get_width() + get_constant("hseparation"), 0) : Point2(); Point2 icon_ofs = (!_icon.is_null()) ? Point2(_icon->get_width() + get_constant("hseparation"), 0) : Point2();
int text_clip = size.width - style->get_minimum_size().width - icon_ofs.width; int text_clip = size.width - style->get_minimum_size().width - icon_ofs.width;
Point2 text_ofs = (size - style->get_minimum_size() - icon_ofs - font->get_string_size(xl_text) - Point2(_internal_margin[MARGIN_RIGHT], 0)) / 2.0; Point2 text_ofs = (size - style->get_minimum_size() - icon_ofs - font->get_string_size(xl_text) - Point2(_internal_margin[MARGIN_RIGHT] - _internal_margin[MARGIN_LEFT], 0)) / 2.0;
switch (align) { switch (align) {
case ALIGN_LEFT: { case ALIGN_LEFT: {
text_ofs.x = style->get_margin(MARGIN_LEFT) + icon_ofs.x; text_ofs.x = style->get_margin(MARGIN_LEFT) + icon_ofs.x + _internal_margin[MARGIN_LEFT] + get_constant("hseparation");
text_ofs.y += style->get_offset().y; text_ofs.y += style->get_offset().y;
} break; } break;
case ALIGN_CENTER: { case ALIGN_CENTER: {
@ -154,7 +154,11 @@ void Button::_notification(int p_what) {
text_ofs += style->get_offset(); text_ofs += style->get_offset();
} break; } break;
case ALIGN_RIGHT: { case ALIGN_RIGHT: {
text_ofs.x = size.x - style->get_margin(MARGIN_RIGHT) - font->get_string_size(xl_text).x - _internal_margin[MARGIN_RIGHT]; if (_internal_margin[MARGIN_RIGHT] > 0) {
text_ofs.x = size.x - style->get_margin(MARGIN_RIGHT) - font->get_string_size(xl_text).x - _internal_margin[MARGIN_RIGHT] - get_constant("hseparation");
} else {
text_ofs.x = size.x - style->get_margin(MARGIN_RIGHT) - font->get_string_size(xl_text).x;
}
text_ofs.y += style->get_offset().y; text_ofs.y += style->get_offset().y;
} break; } break;
} }
@ -166,7 +170,11 @@ void Button::_notification(int p_what) {
int valign = size.height - style->get_minimum_size().y; int valign = size.height - style->get_minimum_size().y;
if (is_disabled()) if (is_disabled())
color_icon.a = 0.4; color_icon.a = 0.4;
_icon->draw(ci, style->get_offset() + Point2(0, Math::floor((valign - _icon->get_height()) / 2.0)), color_icon); if (_internal_margin[MARGIN_LEFT] > 0) {
_icon->draw(ci, style->get_offset() + Point2(_internal_margin[MARGIN_LEFT] + get_constant("hseparation"), Math::floor((valign - _icon->get_height()) / 2.0)), color_icon);
} else {
_icon->draw(ci, style->get_offset() + Point2(0, Math::floor((valign - _icon->get_height()) / 2.0)), color_icon);
}
} }
} }
} }

43
scene/gui/check_box.cpp
View file

@ -31,18 +31,54 @@
#include "servers/visual_server.h" #include "servers/visual_server.h"
Size2 CheckBox::get_icon_size() const {
Ref<Texture> checked = Control::get_icon("checked");
Ref<Texture> unchecked = Control::get_icon("unchecked");
Ref<Texture> radio_checked = Control::get_icon("radio_checked");
Ref<Texture> radio_unchecked = Control::get_icon("radio_unchecked");
Size2 tex_size = Size2(0, 0);
if (!checked.is_null())
tex_size = Size2(checked->get_width(), checked->get_height());
if (!unchecked.is_null())
tex_size = Size2(MAX(tex_size.width, unchecked->get_width()), MAX(tex_size.height, unchecked->get_height()));
if (!radio_checked.is_null())
tex_size = Size2(MAX(tex_size.width, radio_checked->get_width()), MAX(tex_size.height, radio_checked->get_height()));
if (!radio_unchecked.is_null())
tex_size = Size2(MAX(tex_size.width, radio_unchecked->get_width()), MAX(tex_size.height, radio_unchecked->get_height()));
return tex_size;
}
Size2 CheckBox::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) {
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));
return minsize;
}
void CheckBox::_notification(int p_what) { void CheckBox::_notification(int p_what) {
if (p_what == NOTIFICATION_DRAW) { if (p_what == NOTIFICATION_THEME_CHANGED) {
_set_internal_margin(MARGIN_LEFT, get_icon_size().width);
} else if (p_what == NOTIFICATION_DRAW) {
RID ci = get_canvas_item(); RID ci = get_canvas_item();
Ref<Texture> on = Control::get_icon(is_radio() ? "radio_checked" : "checked"); Ref<Texture> on = Control::get_icon(is_radio() ? "radio_checked" : "checked");
Ref<Texture> off = Control::get_icon(is_radio() ? "radio_unchecked" : "unchecked"); Ref<Texture> off = Control::get_icon(is_radio() ? "radio_unchecked" : "unchecked");
Ref<StyleBox> sb = get_stylebox("normal");
Vector2 ofs; Vector2 ofs;
ofs.x = 0; ofs.x = sb->get_margin(MARGIN_LEFT);
ofs.y = int((get_size().height - on->get_height()) / 2); ofs.y = int((get_size().height - get_icon_size().height) / 2);
if (is_pressed()) if (is_pressed())
on->draw(ci, ofs); on->draw(ci, ofs);
@ -60,6 +96,7 @@ CheckBox::CheckBox(const String &p_text) :
Button(p_text) { Button(p_text) {
set_toggle_mode(true); set_toggle_mode(true);
set_text_align(ALIGN_LEFT); set_text_align(ALIGN_LEFT);
_set_internal_margin(MARGIN_LEFT, get_icon_size().width);
} }
CheckBox::~CheckBox() { CheckBox::~CheckBox() {

2
scene/gui/check_box.h
View file

@ -39,6 +39,8 @@ class CheckBox : public Button {
GDCLASS(CheckBox, Button); GDCLASS(CheckBox, Button);
protected: protected:
Size2 get_icon_size() const;
Size2 get_minimum_size() const;
void _notification(int p_what); void _notification(int p_what);
bool is_radio(); bool is_radio();

8
scene/resources/default_theme/default_theme.cpp
View file

@ -350,15 +350,15 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
// CheckBox // CheckBox
Ref<StyleBox> cbx_empty = memnew(StyleBoxEmpty); Ref<StyleBox> cbx_empty = memnew(StyleBoxEmpty);
cbx_empty->set_default_margin(MARGIN_LEFT, 22 * scale); cbx_empty->set_default_margin(MARGIN_LEFT, 4 * scale);
cbx_empty->set_default_margin(MARGIN_RIGHT, 4 * scale); cbx_empty->set_default_margin(MARGIN_RIGHT, 4 * scale);
cbx_empty->set_default_margin(MARGIN_TOP, 4 * scale); cbx_empty->set_default_margin(MARGIN_TOP, 4 * scale);
cbx_empty->set_default_margin(MARGIN_BOTTOM, 5 * scale); cbx_empty->set_default_margin(MARGIN_BOTTOM, 4 * scale);
Ref<StyleBox> cbx_focus = focus; Ref<StyleBox> cbx_focus = focus;
cbx_focus->set_default_margin(MARGIN_LEFT, 4 * scale); cbx_focus->set_default_margin(MARGIN_LEFT, 4 * scale);
cbx_focus->set_default_margin(MARGIN_RIGHT, 22 * scale); cbx_focus->set_default_margin(MARGIN_RIGHT, 4 * scale);
cbx_focus->set_default_margin(MARGIN_TOP, 4 * scale); cbx_focus->set_default_margin(MARGIN_TOP, 4 * scale);
cbx_focus->set_default_margin(MARGIN_BOTTOM, 5 * scale); cbx_focus->set_default_margin(MARGIN_BOTTOM, 4 * scale);
theme->set_stylebox("normal", "CheckBox", cbx_empty); theme->set_stylebox("normal", "CheckBox", cbx_empty);
theme->set_stylebox("pressed", "CheckBox", cbx_empty); theme->set_stylebox("pressed", "CheckBox", cbx_empty);