hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #25190 from 99alfie/master

Browse source 
Fix ButtonGroup.get_pressed_button bug
This commit is contained in:
Rémi Verschelde 2019-01-23 12:30:23 +01:00 • committed by GitHub
commit 51c67a386d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scene/gui/base_button.cpp
View file

@ -82,16 +82,16 @@ void BaseButton::_gui_input(Ref<InputEvent> p_event) {
get_script_instance()->call(SceneStringNames::get_singleton()->_pressed, NULL, 0, ce);
}
emit_signal("pressed");
_unpress_group();
emit_signal("pressed");
} else {
status.pressed = !status.pressed;
pressed();
emit_signal("pressed");
_unpress_group();
emit_signal("pressed");
toggled(status.pressed);
if (get_script_instance()) {
@ -135,6 +135,7 @@ void BaseButton::_gui_input(Ref<InputEvent> p_event) {
get_script_instance()->call(SceneStringNames::get_singleton()->_pressed, NULL, 0, ce);
}
_unpress_group();
emit_signal("pressed");
} else {
@ -142,6 +143,7 @@ void BaseButton::_gui_input(Ref<InputEvent> p_event) {
status.pressed = !status.pressed;
pressed();
_unpress_group();
emit_signal("pressed");
toggled(status.pressed);
@ -150,8 +152,6 @@ void BaseButton::_gui_input(Ref<InputEvent> p_event) {
}
emit_signal("toggled", status.pressed);
}
_unpress_group();
}
status.press_attempt = false;
@ -215,12 +215,14 @@ void BaseButton::_gui_input(Ref<InputEvent> p_event) {
get_script_instance()->call(SceneStringNames::get_singleton()->_pressed, NULL, 0, ce);
}
_unpress_group();
emit_signal("pressed");
} else {
status.pressed = !status.pressed;
pressed();
_unpress_group();
emit_signal("pressed");
toggled(status.pressed);
@ -229,8 +231,6 @@ void BaseButton::_gui_input(Ref<InputEvent> p_event) {
}
emit_signal("toggled", status.pressed);
}
_unpress_group();
}
accept_event();