1 files changed, 25 insertions, 11 deletions

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() {