gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-05 17:02:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix BaseButton not emitting signal with virtual function

Browse source 
Fix #29258
This commit is contained in:
volzhs 2019-05-29 06:28:34 +09:00
parent 80f7a19569
commit 5c01e066e1
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
scene/gui/base_button.cpp
View file

@ -76,12 +76,12 @@ void BaseButton::_gui_input(Ref<InputEvent> p_event) {
}
status.pressed = !status.pressed;
_unpress_group();
toggled(status.pressed);
pressed();
_toggled(status.pressed);
_pressed();
}
} else {
if (!p_event->is_pressed()) {
pressed();
_pressed();
}
}
}
@ -159,22 +159,30 @@ void BaseButton::_notification(int p_what) {
}
}
void BaseButton::pressed() {
void BaseButton::_pressed() {
if (get_script_instance()) {
get_script_instance()->call(SceneStringNames::get_singleton()->_pressed);
}
pressed();
emit_signal("pressed");
}
void BaseButton::toggled(bool p_pressed) {
void BaseButton::_toggled(bool p_pressed) {
if (get_script_instance()) {
get_script_instance()->call(SceneStringNames::get_singleton()->_toggled, p_pressed);
}
toggled(p_pressed);
emit_signal("toggled", p_pressed);
}
void BaseButton::pressed() {
}
void BaseButton::toggled(bool p_pressed) {
}
void BaseButton::set_disabled(bool p_disabled) {
if (status.disabled == p_disabled)
return;
@ -209,7 +217,7 @@ void BaseButton::set_pressed(bool p_pressed) {
_unpress_group();
}
if (toggle_mode) {
toggled(status.pressed);
_toggled(status.pressed);
}
update();

2
scene/gui/base_button.h
View file

@ -71,6 +71,8 @@ private:
Ref<ButtonGroup> button_group;
void _unpress_group();
void _pressed();
void _toggled(bool p_pressed);
protected:
virtual void pressed();