diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-06-16 16:52:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-16 16:52:48 +0200 |
| commit | 2aec92412f39367d2e720544530963707522e510 (patch) | |
| tree | da7986667a303752dae3ba1471910442a5ce3984 /scene/3d/label_3d.h | |
| parent | 639d72735c2e9bfff013029e3c797a2102797e82 (diff) | |
| parent | b5c96df2771113cd9c5cb24b07b199a08a8ad917 (diff) | |
Merge pull request #62066 from bruvzg/cleanup_ts_enums
Diffstat (limited to 'scene/3d/label_3d.h')
| -rw-r--r-- | scene/3d/label_3d.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/scene/3d/label_3d.h b/scene/3d/label_3d.h index 62f4c3fe96..7766bca068 100644 --- a/scene/3d/label_3d.h +++ b/scene/3d/label_3d.h @@ -54,13 +54,6 @@ public: ALPHA_CUT_OPAQUE_PREPASS }; - enum AutowrapMode { - AUTOWRAP_OFF, - AUTOWRAP_ARBITRARY, - AUTOWRAP_WORD, - AUTOWRAP_WORD_SMART - }; - private: real_t pixel_size = 0.01; bool flags[FLAG_MAX] = {}; @@ -91,7 +84,7 @@ private: String xl_text; bool uppercase = false; - AutowrapMode autowrap_mode = AUTOWRAP_OFF; + TextServer::AutowrapMode autowrap_mode = TextServer::AUTOWRAP_OFF; float width = 500.0; int font_size = 16; @@ -200,8 +193,8 @@ public: void set_outline_modulate(const Color &p_color); Color get_outline_modulate() const; - void set_autowrap_mode(AutowrapMode p_mode); - AutowrapMode get_autowrap_mode() const; + void set_autowrap_mode(TextServer::AutowrapMode p_mode); + TextServer::AutowrapMode get_autowrap_mode() const; void set_width(float p_width); float get_width() const; @@ -234,7 +227,6 @@ public: ~Label3D(); }; -VARIANT_ENUM_CAST(Label3D::AutowrapMode); VARIANT_ENUM_CAST(Label3D::DrawFlags); VARIANT_ENUM_CAST(Label3D::AlphaCutMode); |