summaryrefslogtreecommitdiffstats
path: root/scene/gui/button.h
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-06-04 21:31:29 -0300
committerJuan Linietsky <reduzio@gmail.com>2016-06-04 21:31:47 -0300
commit007efb6a20dcaa9230f1cfdc1cda92db24c5510f (patch)
treedb29be67ba32768ba96037d06c82cb8f1ac7f1c2 /scene/gui/button.h
parent279b7921e8dc8feb44a7650b983f6b3878a01d14 (diff)
downloadredot-engine-007efb6a20dcaa9230f1cfdc1cda92db24c5510f.tar.gz
-customizable shortcuts in editor
-editor settings now save to .tres instead of .xml -buttons can now hold a shortcut
Diffstat (limited to 'scene/gui/button.h')
-rw-r--r--scene/gui/button.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/scene/gui/button.h b/scene/gui/button.h
index 8a17a164a0..c39237c9af 100644
--- a/scene/gui/button.h
+++ b/scene/gui/button.h
@@ -54,7 +54,6 @@ private:
TextAlign align;
-
protected:
virtual Size2 get_minimum_size() const;
@@ -62,6 +61,8 @@ protected:
static void _bind_methods();
public:
//
+
+
void set_text(const String& p_text);
String get_text() const;
@@ -77,6 +78,7 @@ public:
void set_text_align(TextAlign p_align);
TextAlign get_text_align() const;
+
Button(const String& p_text=String());
~Button();