1 files changed, 27 insertions, 33 deletions

diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp
index 119f3539e1..b0bcde8865 100644
--- a/scene/gui/button.cpp
+++ b/scene/gui/button.cpp
@@ -56,6 +56,11 @@ Size2 Button::get_minimum_size() const {
 		}
 	}
 
+	Ref<Font> font = get_theme_font("font");
+	float font_height = font->get_height(get_theme_font_size("font_size"));
+
+	minsize.height = MAX(font_height, minsize.height);
+
 	return get_theme_stylebox("normal")->get_minimum_size() + minsize;
 }
 
@@ -102,8 +107,8 @@ void Button::_notification(int p_what) {
 						style->draw(ci, Rect2(Point2(0, 0), size));
 					}
 					color = get_theme_color("font_color");
-					if (has_theme_color("icon_color_normal")) {
-						color_icon = get_theme_color("icon_color_normal");
+					if (has_theme_color("icon_normal_color")) {
+						color_icon = get_theme_color("icon_normal_color");
 					}
 				} break;
 				case DRAW_HOVER_PRESSED: {
@@ -117,13 +122,13 @@ void Button::_notification(int p_what) {
 						if (!flat) {
 							style->draw(ci, Rect2(Point2(0, 0), size));
 						}
-						if (has_theme_color("font_color_hover_pressed")) {
-							color = get_theme_color("font_color_hover_pressed");
+						if (has_theme_color("font_hover_pressed_color")) {
+							color = get_theme_color("font_hover_pressed_color");
 						} else {
 							color = get_theme_color("font_color");
 						}
-						if (has_theme_color("icon_color_hover_pressed")) {
-							color_icon = get_theme_color("icon_color_hover_pressed");
+						if (has_theme_color("icon_hover_pressed_color")) {
+							color_icon = get_theme_color("icon_hover_pressed_color");
 						}
 
 						break;
@@ -140,13 +145,13 @@ void Button::_notification(int p_what) {
 					if (!flat) {
 						style->draw(ci, Rect2(Point2(0, 0), size));
 					}
-					if (has_theme_color("font_color_pressed")) {
-						color = get_theme_color("font_color_pressed");
+					if (has_theme_color("font_pressed_color")) {
+						color = get_theme_color("font_pressed_color");
 					} else {
 						color = get_theme_color("font_color");
 					}
-					if (has_theme_color("icon_color_pressed")) {
-						color_icon = get_theme_color("icon_color_pressed");
+					if (has_theme_color("icon_pressed_color")) {
+						color_icon = get_theme_color("icon_pressed_color");
 					}
 
 				} break;
@@ -160,9 +165,9 @@ void Button::_notification(int p_what) {
 					if (!flat) {
 						style->draw(ci, Rect2(Point2(0, 0), size));
 					}
-					color = get_theme_color("font_color_hover");
-					if (has_theme_color("icon_color_hover")) {
-						color_icon = get_theme_color("icon_color_hover");
+					color = get_theme_color("font_hover_color");
+					if (has_theme_color("icon_hover_color")) {
+						color_icon = get_theme_color("icon_hover_color");
 					}
 
 				} break;
@@ -176,9 +181,9 @@ void Button::_notification(int p_what) {
 					if (!flat) {
 						style->draw(ci, Rect2(Point2(0, 0), size));
 					}
-					color = get_theme_color("font_color_disabled");
-					if (has_theme_color("icon_color_disabled")) {
-						color_icon = get_theme_color("icon_color_disabled");
+					color = get_theme_color("font_disabled_color");
+					if (has_theme_color("icon_disabled_color")) {
+						color_icon = get_theme_color("icon_disabled_color");
 					}
 
 				} break;
@@ -203,7 +208,7 @@ void Button::_notification(int p_what) {
 					color_icon.a = 0.4;
 				}
 
-				float icon_ofs_region = 0;
+				float icon_ofs_region = 0.0;
 				if (rtl) {
 					if (_internal_margin[SIDE_RIGHT] > 0) {
 						icon_ofs_region = _internal_margin[SIDE_RIGHT] + get_theme_constant("hseparation");
@@ -303,13 +308,13 @@ void Button::_notification(int p_what) {
 				text_ofs.x -= icon_ofs.x;
 			}
 
-			Color font_outline_modulate = get_theme_color("font_outline_modulate");
+			Color font_outline_color = get_theme_color("font_outline_color");
 			int outline_size = get_theme_constant("outline_size");
-			if (outline_size > 0 && font_outline_modulate.a > 0) {
-				text_buf->draw_outline(ci, text_ofs.floor(), outline_size, font_outline_modulate);
+			if (outline_size > 0 && font_outline_color.a > 0) {
+				text_buf->draw_outline(ci, text_ofs, outline_size, font_outline_color);
 			}
 
-			text_buf->draw(ci, text_ofs.floor(), color);
+			text_buf->draw(ci, text_ofs, color);
 
 			if (!_icon.is_null() && icon_region.size.width > 0) {
 				draw_texture_rect_region(_icon, icon_region, Rect2(Point2(), _icon->get_size()), color_icon);
@@ -338,7 +343,6 @@ void Button::set_text(const String &p_text) {
 		_shape();
 
 		update();
-		_change_notify("text");
 		minimum_size_changed();
 	}
 }
@@ -399,7 +403,6 @@ void Button::set_icon(const Ref<Texture2D> &p_icon) {
 	if (icon != p_icon) {
 		icon = p_icon;
 		update();
-		_change_notify("icon");
 		minimum_size_changed();
 	}
 }
@@ -424,7 +427,6 @@ void Button::set_flat(bool p_flat) {
 	if (flat != p_flat) {
 		flat = p_flat;
 		update();
-		_change_notify("flat");
 	}
 }
 
@@ -474,7 +476,7 @@ bool Button::_set(const StringName &p_name, const Variant &p_value) {
 				update();
 			}
 		}
-		_change_notify();
+		notify_property_list_changed();
 		return true;
 	}
 
@@ -544,16 +546,8 @@ Button::Button(const String &p_text) {
 	text_buf.instance();
 	text_buf->set_flags(TextServer::BREAK_MANDATORY);
 
-	flat = false;
-	clip_text = false;
-	expand_icon = false;
 	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() {