asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix inconsistent toggle button behavior

Browse source
This commit is contained in:
Matthias Hoelzl 2017-08-28 16:04:19 +02:00
parent 5653477a30
commit 1bafc3c6cf
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scene/gui/base_button.cpp
View file

@ -87,14 +87,14 @@ void BaseButton::_gui_input(Ref<InputEvent> p_event) {
status.pressed = !status.pressed; status.pressed = !status.pressed;
pressed(); pressed();
if (get_script_instance()) {
Variant::CallError ce;
get_script_instance()->call(SceneStringNames::get_singleton()->_pressed, NULL, 0, ce);
}
emit_signal("pressed"); emit_signal("pressed");
_unpress_group(); _unpress_group();
toggled(status.pressed); toggled(status.pressed);
if (get_script_instance()) {
get_script_instance()->call(SceneStringNames::get_singleton()->_toggled, status.pressed);
}
emit_signal("toggled", status.pressed); emit_signal("toggled", status.pressed);
} }
@ -143,10 +143,10 @@ void BaseButton::_gui_input(Ref<InputEvent> p_event) {
emit_signal("pressed"); emit_signal("pressed");
toggled(status.pressed); toggled(status.pressed);
emit_signal("toggled", status.pressed);
if (get_script_instance()) { if (get_script_instance()) {
get_script_instance()->call(SceneStringNames::get_singleton()->_toggled, status.pressed); get_script_instance()->call(SceneStringNames::get_singleton()->_toggled, status.pressed);
} }
emit_signal("toggled", status.pressed);
} }
_unpress_group(); _unpress_group();