1 files changed, 22 insertions, 20 deletions

diff --git a/scene/resources/text_line.cpp b/scene/resources/text_line.cpp
index d6e7ca3478..f32b7feb4b 100644
--- a/scene/resources/text_line.cpp
+++ b/scene/resources/text_line.cpp
@@ -55,7 +55,7 @@ void TextLine::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_bidi_override", "override"), &TextLine::set_bidi_override);
 
-	ClassDB::bind_method(D_METHOD("add_string", "text", "fonts", "size", "opentype_features", "language", "meta"), &TextLine::add_string, DEFVAL(Dictionary()), DEFVAL(""), DEFVAL(Variant()));
+	ClassDB::bind_method(D_METHOD("add_string", "text", "font", "font_size", "language", "meta"), &TextLine::add_string, DEFVAL(""), DEFVAL(Variant()));
 	ClassDB::bind_method(D_METHOD("add_object", "key", "size", "inline_align", "length"), &TextLine::add_object, DEFVAL(INLINE_ALIGNMENT_CENTER), DEFVAL(1));
 	ClassDB::bind_method(D_METHOD("resize_object", "key", "size", "inline_align"), &TextLine::resize_object, DEFVAL(INLINE_ALIGNMENT_CENTER));
 
@@ -149,8 +149,6 @@ 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) {
@@ -194,11 +192,12 @@ void TextLine::set_bidi_override(const Array &p_override) {
 	dirty = true;
 }
 
-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, const Variant &p_meta) {
-	ERR_FAIL_COND_V(p_fonts.is_null(), false);
-	bool res = TS->shaped_text_add_string(rid, p_text, p_fonts->get_rids(), p_size, p_opentype_features, p_language, p_meta);
-	spacing_top = p_fonts->get_spacing(TextServer::SPACING_TOP);
-	spacing_bottom = p_fonts->get_spacing(TextServer::SPACING_BOTTOM);
+bool TextLine::add_string(const String &p_text, const Ref<Font> &p_font, int p_font_size, const String &p_language, const Variant &p_meta) {
+	ERR_FAIL_COND_V(p_font.is_null(), false);
+	bool res = TS->shaped_text_add_string(rid, p_text, p_font->get_rids(), p_font_size, p_font->get_opentype_features(), p_language, p_meta);
+	for (int i = 0; i < TextServer::SPACING_MAX; i++) {
+		TS->shaped_text_set_spacing(rid, TextServer::SpacingType(i), p_font->get_spacing(TextServer::SpacingType(i)));
+	}
 	dirty = true;
 	return res;
 }
@@ -278,20 +277,20 @@ float TextLine::get_width() const {
 Size2 TextLine::get_size() const {
 	const_cast<TextLine *>(this)->_shape();
 	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);
+		return Size2(TS->shaped_text_get_size(rid).x, TS->shaped_text_get_size(rid).y);
 	} else {
-		return Size2(TS->shaped_text_get_size(rid).x + spacing_top + spacing_bottom, TS->shaped_text_get_size(rid).y);
+		return Size2(TS->shaped_text_get_size(rid).x, 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) + spacing_top;
+	return TS->shaped_text_get_ascent(rid);
 }
 
 float TextLine::get_line_descent() const {
 	const_cast<TextLine *>(this)->_shape();
-	return TS->shaped_text_get_descent(rid) + spacing_bottom;
+	return TS->shaped_text_get_descent(rid);
 }
 
 float TextLine::get_line_width() const {
@@ -347,10 +346,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) + spacing_top;
+		ofs.y += TS->shaped_text_get_ascent(rid);
 		clip_l = MAX(0, p_pos.x - ofs.x);
 	} else {
-		ofs.x += TS->shaped_text_get_ascent(rid) + spacing_top;
+		ofs.x += TS->shaped_text_get_ascent(rid);
 		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);
@@ -394,10 +393,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) + spacing_top;
+		ofs.y += TS->shaped_text_get_ascent(rid);
 		clip_l = MAX(0, p_pos.x - ofs.x);
 	} else {
-		ofs.x += TS->shaped_text_get_ascent(rid) + spacing_top;
+		ofs.x += TS->shaped_text_get_ascent(rid);
 		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);
@@ -409,11 +408,14 @@ int TextLine::hit_test(float p_coords) const {
 	return TS->shaped_text_hit_test_position(rid, p_coords);
 }
 
-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) {
+TextLine::TextLine(const String &p_text, const Ref<Font> &p_font, int p_font_size, 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(TextServer::SPACING_TOP);
-	spacing_bottom = p_fonts->get_spacing(TextServer::SPACING_BOTTOM);
-	TS->shaped_text_add_string(rid, p_text, p_fonts->get_rids(), p_size, p_opentype_features, p_language);
+	if (p_font.is_valid()) {
+		TS->shaped_text_add_string(rid, p_text, p_font->get_rids(), p_font_size, p_font->get_opentype_features(), p_language);
+		for (int i = 0; i < TextServer::SPACING_MAX; i++) {
+			TS->shaped_text_set_spacing(rid, TextServer::SpacingType(i), p_font->get_spacing(TextServer::SpacingType(i)));
+		}
+	}
 }
 
 TextLine::TextLine() {