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

Merge pull request #29717 from akien-mga/button-shortcut-pressed

Browse Source 
BaseButton: Make shortcuts call virtual methods
This commit is contained in:
Rémi Verschelde 2019-06-12 22:46:12 +02:00 committed by GitHub
commit 2dc3347ce9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scene/gui/base_button.cpp
View File

@ -216,9 +216,7 @@ void BaseButton::set_pressed(bool p_pressed) {
if (p_pressed) {
_unpress_group();
}
if (toggle_mode) {
_toggled(status.pressed);
}
_toggled(status.pressed);
update();
}
@ -337,9 +335,6 @@ bool BaseButton::is_keep_pressed_outside() const {
void BaseButton::set_shortcut(const Ref<ShortCut> &p_shortcut) {
if (shortcut.is_null() == p_shortcut.is_null())
return;
shortcut = p_shortcut;
set_process_unhandled_input(shortcut.is_valid());
}
@ -356,11 +351,10 @@ void BaseButton::_unhandled_input(Ref<InputEvent> p_event) {
return; //ignore because of modal window
if (is_toggle_mode()) {
set_pressed(!is_pressed());
emit_signal("toggled", is_pressed());
set_pressed(!is_pressed()); // Also calls _toggled() internally.
}
emit_signal("pressed");
_pressed();
}
}