seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add button_down and button_up signals

Browse Source
This commit is contained in:
George Marques
2016-06-17 20:21:14 -03:00
parent ec49f41e19
commit 8a1b1ab6d6
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scene/gui/base_button.cpp
View File

@ -55,6 +55,8 @@ void BaseButton::_input_event(InputEvent p_event) {
if (b.pressed) { if (b.pressed) {
emit_signal("button_down");
if (!toggle_mode) { //mouse press attempt if (!toggle_mode) { //mouse press attempt
status.press_attempt=true; status.press_attempt=true;
@ -86,6 +88,8 @@ void BaseButton::_input_event(InputEvent p_event) {
} else { } else {
emit_signal("button_up");
if (status.press_attempt && status.pressing_inside) { if (status.press_attempt && status.pressing_inside) {
// released(); // released();
emit_signal("released"); emit_signal("released");
@ -100,9 +104,11 @@ void BaseButton::_input_event(InputEvent p_event) {
status.press_attempt=true; status.press_attempt=true;
status.pressing_inside=true; status.pressing_inside=true;
emit_signal("button_down");
} else { } else {
emit_signal("button_up");
if (status.press_attempt &&status.pressing_inside) { if (status.press_attempt &&status.pressing_inside) {
@ -173,6 +179,7 @@ void BaseButton::_input_event(InputEvent p_event) {
status.pressing_button++; status.pressing_button++;
status.press_attempt=true; status.press_attempt=true;
status.pressing_inside=true; status.pressing_inside=true;
emit_signal("button_down");
} else if (status.press_attempt) { } else if (status.press_attempt) {
@ -185,6 +192,8 @@ void BaseButton::_input_event(InputEvent p_event) {
status.press_attempt=false; status.press_attempt=false;
status.pressing_inside=false; status.pressing_inside=false;
emit_signal("button_up");
if (!toggle_mode) { //mouse press attempt if (!toggle_mode) { //mouse press attempt
pressed(); pressed();
@ -467,6 +476,8 @@ void BaseButton::_bind_methods() {
ADD_SIGNAL( MethodInfo("pressed" ) ); ADD_SIGNAL( MethodInfo("pressed" ) );
ADD_SIGNAL( MethodInfo("released" ) ); ADD_SIGNAL( MethodInfo("released" ) );
ADD_SIGNAL( MethodInfo("button_up") );
ADD_SIGNAL( MethodInfo("button_down") );
ADD_SIGNAL( MethodInfo("toggled", PropertyInfo( Variant::BOOL,"pressed") ) ); ADD_SIGNAL( MethodInfo("toggled", PropertyInfo( Variant::BOOL,"pressed") ) );
ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "disabled"), _SCS("set_disabled"), _SCS("is_disabled")); ADD_PROPERTYNZ( 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, "toggle_mode"), _SCS("set_toggle_mode"), _SCS("is_toggle_mode"));