[Complex Text Layouts] Adds missing Font::SPACING_* to the Label, LineEdit, TextEdit, TextLine and TextParagraph.

Fixes oversized editor control height (default editor spacing is negative) and control size changing when text is set.

5 files changed, 67 insertions, 38 deletions

diff --git a/scene/resources/font.cpp b/scene/resources/font.cpp
index da35137a09..f88082c665 100644
--- a/scene/resources/font.cpp
+++ b/scene/resources/font.cpp
@@ -595,41 +595,41 @@ Dictionary Font::get_feature_list() const {
 float Font::get_height(int p_size) const {
 	float ret = 0.f;
 	for (int i = 0; i < data.size(); i++) {
-		ret += data[i]->get_height(p_size);
+		ret = MAX(ret, data[i]->get_height(p_size));
 	}
-	return (ret / data.size()) + spacing_top + spacing_bottom;
+	return ret + spacing_top + spacing_bottom;
 }
 
 float Font::get_ascent(int p_size) const {
 	float ret = 0.f;
 	for (int i = 0; i < data.size(); i++) {
-		ret += data[i]->get_ascent(p_size);
+		ret = MAX(ret, data[i]->get_ascent(p_size));
 	}
-	return (ret / data.size()) + spacing_top;
+	return ret + spacing_top;
 }
 
 float Font::get_descent(int p_size) const {
 	float ret = 0.f;
 	for (int i = 0; i < data.size(); i++) {
-		ret += data[i]->get_descent(p_size);
+		ret = MAX(ret, data[i]->get_descent(p_size));
 	}
-	return (ret / data.size()) + spacing_bottom;
+	return ret + spacing_bottom;
 }
 
 float Font::get_underline_position(int p_size) const {
 	float ret = 0.f;
 	for (int i = 0; i < data.size(); i++) {
-		ret += data[i]->get_underline_position(p_size);
+		ret = MAX(ret, data[i]->get_underline_position(p_size));
 	}
-	return (ret / data.size());
+	return ret;
 }
 
 float Font::get_underline_thickness(int p_size) const {
 	float ret = 0.f;
 	for (int i = 0; i < data.size(); i++) {
-		ret += data[i]->get_underline_thickness(p_size);
+		ret = MAX(ret, data[i]->get_underline_thickness(p_size));
 	}
-	return (ret / data.size());
+	return ret;
 }
 
 int Font::get_spacing(int p_type) const {
diff --git a/scene/resources/text_line.cpp b/scene/resources/text_line.cpp
index 5a419bb232..cc9b6758b6 100644
--- a/scene/resources/text_line.cpp
+++ b/scene/resources/text_line.cpp
@@ -113,6 +113,8 @@ RID TextLine::get_rid() const {
 
 void TextLine::clear() {
 	TS->shaped_text_clear(rid);
+	spacing_top = 0;
+	spacing_bottom = 0;
 }
 
 void TextLine::set_preserve_invalid(bool p_enabled) {
@@ -166,6 +168,8 @@ void TextLine::set_bidi_override(const Vector<Vector2i> &p_override) {
 
 bool TextLine::add_string(const String &p_text, const Ref<Font> &p_fonts, int p_size, const Dictionary &p_opentype_features, const String &p_language) {
 	bool res = TS->shaped_text_add_string(rid, p_text, p_fonts->get_rids(), p_size, p_opentype_features, p_language);
+	spacing_top = p_fonts->get_spacing(Font::SPACING_TOP);
+	spacing_bottom = p_fonts->get_spacing(Font::SPACING_BOTTOM);
 	dirty = true;
 	return res;
 }
@@ -233,17 +237,21 @@ float TextLine::get_width() const {
 
 Size2 TextLine::get_size() const {
 	const_cast<TextLine *>(this)->_shape();
-	return TS->shaped_text_get_size(rid);
+	if (TS->shaped_text_get_orientation(rid) == TextServer::ORIENTATION_HORIZONTAL) {
+		return Size2(TS->shaped_text_get_size(rid).x, TS->shaped_text_get_size(rid).y + spacing_top + spacing_bottom);
+	} else {
+		return Size2(TS->shaped_text_get_size(rid).x + spacing_top + spacing_bottom, TS->shaped_text_get_size(rid).y);
+	}
 }
 
 float TextLine::get_line_ascent() const {
 	const_cast<TextLine *>(this)->_shape();
-	return TS->shaped_text_get_ascent(rid);
+	return TS->shaped_text_get_ascent(rid) + spacing_top;
 }
 
 float TextLine::get_line_descent() const {
 	const_cast<TextLine *>(this)->_shape();
-	return TS->shaped_text_get_descent(rid);
+	return TS->shaped_text_get_descent(rid) + spacing_bottom;
 }
 
 float TextLine::get_line_width() const {
@@ -291,10 +299,10 @@ void TextLine::draw(RID p_canvas, const Vector2 &p_pos, const Color &p_color) co
 
 	float clip_l;
 	if (TS->shaped_text_get_orientation(rid) == TextServer::ORIENTATION_HORIZONTAL) {
-		ofs.y += TS->shaped_text_get_ascent(rid);
+		ofs.y += TS->shaped_text_get_ascent(rid) + spacing_top;
 		clip_l = MAX(0, p_pos.x - ofs.x);
 	} else {
-		ofs.x += TS->shaped_text_get_ascent(rid);
+		ofs.x += TS->shaped_text_get_ascent(rid) + spacing_top;
 		clip_l = MAX(0, p_pos.y - ofs.y);
 	}
 	return TS->shaped_text_draw(rid, p_canvas, ofs, clip_l, clip_l + width, p_color);
@@ -330,10 +338,10 @@ void TextLine::draw_outline(RID p_canvas, const Vector2 &p_pos, int p_outline_si
 
 	float clip_l;
 	if (TS->shaped_text_get_orientation(rid) == TextServer::ORIENTATION_HORIZONTAL) {
-		ofs.y += TS->shaped_text_get_ascent(rid);
+		ofs.y += TS->shaped_text_get_ascent(rid) + spacing_top;
 		clip_l = MAX(0, p_pos.x - ofs.x);
 	} else {
-		ofs.x += TS->shaped_text_get_ascent(rid);
+		ofs.x += TS->shaped_text_get_ascent(rid) + spacing_top;
 		clip_l = MAX(0, p_pos.y - ofs.y);
 	}
 	return TS->shaped_text_draw_outline(rid, p_canvas, ofs, clip_l, clip_l + width, p_outline_size, p_color);
@@ -347,6 +355,8 @@ int TextLine::hit_test(float p_coords) const {
 
 TextLine::TextLine(const String &p_text, const Ref<Font> &p_fonts, int p_size, const Dictionary &p_opentype_features, const String &p_language, TextServer::Direction p_direction, TextServer::Orientation p_orientation) {
 	rid = TS->create_shaped_text(p_direction, p_orientation);
+	spacing_top = p_fonts->get_spacing(Font::SPACING_TOP);
+	spacing_bottom = p_fonts->get_spacing(Font::SPACING_BOTTOM);
 	TS->shaped_text_add_string(rid, p_text, p_fonts->get_rids(), p_size, p_opentype_features, p_language);
 }
 
diff --git a/scene/resources/text_line.h b/scene/resources/text_line.h
index ffa06cc5c1..6ed3558bd9 100644
--- a/scene/resources/text_line.h
+++ b/scene/resources/text_line.h
@@ -40,6 +40,8 @@ class TextLine : public Reference {
 	GDCLASS(TextLine, Reference);
 
 	RID rid;
+	int spacing_top = 0;
+	int spacing_bottom = 0;
 
 	bool dirty = true;
 
diff --git a/scene/resources/text_paragraph.cpp b/scene/resources/text_paragraph.cpp
index d4f96ff9e8..fd6dd071eb 100644
--- a/scene/resources/text_paragraph.cpp
+++ b/scene/resources/text_paragraph.cpp
@@ -140,6 +140,8 @@ RID TextParagraph::get_line_rid(int p_line) const {
 }
 
 void TextParagraph::clear() {
+	spacing_top = 0;
+	spacing_bottom = 0;
 	for (int i = 0; i < lines.size(); i++) {
 		TS->free(lines[i]);
 	}
@@ -187,6 +189,8 @@ TextServer::Orientation TextParagraph::get_orientation() const {
 
 bool TextParagraph::add_string(const String &p_text, const Ref<Font> &p_fonts, int p_size, const Dictionary &p_opentype_features, const String &p_language) {
 	bool res = TS->shaped_text_add_string(rid, p_text, p_fonts->get_rids(), p_size, p_opentype_features, p_language);
+	spacing_top = p_fonts->get_spacing(Font::SPACING_TOP);
+	spacing_bottom = p_fonts->get_spacing(Font::SPACING_BOTTOM);
 	dirty_lines = true;
 	return res;
 }
@@ -260,7 +264,11 @@ float TextParagraph::get_width() const {
 
 Size2 TextParagraph::get_non_wraped_size() const {
 	const_cast<TextParagraph *>(this)->_shape_lines();
-	return TS->shaped_text_get_size(rid);
+	if (TS->shaped_text_get_orientation(rid) == TextServer::ORIENTATION_HORIZONTAL) {
+		return Size2(TS->shaped_text_get_size(rid).x, TS->shaped_text_get_size(rid).y + spacing_top + spacing_bottom);
+	} else {
+		return Size2(TS->shaped_text_get_size(rid).x + spacing_top + spacing_bottom, TS->shaped_text_get_size(rid).y);
+	}
 }
 
 Size2 TextParagraph::get_size() const {
@@ -270,9 +278,9 @@ Size2 TextParagraph::get_size() const {
 		Size2 lsize = TS->shaped_text_get_size(lines[i]);
 		if (TS->shaped_text_get_orientation(lines[i]) == TextServer::ORIENTATION_HORIZONTAL) {
 			size.x = MAX(size.x, lsize.x);
-			size.y += lsize.y;
+			size.y += lsize.y + spacing_top + spacing_bottom;
 		} else {
-			size.x += lsize.x;
+			size.x += lsize.x + spacing_top + spacing_bottom;
 			size.y = MAX(size.y, lsize.y);
 		}
 	}
@@ -297,9 +305,9 @@ Rect2 TextParagraph::get_line_object_rect(int p_line, Variant p_key) const {
 	for (int i = 0; i < p_line; i++) {
 		Size2 lsize = TS->shaped_text_get_size(lines[i]);
 		if (TS->shaped_text_get_orientation(lines[i]) == TextServer::ORIENTATION_HORIZONTAL) {
-			xrect.position.y += lsize.y;
+			xrect.position.y += lsize.y + spacing_top + spacing_bottom;
 		} else {
-			xrect.position.x += lsize.x;
+			xrect.position.x += lsize.x + spacing_top + spacing_bottom;
 		}
 	}
 	return xrect;
@@ -308,7 +316,11 @@ Rect2 TextParagraph::get_line_object_rect(int p_line, Variant p_key) const {
 Size2 TextParagraph::get_line_size(int p_line) const {
 	const_cast<TextParagraph *>(this)->_shape_lines();
 	ERR_FAIL_COND_V(p_line < 0 || p_line >= lines.size(), Size2());
-	return TS->shaped_text_get_size(lines[p_line]);
+	if (TS->shaped_text_get_orientation(lines[p_line]) == TextServer::ORIENTATION_HORIZONTAL) {
+		return Size2(TS->shaped_text_get_size(lines[p_line]).x, TS->shaped_text_get_size(lines[p_line]).y + spacing_top + spacing_bottom);
+	} else {
+		return Size2(TS->shaped_text_get_size(lines[p_line]).x + spacing_top + spacing_bottom, TS->shaped_text_get_size(lines[p_line]).y);
+	}
 }
 
 Vector2i TextParagraph::get_line_range(int p_line) const {
@@ -320,13 +332,13 @@ Vector2i TextParagraph::get_line_range(int p_line) const {
 float TextParagraph::get_line_ascent(int p_line) const {
 	const_cast<TextParagraph *>(this)->_shape_lines();
 	ERR_FAIL_COND_V(p_line < 0 || p_line >= lines.size(), 0.f);
-	return TS->shaped_text_get_ascent(lines[p_line]);
+	return TS->shaped_text_get_ascent(lines[p_line]) + spacing_top;
 }
 
 float TextParagraph::get_line_descent(int p_line) const {
 	const_cast<TextParagraph *>(this)->_shape_lines();
 	ERR_FAIL_COND_V(p_line < 0 || p_line >= lines.size(), 0.f);
-	return TS->shaped_text_get_descent(lines[p_line]);
+	return TS->shaped_text_get_descent(lines[p_line]) + spacing_bottom;
 }
 
 float TextParagraph::get_line_width(int p_line) const {
@@ -353,10 +365,10 @@ void TextParagraph::draw(RID p_canvas, const Vector2 &p_pos, const Color &p_colo
 	for (int i = 0; i < lines.size(); i++) {
 		if (TS->shaped_text_get_orientation(lines[i]) == TextServer::ORIENTATION_HORIZONTAL) {
 			ofs.x = p_pos.x;
-			ofs.y += TS->shaped_text_get_ascent(lines[i]);
+			ofs.y += TS->shaped_text_get_ascent(lines[i]) + spacing_top;
 		} else {
 			ofs.y = p_pos.y;
-			ofs.x += TS->shaped_text_get_ascent(lines[i]);
+			ofs.x += TS->shaped_text_get_ascent(lines[i]) + spacing_top;
 		}
 		float length = TS->shaped_text_get_width(lines[i]);
 		if (width > 0) {
@@ -389,10 +401,10 @@ void TextParagraph::draw(RID p_canvas, const Vector2 &p_pos, const Color &p_colo
 		TS->shaped_text_draw(lines[i], p_canvas, ofs, clip_l, clip_l + width, p_color);
 		if (TS->shaped_text_get_orientation(lines[i]) == TextServer::ORIENTATION_HORIZONTAL) {
 			ofs.x = p_pos.x;
-			ofs.y += TS->shaped_text_get_descent(lines[i]);
+			ofs.y += TS->shaped_text_get_descent(lines[i]) + spacing_bottom;
 		} else {
 			ofs.y = p_pos.y;
-			ofs.x += TS->shaped_text_get_descent(lines[i]);
+			ofs.x += TS->shaped_text_get_descent(lines[i]) + spacing_bottom;
 		}
 	}
 }
@@ -403,10 +415,10 @@ void TextParagraph::draw_outline(RID p_canvas, const Vector2 &p_pos, int p_outli
 	for (int i = 0; i < lines.size(); i++) {
 		if (TS->shaped_text_get_orientation(lines[i]) == TextServer::ORIENTATION_HORIZONTAL) {
 			ofs.x = p_pos.x;
-			ofs.y += TS->shaped_text_get_ascent(lines[i]);
+			ofs.y += TS->shaped_text_get_ascent(lines[i]) + spacing_top;
 		} else {
 			ofs.y = p_pos.y;
-			ofs.x += TS->shaped_text_get_ascent(lines[i]);
+			ofs.x += TS->shaped_text_get_ascent(lines[i]) + spacing_top;
 		}
 		float length = TS->shaped_text_get_width(lines[i]);
 		if (width > 0) {
@@ -439,10 +451,10 @@ void TextParagraph::draw_outline(RID p_canvas, const Vector2 &p_pos, int p_outli
 		TS->shaped_text_draw_outline(lines[i], p_canvas, ofs, clip_l, clip_l + width, p_outline_size, p_color);
 		if (TS->shaped_text_get_orientation(lines[i]) == TextServer::ORIENTATION_HORIZONTAL) {
 			ofs.x = p_pos.x;
-			ofs.y += TS->shaped_text_get_descent(lines[i]);
+			ofs.y += TS->shaped_text_get_descent(lines[i]) + spacing_bottom;
 		} else {
 			ofs.y = p_pos.y;
-			ofs.x += TS->shaped_text_get_descent(lines[i]);
+			ofs.x += TS->shaped_text_get_descent(lines[i]) + spacing_bottom;
 		}
 	}
 }
@@ -462,10 +474,12 @@ int TextParagraph::hit_test(const Point2 &p_coords) const {
 			if ((p_coords.y >= ofs.y) && (p_coords.y <= ofs.y + TS->shaped_text_get_size(lines[i]).y)) {
 				return TS->shaped_text_hit_test_position(lines[i], p_coords.x);
 			}
+			ofs.y += TS->shaped_text_get_size(lines[i]).y + spacing_bottom + spacing_top;
 		} else {
 			if ((p_coords.x >= ofs.x) && (p_coords.x <= ofs.x + TS->shaped_text_get_size(lines[i]).x)) {
 				return TS->shaped_text_hit_test_position(lines[i], p_coords.y);
 			}
+			ofs.y += TS->shaped_text_get_size(lines[i]).x + spacing_bottom + spacing_top;
 		}
 	}
 	return TS->shaped_text_get_range(rid).y;
@@ -477,9 +491,9 @@ void TextParagraph::draw_line(RID p_canvas, const Vector2 &p_pos, int p_line, co
 
 	Vector2 ofs = p_pos;
 	if (TS->shaped_text_get_orientation(lines[p_line]) == TextServer::ORIENTATION_HORIZONTAL) {
-		ofs.y += TS->shaped_text_get_ascent(lines[p_line]);
+		ofs.y += TS->shaped_text_get_ascent(lines[p_line]) + spacing_top;
 	} else {
-		ofs.x += TS->shaped_text_get_ascent(lines[p_line]);
+		ofs.x += TS->shaped_text_get_ascent(lines[p_line]) + spacing_top;
 	}
 	return TS->shaped_text_draw(lines[p_line], p_canvas, ofs, -1, -1, p_color);
 }
@@ -490,9 +504,9 @@ void TextParagraph::draw_line_outline(RID p_canvas, const Vector2 &p_pos, int p_
 
 	Vector2 ofs = p_pos;
 	if (TS->shaped_text_get_orientation(lines[p_line]) == TextServer::ORIENTATION_HORIZONTAL) {
-		ofs.y += TS->shaped_text_get_ascent(lines[p_line]);
+		ofs.y += TS->shaped_text_get_ascent(lines[p_line]) + spacing_top;
 	} else {
-		ofs.x += TS->shaped_text_get_ascent(lines[p_line]);
+		ofs.x += TS->shaped_text_get_ascent(lines[p_line]) + spacing_top;
 	}
 	return TS->shaped_text_draw_outline(lines[p_line], p_canvas, ofs, -1, -1, p_outline_size, p_color);
 }
@@ -500,8 +514,9 @@ void TextParagraph::draw_line_outline(RID p_canvas, const Vector2 &p_pos, int p_
 TextParagraph::TextParagraph(const String &p_text, const Ref<Font> &p_fonts, int p_size, const Dictionary &p_opentype_features, const String &p_language, float p_width, TextServer::Direction p_direction, TextServer::Orientation p_orientation) {
 	rid = TS->create_shaped_text(p_direction, p_orientation);
 	TS->shaped_text_add_string(rid, p_text, p_fonts->get_rids(), p_size, p_opentype_features, p_language);
+	spacing_top = p_fonts->get_spacing(Font::SPACING_TOP);
+	spacing_bottom = p_fonts->get_spacing(Font::SPACING_BOTTOM);
 	width = p_width;
-	dirty_lines = true;
 }
 
 TextParagraph::TextParagraph() {
diff --git a/scene/resources/text_paragraph.h b/scene/resources/text_paragraph.h
index 587bb6bfc1..f7f49e9058 100644
--- a/scene/resources/text_paragraph.h
+++ b/scene/resources/text_paragraph.h
@@ -41,6 +41,8 @@ class TextParagraph : public Reference {
 
 	RID rid;
 	Vector<RID> lines;
+	int spacing_top = 0;
+	int spacing_bottom = 0;
 
 	bool dirty_lines = true;