noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #114574 from deralmas/monitor_what

Browse Source 
Wayland: Track popup menu mouse mask properly
This commit is contained in:
Rémi Verschelde
2026-01-05 11:45:26 +01:00
parent 7552bbf80d 33a48f1387
commit 1c5bd2d341
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/linuxbsd/wayland/display_server_wayland.cpp
View File

@@ -1766,11 +1766,10 @@ void DisplayServerWayland::process_events() {
Ref<InputEventMouseButton> mb = inputev_msg->event;
bool handled = false;
if (!popup_menu_list.is_empty() && mb.is_valid()) {
// Popup menu handling.
if (mb.is_valid()) {
BitField<MouseButtonMask> mouse_mask = mb->get_button_mask();
if (mouse_mask != last_mouse_monitor_mask && mb->is_pressed()) {
if (!popup_menu_list.is_empty() && mb->is_pressed() && mouse_mask != last_mouse_monitor_mask) {
// Popup menu handling.
List<WindowID>::Element *E = popup_menu_list.back();
List<WindowID>::Element *C = nullptr;