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

Fix a special case for button masks 

In certain situations it is possible that in a `Viewport` the same
mouse button is pressed twice in series without releasing it in
between.
In this case, focus stealing should happen to ensure, that the
mouse button is not sent unintentionally to the previously focused
Control node.
This commit is contained in:
Markus Sauermann 2024-03-26 22:20:02 +01:00
parent 7d151c8381
commit 48ea019322
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scene/main/viewport.cpp
View File

@ -1705,9 +1705,10 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
Point2 mpos = mb->get_position(); Point2 mpos = mb->get_position();
if (mb->is_pressed()) { if (mb->is_pressed()) {
if (!gui.mouse_focus_mask.is_empty()) { MouseButtonMask button_mask = mouse_button_to_mask(mb->get_button_index());
// Do not steal mouse focus and stuff while a focus mask exists. if (!gui.mouse_focus_mask.is_empty() && !gui.mouse_focus_mask.has_flag(button_mask)) {
gui.mouse_focus_mask.set_flag(mouse_button_to_mask(mb->get_button_index())); // Do not steal mouse focus and stuff while a focus mask without the current mouse button exists.
gui.mouse_focus_mask.set_flag(button_mask);
} else { } else {
gui.mouse_focus = gui_find_control(mpos); gui.mouse_focus = gui_find_control(mpos);
gui.last_mouse_focus = gui.mouse_focus; gui.last_mouse_focus = gui.mouse_focus;

1
tests/scene/test_code_edit.h
View File

@ -3520,6 +3520,7 @@ TEST_CASE("[SceneTree][CodeEdit] completion") {
/* Single click selects. */ /* Single click selects. */
caret_pos.y += code_edit->get_line_height() * 2; caret_pos.y += code_edit->get_line_height() * 2;
SEND_GUI_MOUSE_BUTTON_EVENT(caret_pos, MouseButton::LEFT, MouseButtonMask::LEFT, Key::NONE); SEND_GUI_MOUSE_BUTTON_EVENT(caret_pos, MouseButton::LEFT, MouseButtonMask::LEFT, Key::NONE);
SEND_GUI_MOUSE_BUTTON_RELEASED_EVENT(caret_pos, MouseButton::LEFT, MouseButtonMask::NONE, Key::NONE);
CHECK(code_edit->get_code_completion_selected_index() == 2); CHECK(code_edit->get_code_completion_selected_index() == 2);
/* Double click inserts. */ /* Double click inserts. */