diff options
Diffstat (limited to 'scene/gui/button.h')
| -rw-r--r-- | scene/gui/button.h | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/scene/gui/button.h b/scene/gui/button.h index 2fd3a0cace..38605bd3ef 100644 --- a/scene/gui/button.h +++ b/scene/gui/button.h @@ -34,14 +34,11 @@ @author Juan Linietsky <reduzio@gmail.com> */ - - class Button : public BaseButton { - GDCLASS( Button, BaseButton ); -public: - + GDCLASS(Button, BaseButton); +public: enum TextAlign { ALIGN_LEFT, ALIGN_CENTER, @@ -49,7 +46,6 @@ public: }; private: - bool flat; String text; String xl_text; @@ -57,20 +53,18 @@ private: bool clip_text; TextAlign align; - protected: - virtual Size2 get_minimum_size() const; void _notification(int p_what); static void _bind_methods(); -public: -// +public: + // - void set_text(const String& p_text); + void set_text(const String &p_text); String get_text() const; - void set_icon(const Ref<Texture>& p_icon); + void set_icon(const Ref<Texture> &p_icon); Ref<Texture> get_icon() const; void set_flat(bool p_flat); @@ -82,13 +76,10 @@ public: void set_text_align(TextAlign p_align); TextAlign get_text_align() const; - - Button(const String& p_text=String()); + Button(const String &p_text = String()); ~Button(); - }; - VARIANT_ENUM_CAST(Button::TextAlign); #endif |