diff options
| author | Anton Yabchinskiy | 2015-04-04 09:31:21 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy | 2015-04-04 09:31:21 +0300 |
| commit | 16746f157f83d666079ba3266acec13d35b84c3f (patch) | |
| tree | 8c872d18ccdef90a15e72622cd0139e0e64801a6 /scene/gui/base_button.cpp | |
| parent | 43713810deaadfec6a1656767cf5520073e58a06 (diff) | |
| parent | 5d99e15e43d5a446b35d48e8a3b08a478f1998a9 (diff) | |
| download | godot-16746f157f83d666079ba3266acec13d35b84c3f.tar.gz godot-16746f157f83d666079ba3266acec13d35b84c3f.tar.zst godot-16746f157f83d666079ba3266acec13d35b84c3f.zip | |
Merge branch 'master' of github.com:okamstudio/godot
Diffstat (limited to 'scene/gui/base_button.cpp')
| -rw-r--r-- | scene/gui/base_button.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp index 016768762..bbe15da1c 100644 --- a/scene/gui/base_button.cpp +++ b/scene/gui/base_button.cpp @@ -279,12 +279,12 @@ void BaseButton::set_disabled(bool p_disabled) { set_focus_mode(FOCUS_NONE); else set_focus_mode(FOCUS_ALL); -}; +} bool BaseButton::is_disabled() const { return status.disabled; -}; +} void BaseButton::set_pressed(bool p_pressed) { @@ -391,6 +391,7 @@ void BaseButton::_bind_methods() { ADD_SIGNAL( MethodInfo("toggled", PropertyInfo( Variant::BOOL,"pressed") ) ); ADD_PROPERTY( PropertyInfo( Variant::BOOL, "disabled"), _SCS("set_disabled"), _SCS("is_disabled")); ADD_PROPERTY( PropertyInfo( Variant::BOOL, "toggle_mode"), _SCS("set_toggle_mode"), _SCS("is_toggle_mode")); + ADD_PROPERTY( PropertyInfo( Variant::BOOL, "is_pressed"), _SCS("set_pressed"), _SCS("is_pressed")); ADD_PROPERTY( PropertyInfo( Variant::BOOL, "click_on_press"), _SCS("set_click_on_press"), _SCS("get_click_on_press")); |