Fix CheckButton minimum size

5 files changed, 39 insertions, 14 deletions

diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp
index 1fa03f81f4..d2bf4b7b40 100644
--- a/scene/gui/button.cpp
+++ b/scene/gui/button.cpp
@@ -55,6 +55,10 @@ Size2 Button::get_minimum_size() const {
 	return get_stylebox("normal")->get_minimum_size() + minsize;
 }
 
+void Button::_set_internal_margin(Margin p_margin, float p_value) {
+	_internal_margin[p_margin] = p_value;
+}
+
 void Button::_notification(int p_what) {
 
 	if (p_what == NOTIFICATION_TRANSLATION_CHANGED) {
@@ -136,7 +140,7 @@ void Button::_notification(int p_what) {
 
 		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;
-		Point2 text_ofs = (size - style->get_minimum_size() - icon_ofs - font->get_string_size(xl_text)) / 2.0;
+		Point2 text_ofs = (size - style->get_minimum_size() - icon_ofs - font->get_string_size(xl_text) - Point2(_internal_margin[MARGIN_RIGHT], 0)) / 2.0;
 
 		switch (align) {
 			case ALIGN_LEFT: {
@@ -150,7 +154,7 @@ void Button::_notification(int p_what) {
 				text_ofs += style->get_offset();
 			} break;
 			case ALIGN_RIGHT: {
-				text_ofs.x = size.x - style->get_margin(MARGIN_RIGHT) - font->get_string_size(xl_text).x;
+				text_ofs.x = size.x - style->get_margin(MARGIN_RIGHT) - font->get_string_size(xl_text).x - _internal_margin[MARGIN_RIGHT];
 				text_ofs.y += style->get_offset().y;
 			} break;
 		}
@@ -263,6 +267,10 @@ Button::Button(const String &p_text) {
 	set_mouse_filter(MOUSE_FILTER_STOP);
 	set_text(p_text);
 	align = ALIGN_CENTER;
+
+	for (int i = 0; i < 4; i++) {
+		_internal_margin[i] = 0;
+	}
 }
 
 Button::~Button() {
diff --git a/scene/gui/button.h b/scene/gui/button.h
index dd6e730b86..35488582de 100644
--- a/scene/gui/button.h
+++ b/scene/gui/button.h
@@ -53,9 +53,11 @@ private:
 	Ref<Texture> icon;
 	bool clip_text;
 	TextAlign align;
+	float _internal_margin[4];
 
 protected:
 	virtual Size2 get_minimum_size() const;
+	void _set_internal_margin(Margin p_margin, float p_value);
 	void _notification(int p_what);
 	static void _bind_methods();
 
diff --git a/scene/gui/check_button.cpp b/scene/gui/check_button.cpp
index 77fdedd5e5..641d2d4f01 100644
--- a/scene/gui/check_button.cpp
+++ b/scene/gui/check_button.cpp
@@ -32,10 +32,7 @@
 #include "print_string.h"
 #include "servers/visual_server.h"
 
-Size2 CheckButton::get_minimum_size() const {
-
-	Size2 minsize = Button::get_minimum_size();
-
+Size2 CheckButton::get_icon_size() const {
 	Ref<Texture> on = Control::get_icon("on");
 	Ref<Texture> off = Control::get_icon("off");
 	Size2 tex_size = Size2(0, 0);
@@ -43,15 +40,29 @@ Size2 CheckButton::get_minimum_size() const {
 		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()));
-	minsize += Size2(tex_size.width + get_constant("hseparation"), 0);
-	minsize.height = MAX(minsize.height, tex_size.height);
+	return tex_size;
+}
+
+Size2 CheckButton::get_minimum_size() const {
 
-	return get_stylebox("normal")->get_minimum_size() + minsize;
+	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 CheckButton::_notification(int p_what) {
 
-	if (p_what == NOTIFICATION_DRAW) {
+	if (p_what == NOTIFICATION_THEME_CHANGED) {
+
+		_set_internal_margin(MARGIN_RIGHT, get_icon_size().width);
+	} else if (p_what == NOTIFICATION_DRAW) {
 
 		RID ci = get_canvas_item();
 
@@ -59,10 +70,11 @@ void CheckButton::_notification(int p_what) {
 		Ref<Texture> off = Control::get_icon("off");
 
 		Ref<StyleBox> sb = get_stylebox("normal");
-		Size2 sb_ofs = Size2(sb->get_margin(MARGIN_RIGHT), sb->get_margin(MARGIN_TOP));
 		Vector2 ofs;
-		ofs.x = get_minimum_size().width - (on->get_width() + sb_ofs.width);
-		ofs.y = sb_ofs.height;
+		Size2 tex_size = get_icon_size();
+
+		ofs.x = get_size().width - (tex_size.width + sb->get_margin(MARGIN_RIGHT));
+		ofs.y = (get_size().height - tex_size.height) / 2;
 
 		if (is_pressed())
 			on->draw(ci, ofs);
@@ -75,6 +87,8 @@ CheckButton::CheckButton() {
 
 	set_toggle_mode(true);
 	set_text_align(ALIGN_LEFT);
+
+	_set_internal_margin(MARGIN_RIGHT, get_icon_size().width);
 }
 
 CheckButton::~CheckButton() {
diff --git a/scene/gui/check_button.h b/scene/gui/check_button.h
index eb68943fe7..3103a40d3c 100644
--- a/scene/gui/check_button.h
+++ b/scene/gui/check_button.h
@@ -39,6 +39,7 @@ class CheckButton : public Button {
 	GDCLASS(CheckButton, Button);
 
 protected:
+	Size2 get_icon_size() const;
 	virtual Size2 get_minimum_size() const;
 	void _notification(int p_what);
 
diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp
index bb2c8750e3..3e7d0069dc 100644
--- a/scene/resources/default_theme/default_theme.cpp
+++ b/scene/resources/default_theme/default_theme.cpp
@@ -385,7 +385,7 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 
 	Ref<StyleBox> cb_empty = memnew(StyleBoxEmpty);
 	cb_empty->set_default_margin(MARGIN_LEFT, 6 * scale);
-	cb_empty->set_default_margin(MARGIN_RIGHT, 70 * scale);
+	cb_empty->set_default_margin(MARGIN_RIGHT, 6 * scale);
 	cb_empty->set_default_margin(MARGIN_TOP, 4 * scale);
 	cb_empty->set_default_margin(MARGIN_BOTTOM, 4 * scale);