From 885974fc3c8616a6325637afdb00cff9a17b1b51 Mon Sep 17 00:00:00 2001 From: DragonAlex98 <37349526+DragonAlex98@users.noreply.github.com> Date: Sun, 7 Feb 2021 12:28:42 +0100 Subject: [PATCH] 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. --- Userland/Services/WindowServer/MenuManager.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Userland/Services/WindowServer/MenuManager.cpp b/Userland/Services/WindowServer/MenuManager.cpp index 8069383abf2..fb985c86098 100644 --- 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); }