Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-03 01:19:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix shortcut input handling in BaseButton.

Browse Source
This commit is contained in:
Relintai 2023-09-07 14:11:17 +02:00
parent ccb6074ca9
commit e3998417e7
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scene/gui/base_button.cpp
View File

@ -30,8 +30,8 @@
#include "base_button.h" #include "base_button.h"
#include "core/os/keyboard.h"
#include "core/input/shortcut.h" #include "core/input/shortcut.h"
#include "core/os/keyboard.h"
#include "scene/main/viewport.h" #include "scene/main/viewport.h"
#include "scene/scene_string_names.h" #include "scene/scene_string_names.h"
@ -352,13 +352,25 @@ Ref<ShortCut> BaseButton::get_shortcut() const {
void BaseButton::_shortcut_input(Ref<InputEvent> p_event) { void BaseButton::_shortcut_input(Ref<InputEvent> p_event) {
ERR_FAIL_COND(p_event.is_null()); ERR_FAIL_COND(p_event.is_null());
if (!is_disabled() && is_visible_in_tree() && !p_event->is_echo() && shortcut.is_valid() && shortcut->is_shortcut(p_event)) { if (!is_disabled() && p_event->is_pressed() && is_visible_in_tree() && !p_event->is_echo() && shortcut.is_valid() && shortcut->is_shortcut(p_event)) {
if (get_viewport()->get_modal_stack_top() && !get_viewport()->get_modal_stack_top()->is_a_parent_of(this)) { if (toggle_mode) {
return; //ignore because of modal window status.pressed = !status.pressed;
_unpress_group();
if (button_group.is_valid()) {
button_group->emit_signal("pressed", this);
}
_toggled(status.pressed);
_pressed();
} else {
_pressed();
} }
on_action_event(p_event); accept_event();
get_tree()->set_input_as_handled();
update();
} }
} }
@ -463,10 +475,10 @@ BaseButton::BaseButton() {
status.hovering = false; status.hovering = false;
status.pressing_inside = false; status.pressing_inside = false;
status.disabled = false; status.disabled = false;
set_focus_mode(FOCUS_ALL);
enabled_focus_mode = FOCUS_ALL; enabled_focus_mode = FOCUS_ALL;
action_mode = ACTION_MODE_BUTTON_RELEASE; action_mode = ACTION_MODE_BUTTON_RELEASE;
button_mask = BUTTON_MASK_LEFT; button_mask = BUTTON_MASK_LEFT;
set_focus_mode(FOCUS_ALL);
} }
BaseButton::~BaseButton() { BaseButton::~BaseButton() {