-Added configuration warning system for nodes

-Added a new "add" and "instance" buttons for scene tree
-Added a vformat() function to ease translation work

1 files changed, 5 insertions, 3 deletions

diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp
index e8097c79a4..09c6a77b42 100644
--- a/scene/gui/label.cpp
+++ b/scene/gui/label.cpp
@@ -87,10 +87,11 @@ void Label::_notification(int p_what) {
 		Color font_color_shadow = get_color("font_color_shadow");
 		bool use_outlinde = get_constant("shadow_as_outline");
 		Point2 shadow_ofs(get_constant("shadow_offset_x"),get_constant("shadow_offset_y"));
+		int line_spacing = get_constant("line_spacing");
 
 		VisualServer::get_singleton()->canvas_item_set_distance_field_mode(get_canvas_item(),font.is_valid() && font->is_distance_field_hint());
 
-		int font_h = font->get_height();
+		int font_h = font->get_height()+line_spacing;
 		int lines_visible = size.y/font_h;
 		int space_w=font->get_char_size(' ').width;
 		int chars_total=0;
@@ -372,6 +373,7 @@ void Label::regenerate_word_cache() {
 	int line_width=0;
 	int space_count=0;
 	int space_width=font->get_char_size(' ').width;
+	int line_spacing = get_constant("line_spacing");
 	line_count=1;
 	total_char_cache=0;
 
@@ -486,9 +488,9 @@ void Label::regenerate_word_cache() {
 	if (!autowrap) {
 		minsize.width=width;
 		if (max_lines_visible > 0 && line_count > max_lines_visible) {
-			minsize.height=font->get_height()*max_lines_visible;
+			minsize.height=(font->get_height()+line_spacing)*max_lines_visible;
 		} else {
-			minsize.height=font->get_height()*line_count;
+			minsize.height=(font->get_height()+line_spacing)*line_count;
 		}
 	}