godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +00:00
Code Releases Wiki Activity

Merge pull request #66337 from EricEzaM/sprite-frames

Browse Source 
Ensure control built-in shortcuts are matched exactly & add shortcuts for SpriteFrames editor
This commit is contained in:
Rémi Verschelde
2022-10-13 15:24:39 +02:00
parent 17db8be33c b322b3d649
commit 2ffb609658
12 changed files with 114 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scene/gui/base_button.cpp
View File

@@ -60,7 +60,7 @@ void BaseButton::gui_input(const Ref<InputEvent> &p_event) {
}
Ref<InputEventMouseButton> mouse_button = p_event;
bool ui_accept = p_event->is_action("ui_accept") && !p_event->is_echo();
bool ui_accept = p_event->is_action("ui_accept", true) && !p_event->is_echo();
bool button_masked = mouse_button.is_valid() && (mouse_button_to_mask(mouse_button->get_button_index()) & button_mask) != MouseButton::NONE;
if (button_masked || ui_accept) {