diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-12-09 10:22:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-09 10:22:24 +0100 |
| commit | 4129c1d140b8c48b64c993fdfa6083e0ec59c8f0 (patch) | |
| tree | 64fa9af1dc2f924c9e3ea7c0cdc65e84b1d2ebfb /servers/text/text_server_extension.h | |
| parent | dcca8aba4f01dfc55c1d7adb6bef7bee684cf447 (diff) | |
| parent | 41a20171eb81a7850dd96ec31da4b40c619538a2 (diff) | |
Merge pull request #55299 from nathanfranke/renames
Diffstat (limited to 'servers/text/text_server_extension.h')
| -rw-r--r-- | servers/text/text_server_extension.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/servers/text/text_server_extension.h b/servers/text/text_server_extension.h index a2dbd25e05..91d1a6b97e 100644 --- a/servers/text/text_server_extension.h +++ b/servers/text/text_server_extension.h @@ -337,11 +337,11 @@ public: GDVIRTUAL1RC(bool, _shaped_text_get_preserve_control, RID); virtual bool shaped_text_add_string(RID p_shaped, const String &p_text, const Vector<RID> &p_fonts, int p_size, const Dictionary &p_opentype_features = Dictionary(), const String &p_language = "") override; - virtual bool shaped_text_add_object(RID p_shaped, Variant p_key, const Size2 &p_size, InlineAlign p_inline_align = INLINE_ALIGN_CENTER, int p_length = 1) override; - virtual bool shaped_text_resize_object(RID p_shaped, Variant p_key, const Size2 &p_size, InlineAlign p_inline_align = INLINE_ALIGN_CENTER) override; + virtual bool shaped_text_add_object(RID p_shaped, Variant p_key, const Size2 &p_size, InlineAlignment p_inline_align = INLINE_ALIGNMENT_CENTER, int p_length = 1) override; + virtual bool shaped_text_resize_object(RID p_shaped, Variant p_key, const Size2 &p_size, InlineAlignment p_inline_align = INLINE_ALIGNMENT_CENTER) override; GDVIRTUAL6R(bool, _shaped_text_add_string, RID, const String &, const Array &, int, const Dictionary &, const String &); - GDVIRTUAL5R(bool, _shaped_text_add_object, RID, Variant, const Size2 &, InlineAlign, int); - GDVIRTUAL4R(bool, _shaped_text_resize_object, RID, Variant, const Size2 &, InlineAlign); + GDVIRTUAL5R(bool, _shaped_text_add_object, RID, Variant, const Size2 &, InlineAlignment, int); + GDVIRTUAL4R(bool, _shaped_text_resize_object, RID, Variant, const Size2 &, InlineAlignment); virtual RID shaped_text_substr(RID p_shaped, int p_start, int p_length) const override; virtual RID shaped_text_get_parent(RID p_shaped) const override; |