1 files changed, 40 insertions, 3 deletions

diff --git a/scene/gui/check_box.cpp b/scene/gui/check_box.cpp
index 00f6153062..bf8156b92b 100644
--- a/scene/gui/check_box.cpp
+++ b/scene/gui/check_box.cpp
@@ -31,18 +31,54 @@
 
 #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) {
 
-	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();
 
 		Ref<Texture> on = Control::get_icon(is_radio() ? "radio_checked" : "checked");
 		Ref<Texture> off = Control::get_icon(is_radio() ? "radio_unchecked" : "unchecked");
+		Ref<StyleBox> sb = get_stylebox("normal");
 
 		Vector2 ofs;
-		ofs.x = 0;
-		ofs.y = int((get_size().height - on->get_height()) / 2);
+		ofs.x = sb->get_margin(MARGIN_LEFT);
+		ofs.y = int((get_size().height - get_icon_size().height) / 2);
 
 		if (is_pressed())
 			on->draw(ci, ofs);
@@ -60,6 +96,7 @@ CheckBox::CheckBox(const String &p_text) :
 		Button(p_text) {
 	set_toggle_mode(true);
 	set_text_align(ALIGN_LEFT);
+	_set_internal_margin(MARGIN_LEFT, get_icon_size().width);
 }
 
 CheckBox::~CheckBox() {