diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-08-09 00:59:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-09 00:59:35 +0200 |
| commit | 2df1765fc28052f25a6a12f3f5c5a974a88b9134 (patch) | |
| tree | 8beebed7d2f3f26c40c5bd5d5905a80acd214dc9 /modules/gdnative/text/text_server_gdnative.cpp | |
| parent | 7fc570b5ac4527e10a394da578f649b1f577b4dc (diff) | |
| parent | 7c3c5603d0a3208d6bee186f50857b15a02419d6 (diff) | |
Merge pull request #49587 from bruvzg/text_server_inline_align
[Text Server] Improve object (image/table) inline alignment.
Diffstat (limited to 'modules/gdnative/text/text_server_gdnative.cpp')
| -rw-r--r-- | modules/gdnative/text/text_server_gdnative.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gdnative/text/text_server_gdnative.cpp b/modules/gdnative/text/text_server_gdnative.cpp index 81dd570bcb..d54b1a47df 100644 --- a/modules/gdnative/text/text_server_gdnative.cpp +++ b/modules/gdnative/text/text_server_gdnative.cpp @@ -449,12 +449,12 @@ bool TextServerGDNative::shaped_text_add_string(RID p_shaped, const String &p_te return interface->shaped_text_add_string(data, (godot_rid *)&p_shaped, (const godot_string *)&p_text, (const godot_rid **)p_fonts.ptr(), p_size, (const godot_dictionary *)&p_opentype_features, (const godot_string *)&p_language); } -bool TextServerGDNative::shaped_text_add_object(RID p_shaped, Variant p_key, const Size2 &p_size, VAlign p_inline_align, int p_length) { +bool TextServerGDNative::shaped_text_add_object(RID p_shaped, Variant p_key, const Size2 &p_size, InlineAlign p_inline_align, int p_length) { ERR_FAIL_COND_V(interface == nullptr, false); return interface->shaped_text_add_object(data, (godot_rid *)&p_shaped, (const godot_variant *)&p_key, (const godot_vector2 *)&p_size, (godot_int)p_inline_align, p_length); } -bool TextServerGDNative::shaped_text_resize_object(RID p_shaped, Variant p_key, const Size2 &p_size, VAlign p_inline_align) { +bool TextServerGDNative::shaped_text_resize_object(RID p_shaped, Variant p_key, const Size2 &p_size, InlineAlign p_inline_align) { ERR_FAIL_COND_V(interface == nullptr, false); return interface->shaped_text_resize_object(data, (godot_rid *)&p_shaped, (const godot_variant *)&p_key, (const godot_vector2 *)&p_size, (godot_int)p_inline_align); } |