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

Make `mouse_focus` and `mouse_focus_mask` consistent for force_drag 

In `Viewport::_gui_force_drag` currently `Viewport::gui.mouse_focus`
gets cleared, but `Viewport::gui.mouse_focus_mask` doesn't get cleared.

This is an inconsistency which can cause a crash.

With the change of this PR, `mouse_focus_mask` also gets cleared.
This is in alignment with how regular drag and drop clears both variables.
This commit is contained in:
Markus Sauermann 2024-05-02 00:10:29 +02:00
parent 92e726d8dc
commit 30a19a5c2f
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scene/main/viewport.cpp
View File

@ -2318,6 +2318,7 @@ void Viewport::_gui_force_drag(Control *p_base, const Variant &p_data, Control *
gui.dragging = true; gui.dragging = true;
gui.drag_data = p_data; gui.drag_data = p_data;
gui.mouse_focus = nullptr; gui.mouse_focus = nullptr;
gui.mouse_focus_mask.clear();
if (p_control) { if (p_control) {
_gui_set_drag_preview(p_base, p_control); _gui_set_drag_preview(p_base, p_control);