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/resources/text_line.h | |
| parent | 639d72735c2e9bfff013029e3c797a2102797e82 (diff) | |
| parent | b5c96df2771113cd9c5cb24b07b199a08a8ad917 (diff) | |
Merge pull request #62066 from bruvzg/cleanup_ts_enums
Diffstat (limited to 'scene/resources/text_line.h')
| -rw-r--r-- | scene/resources/text_line.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/scene/resources/text_line.h b/scene/resources/text_line.h index c5762db0f2..784ee8ef26 100644 --- a/scene/resources/text_line.h +++ b/scene/resources/text_line.h @@ -39,15 +39,6 @@ class TextLine : public RefCounted { GDCLASS(TextLine, RefCounted); -public: - enum OverrunBehavior { - OVERRUN_NO_TRIMMING, - OVERRUN_TRIM_CHAR, - OVERRUN_TRIM_WORD, - OVERRUN_TRIM_ELLIPSIS, - OVERRUN_TRIM_WORD_ELLIPSIS, - }; - private: RID rid; int spacing_top = 0; @@ -58,7 +49,7 @@ private: float width = -1.0; uint16_t flags = TextServer::JUSTIFICATION_WORD_BOUND | TextServer::JUSTIFICATION_KASHIDA; HorizontalAlignment alignment = HORIZONTAL_ALIGNMENT_LEFT; - OverrunBehavior overrun_behavior = OVERRUN_TRIM_ELLIPSIS; + TextServer::OverrunBehavior overrun_behavior = TextServer::OVERRUN_TRIM_ELLIPSIS; Vector<float> tab_stops; @@ -98,8 +89,8 @@ public: void set_flags(uint16_t p_flags); uint16_t get_flags() const; - void set_text_overrun_behavior(OverrunBehavior p_behavior); - OverrunBehavior get_text_overrun_behavior() const; + void set_text_overrun_behavior(TextServer::OverrunBehavior p_behavior); + TextServer::OverrunBehavior get_text_overrun_behavior() const; void set_width(float p_width); float get_width() const; @@ -125,6 +116,4 @@ public: ~TextLine(); }; -VARIANT_ENUM_CAST(TextLine::OverrunBehavior); - #endif // TEXT_LINE_H |