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 /scene/gui/tree.h | |
parent | dcca8aba4f01dfc55c1d7adb6bef7bee684cf447 (diff) | |
parent | 41a20171eb81a7850dd96ec31da4b40c619538a2 (diff) | |
download | redot-engine-4129c1d140b8c48b64c993fdfa6083e0ec59c8f0.tar.gz |
Merge pull request #55299 from nathanfranke/renames
Diffstat (limited to 'scene/gui/tree.h')
-rw-r--r-- | scene/gui/tree.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/scene/gui/tree.h b/scene/gui/tree.h index d4caec614a..a190567f0f 100644 --- a/scene/gui/tree.h +++ b/scene/gui/tree.h @@ -52,12 +52,6 @@ public: CELL_MODE_CUSTOM, ///< Contains a custom value, show a string, and an edit button }; - enum TextAlign { - ALIGN_LEFT, - ALIGN_CENTER, - ALIGN_RIGHT - }; - private: friend class Tree; @@ -98,7 +92,7 @@ private: Size2i cached_minimum_size; bool cached_minimum_size_dirty = true; - TextAlign text_align = ALIGN_LEFT; + HorizontalAlignment text_alignment = HORIZONTAL_ALIGNMENT_LEFT; Variant meta; String tooltip; @@ -316,8 +310,8 @@ public: void set_tooltip(int p_column, const String &p_tooltip); String get_tooltip(int p_column) const; - void set_text_align(int p_column, TextAlign p_align); - TextAlign get_text_align(int p_column) const; + void set_text_alignment(int p_column, HorizontalAlignment p_alignment); + HorizontalAlignment get_text_alignment(int p_column) const; void set_expand_right(int p_column, bool p_enable); bool get_expand_right(int p_column) const; @@ -359,7 +353,6 @@ public: }; VARIANT_ENUM_CAST(TreeItem::TreeCellMode); -VARIANT_ENUM_CAST(TreeItem::TextAlign); class VBoxContainer; |