diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-08-11 07:51:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-11 07:51:57 +0200 |
| commit | 2c88e1c15df283be9b67affa24b533f5858bc913 (patch) | |
| tree | 9d254e070a7cae360c86d0f51be81eb568685f72 /modules/gdnative/text | |
| parent | 588883eb4a34af10f06d2375ff1fac564058bfb4 (diff) | |
| parent | 403f4902d02e70eebb684a199a8e2f14d4534ac0 (diff) | |
Merge pull request #51178 from Geometror/layout-options-textline-textparagraph
Various text layout improvements (TextLine, TextParagraph, Label, TextServer)
Diffstat (limited to 'modules/gdnative/text')
| -rw-r--r-- | modules/gdnative/text/text_server_gdnative.cpp | 4 | ||||
| -rw-r--r-- | modules/gdnative/text/text_server_gdnative.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/gdnative/text/text_server_gdnative.cpp b/modules/gdnative/text/text_server_gdnative.cpp index d54b1a47df..3ed3f5449e 100644 --- a/modules/gdnative/text/text_server_gdnative.cpp +++ b/modules/gdnative/text/text_server_gdnative.cpp @@ -498,9 +498,9 @@ bool TextServerGDNative::shaped_text_update_justification_ops(RID p_shaped) { return interface->shaped_text_update_justification_ops(data, (godot_rid *)&p_shaped); } -void TextServerGDNative::shaped_text_overrun_trim_to_width(RID p_shaped_line, float p_width, uint8_t p_clip_flags) { +void TextServerGDNative::shaped_text_overrun_trim_to_width(RID p_shaped_line, float p_width, uint8_t p_trim_flags) { ERR_FAIL_COND(interface == nullptr); - interface->shaped_text_overrun_trim_to_width(data, (godot_rid *)&p_shaped_line, p_width, p_clip_flags); + interface->shaped_text_overrun_trim_to_width(data, (godot_rid *)&p_shaped_line, p_width, p_trim_flags); }; bool TextServerGDNative::shaped_text_is_ready(RID p_shaped) const { diff --git a/modules/gdnative/text/text_server_gdnative.h b/modules/gdnative/text/text_server_gdnative.h index a2eb944499..e1b36f4264 100644 --- a/modules/gdnative/text/text_server_gdnative.h +++ b/modules/gdnative/text/text_server_gdnative.h @@ -167,7 +167,7 @@ public: virtual bool shaped_text_update_breaks(RID p_shaped) override; virtual bool shaped_text_update_justification_ops(RID p_shaped) override; - virtual void shaped_text_overrun_trim_to_width(RID p_shaped, float p_width, uint8_t p_clip_flags) override; + virtual void shaped_text_overrun_trim_to_width(RID p_shaped, float p_width, uint8_t p_trim_flags) override; virtual bool shaped_text_is_ready(RID p_shaped) const override; |