RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-23 17:47:36 +00:00
Code Issues Activity Actions

WindowServer: Don't close context menus when hovering over menu bar

Browse source
This commit is contained in:
Tom 2021-02-21 20:01:38 -07:00 • committed by Andreas Kling
parent 35363a972a
commit b4c0314f1d
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Services/WindowServer/MenuManager.cpp
View file

@ -291,7 +291,7 @@ void MenuManager::handle_mouse_event(MouseEvent& mouse_event)
void MenuManager::handle_menu_mouse_event(Menu& menu, const MouseEvent& event) void MenuManager::handle_menu_mouse_event(Menu& menu, const MouseEvent& event)
{ {
bool is_hover_with_any_menu_open = event.type() == MouseEvent::MouseMove bool is_hover_with_any_menu_open = event.type() == MouseEvent::MouseMove
&& has_open_menu() && has_open_menu() && m_current_menu_bar_menu
&& (m_open_menu_stack.first()->menubar() || m_open_menu_stack.first() == m_system_menu.ptr()); && (m_open_menu_stack.first()->menubar() || m_open_menu_stack.first() == m_system_menu.ptr());
bool is_mousedown_with_left_button = event.type() == MouseEvent::MouseDown && event.button() == MouseButton::Left; bool is_mousedown_with_left_button = event.type() == MouseEvent::MouseDown && event.button() == MouseButton::Left;
bool should_open_menu = (&menu != m_current_menu || !m_current_menu_bar_menu) && (is_hover_with_any_menu_open || is_mousedown_with_left_button); bool should_open_menu = (&menu != m_current_menu || !m_current_menu_bar_menu) && (is_hover_with_any_menu_open || is_mousedown_with_left_button);
@ -305,7 +305,7 @@ void MenuManager::handle_menu_mouse_event(Menu& menu, const MouseEvent& event)
return; return;
} }
if (!m_bar_open) if (!m_bar_open && m_current_menu_bar_menu)
close_everyone(); close_everyone();
} }