RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 04:37:34 +00:00
Code Issues Activity Actions

WindowServer: Mouse switching between system menu and app menu was broken.

Browse source
This commit is contained in:
Andreas Kling 2019-04-17 12:06:09 +02:00
parent b77f9a5042
commit 18ef6b111b
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Servers/WindowServer/WSWindowManager.cpp
View file

@ -369,7 +369,7 @@ void WSWindowManager::pick_new_active_window()
void WSWindowManager::handle_menu_mouse_event(WSMenu& menu, const WSMouseEvent& event)
{
bool is_hover_with_any_menu_open = event.type() == WSMouseEvent::MouseMove && m_current_menu && m_current_menu->menubar();
bool is_hover_with_any_menu_open = event.type() == WSMouseEvent::MouseMove && m_current_menu && (m_current_menu->menubar() || m_current_menu == m_system_menu);
bool is_mousedown_with_left_button = event.type() == WSMouseEvent::MouseDown && event.button() == MouseButton::Left;
bool should_open_menu = &menu != current_menu() && (is_hover_with_any_menu_open || is_mousedown_with_left_button);