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/line_edit.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/line_edit.h')
| -rw-r--r-- | scene/gui/line_edit.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/scene/gui/line_edit.h b/scene/gui/line_edit.h index 221dd9eb2e..854e54e8f1 100644 --- a/scene/gui/line_edit.h +++ b/scene/gui/line_edit.h @@ -38,13 +38,6 @@ class LineEdit : public Control { GDCLASS(LineEdit, Control); public: - enum Align { - ALIGN_LEFT, - ALIGN_CENTER, - ALIGN_RIGHT, - ALIGN_FILL - }; - enum MenuItems { MENU_CUT, MENU_COPY, @@ -78,7 +71,7 @@ public: }; private: - Align align = ALIGN_LEFT; + HorizontalAlignment alignment = HORIZONTAL_ALIGNMENT_LEFT; bool editable = false; bool pass = false; @@ -218,8 +211,8 @@ protected: void _validate_property(PropertyInfo &property) const override; public: - void set_align(Align p_align); - Align get_align() const; + void set_horizontal_alignment(HorizontalAlignment p_alignment); + HorizontalAlignment get_horizontal_alignment() const; virtual Variant get_drag_data(const Point2 &p_point) override; virtual bool can_drop_data(const Point2 &p_point, const Variant &p_data) const override; @@ -347,7 +340,6 @@ public: ~LineEdit(); }; -VARIANT_ENUM_CAST(LineEdit::Align); VARIANT_ENUM_CAST(LineEdit::MenuItems); #endif |