Refactor Font configuration and import UI, and Font resources.

2 files changed, 20 insertions, 20 deletions

diff --git a/servers/text/text_server_extension.cpp b/servers/text/text_server_extension.cpp
index e9a558ac5f..68959819c9 100644
--- a/servers/text/text_server_extension.cpp
+++ b/servers/text/text_server_extension.cpp
@@ -127,9 +127,6 @@ void TextServerExtension::_bind_methods() {
 	GDVIRTUAL_BIND(font_set_scale, "font_rid", "size", "scale");
 	GDVIRTUAL_BIND(font_get_scale, "font_rid", "size");
 
-	GDVIRTUAL_BIND(font_set_spacing, "font_rid", "size", "spacing", "value");
-	GDVIRTUAL_BIND(font_get_spacing, "font_rid", "size", "spacing");
-
 	GDVIRTUAL_BIND(font_get_texture_count, "font_rid", "size");
 	GDVIRTUAL_BIND(font_clear_textures, "font_rid", "size");
 	GDVIRTUAL_BIND(font_remove_texture, "font_rid", "size", "texture_index");
@@ -230,6 +227,9 @@ void TextServerExtension::_bind_methods() {
 	GDVIRTUAL_BIND(shaped_text_set_preserve_control, "shaped", "enabled");
 	GDVIRTUAL_BIND(shaped_text_get_preserve_control, "shaped");
 
+	GDVIRTUAL_BIND(shaped_text_set_spacing, "shaped", "spacing", "value");
+	GDVIRTUAL_BIND(shaped_text_get_spacing, "shaped", "spacing");
+
 	GDVIRTUAL_BIND(shaped_text_add_string, "shaped", "text", "fonts", "size", "opentype_features", "language", "meta");
 	GDVIRTUAL_BIND(shaped_text_add_object, "shaped", "key", "size", "inline_align", "length");
 	GDVIRTUAL_BIND(shaped_text_resize_object, "shaped", "key", "size", "inline_align");
@@ -706,18 +706,6 @@ double TextServerExtension::font_get_scale(const RID &p_font_rid, int64_t p_size
 	return 0.0;
 }
 
-void TextServerExtension::font_set_spacing(const RID &p_font_rid, int64_t p_size, TextServer::SpacingType p_spacing, int64_t p_value) {
-	GDVIRTUAL_CALL(font_set_spacing, p_font_rid, p_size, p_spacing, p_value);
-}
-
-int64_t TextServerExtension::font_get_spacing(const RID &p_font_rid, int64_t p_size, TextServer::SpacingType p_spacing) const {
-	int64_t ret;
-	if (GDVIRTUAL_CALL(font_get_spacing, p_font_rid, p_size, p_spacing, ret)) {
-		return ret;
-	}
-	return 0;
-}
-
 int64_t TextServerExtension::font_get_texture_count(const RID &p_font_rid, const Vector2i &p_size) const {
 	int64_t ret;
 	if (GDVIRTUAL_CALL(font_get_texture_count, p_font_rid, p_size, ret)) {
@@ -1132,6 +1120,18 @@ bool TextServerExtension::shaped_text_get_preserve_control(const RID &p_shaped)
 	return false;
 }
 
+void TextServerExtension::shaped_text_set_spacing(const RID &p_shaped, TextServer::SpacingType p_spacing, int64_t p_value) {
+	GDVIRTUAL_CALL(shaped_text_set_spacing, p_shaped, p_spacing, p_value);
+}
+
+int64_t TextServerExtension::shaped_text_get_spacing(const RID &p_shaped, TextServer::SpacingType p_spacing) const {
+	int64_t ret;
+	if (GDVIRTUAL_CALL(shaped_text_get_spacing, p_shaped, p_spacing, ret)) {
+		return ret;
+	}
+	return 0;
+}
+
 bool TextServerExtension::shaped_text_add_string(const RID &p_shaped, const String &p_text, const Array &p_fonts, int64_t p_size, const Dictionary &p_opentype_features, const String &p_language, const Variant &p_meta) {
 	bool ret;
 	if (GDVIRTUAL_CALL(shaped_text_add_string, p_shaped, p_text, p_fonts, p_size, p_opentype_features, p_language, p_meta, ret)) {
diff --git a/servers/text/text_server_extension.h b/servers/text/text_server_extension.h
index 9ca0939247..d948a97c66 100644
--- a/servers/text/text_server_extension.h
+++ b/servers/text/text_server_extension.h
@@ -204,11 +204,6 @@ public:
 	GDVIRTUAL3(font_set_scale, RID, int64_t, double);
 	GDVIRTUAL2RC(double, font_get_scale, RID, int64_t);
 
-	virtual void font_set_spacing(const RID &p_font_rid, int64_t p_size, SpacingType p_spacing, int64_t p_value) override;
-	virtual int64_t font_get_spacing(const RID &p_font_rid, int64_t p_size, SpacingType p_spacing) const override;
-	GDVIRTUAL4(font_set_spacing, RID, int64_t, SpacingType, int64_t);
-	GDVIRTUAL3RC(int64_t, font_get_spacing, RID, int64_t, SpacingType);
-
 	virtual int64_t font_get_texture_count(const RID &p_font_rid, const Vector2i &p_size) const override;
 	virtual void font_clear_textures(const RID &p_font_rid, const Vector2i &p_size) override;
 	virtual void font_remove_texture(const RID &p_font_rid, const Vector2i &p_size, int64_t p_texture_index) override;
@@ -377,6 +372,11 @@ public:
 	GDVIRTUAL2(shaped_text_set_preserve_control, RID, bool);
 	GDVIRTUAL1RC(bool, shaped_text_get_preserve_control, RID);
 
+	virtual void shaped_text_set_spacing(const RID &p_shaped, SpacingType p_spacing, int64_t p_value) override;
+	virtual int64_t shaped_text_get_spacing(const RID &p_shaped, SpacingType p_spacing) const override;
+	GDVIRTUAL3(shaped_text_set_spacing, RID, SpacingType, int64_t);
+	GDVIRTUAL2RC(int64_t, shaped_text_get_spacing, RID, SpacingType);
+
 	virtual bool shaped_text_add_string(const RID &p_shaped, const String &p_text, const Array &p_fonts, int64_t p_size, const Dictionary &p_opentype_features = Dictionary(), const String &p_language = "", const Variant &p_meta = Variant()) override;
 	virtual bool shaped_text_add_object(const RID &p_shaped, const Variant &p_key, const Size2 &p_size, InlineAlignment p_inline_align = INLINE_ALIGNMENT_CENTER, int64_t p_length = 1) override;
 	virtual bool shaped_text_resize_object(const RID &p_shaped, const Variant &p_key, const Size2 &p_size, InlineAlignment p_inline_align = INLINE_ALIGNMENT_CENTER) override;