WindowServer: Don't close menu when clicking on item with submenu (#5239)

When clicking on a menu item with a submenu, don't close the menu.
Author: https://github.com/DragonAlex98 🔰 Commit: https://github.com/SerenityOS/serenity/commit/885974fc3c8 Pull-request: https://github.com/SerenityOS/serenity/pull/5239
2021-02-07 12:28:42 +01:00 · 2021-02-07 12:28:42 +01:00 · 885974fc3c · 2024-07-18 22:32:54 +09:00
commit 885974fc3c
parent d107cabf5d
1 changed files with 7 additions and 0 deletions
--- a/Userland/Services/WindowServer/MenuManager.cpp
+++ b/Userland/Services/WindowServer/MenuManager.cpp
@ -242,6 +242,13 @@ void MenuManager::handle_mouse_event(MouseEvent& mouse_event)
            }

            if (mouse_event.type() == Event::MouseDown) {
+                for (auto& menu : m_open_menu_stack) {
+                    if (!menu)
+                        continue;
+                    if (!menu->menu_window()->rect().contains(mouse_event.position()))
+                        continue;
+                    return;
+                }
                close_bar();
                topmost_menu->set_window_menu_open(false);
            }