asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #67820 from Sauermann/fix-popup-closing-on-mousemove

Browse source 
Fix unwanted popup closing by mouse-move while holding mouse-button down
This commit is contained in:
Rémi Verschelde 2022-11-03 12:07:59 +01:00
commit 90d290f5f5
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
platform/linuxbsd/x11/display_server_x11.cpp
View file

@ -3414,7 +3414,7 @@ bool DisplayServerX11::mouse_process_popups() {
XWindowAttributes root_attrs; XWindowAttributes root_attrs;
XGetWindowAttributes(x11_display, root, &root_attrs); XGetWindowAttributes(x11_display, root, &root_attrs);
Vector2i pos = Vector2i(root_attrs.x + root_x, root_attrs.y + root_y); Vector2i pos = Vector2i(root_attrs.x + root_x, root_attrs.y + root_y);
if ((pos != last_mouse_monitor_pos) || (mask != last_mouse_monitor_mask)) { if (mask != last_mouse_monitor_mask) {
if (((mask & Button1Mask) || (mask & Button2Mask) || (mask & Button3Mask) || (mask & Button4Mask) || (mask & Button5Mask))) { if (((mask & Button1Mask) || (mask & Button2Mask) || (mask & Button3Mask) || (mask & Button4Mask) || (mask & Button5Mask))) {
List<WindowID>::Element *C = nullptr; List<WindowID>::Element *C = nullptr;
List<WindowID>::Element *E = popup_list.back(); List<WindowID>::Element *E = popup_list.back();
@ -3440,7 +3440,6 @@ bool DisplayServerX11::mouse_process_popups() {
} }
} }
last_mouse_monitor_mask = mask; last_mouse_monitor_mask = mask;
last_mouse_monitor_pos = pos;
} }
} }
return closed; return closed;

1
platform/linuxbsd/x11/display_server_x11.h
View file

@ -169,7 +169,6 @@ class DisplayServerX11 : public DisplayServer {
HashMap<WindowID, WindowData> windows; HashMap<WindowID, WindowData> windows;
unsigned int last_mouse_monitor_mask = 0; unsigned int last_mouse_monitor_mask = 0;
Vector2i last_mouse_monitor_pos;
uint64_t time_since_popup = 0; uint64_t time_since_popup = 0;
List<WindowID> popup_list; List<WindowID> popup_list;