diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-26 21:38:00 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-26 21:38:00 +0100 |
| commit | 35557e44105688267a9b91ece6e5e883afcd8cf3 (patch) | |
| tree | c80f4899bdc3c1e926ed6eecec2e1b948e2d577f /servers/text/text_server_extension.cpp | |
| parent | 08e198643c999350e287f9ea618767a07ac7fa1a (diff) | |
| parent | bbc77b6d295301f03accacd4f505ee3696891ec3 (diff) | |
Merge pull request #73990 from bruvzg/ts_dext_fix
Fix text server GDExtension build.
Diffstat (limited to 'servers/text/text_server_extension.cpp')
| -rw-r--r-- | servers/text/text_server_extension.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/servers/text/text_server_extension.cpp b/servers/text/text_server_extension.cpp index cbf37f25d6..9a996c07d3 100644 --- a/servers/text/text_server_extension.cpp +++ b/servers/text/text_server_extension.cpp @@ -1041,13 +1041,13 @@ bool TextServerExtension::shaped_text_add_string(const RID &p_shaped, const Stri return ret; } -bool TextServerExtension::shaped_text_add_object(const RID &p_shaped, const Variant &p_key, const Size2 &p_size, InlineAlignment p_inline_align, int64_t p_length, float p_baseline) { +bool TextServerExtension::shaped_text_add_object(const RID &p_shaped, const Variant &p_key, const Size2 &p_size, InlineAlignment p_inline_align, int64_t p_length, double p_baseline) { bool ret = false; GDVIRTUAL_CALL(_shaped_text_add_object, p_shaped, p_key, p_size, p_inline_align, p_length, p_baseline, ret); return ret; } -bool TextServerExtension::shaped_text_resize_object(const RID &p_shaped, const Variant &p_key, const Size2 &p_size, InlineAlignment p_inline_align, float p_baseline) { +bool TextServerExtension::shaped_text_resize_object(const RID &p_shaped, const Variant &p_key, const Size2 &p_size, InlineAlignment p_inline_align, double p_baseline) { bool ret = false; GDVIRTUAL_CALL(_shaped_text_resize_object, p_shaped, p_key, p_size, p_inline_align, p_baseline, ret); return ret; @@ -1379,7 +1379,7 @@ TypedArray<Vector3i> TextServerExtension::parse_structured_text(StructuredTextPa return ret; } -PackedInt32Array TextServerExtension::string_get_word_breaks(const String &p_string, const String &p_language, int p_chars_per_line) const { +PackedInt32Array TextServerExtension::string_get_word_breaks(const String &p_string, const String &p_language, int64_t p_chars_per_line) const { PackedInt32Array ret; GDVIRTUAL_CALL(_string_get_word_breaks, p_string, p_language, p_chars_per_line, ret); return ret; |