From ef05bb61a0f8d6a77a4049a7c8f7eeccb07c3bc9 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 12 Jan 2020 01:46:13 +0100 Subject: [PATCH] WindowServer: Don't show system menu on Logo KeyUp during move/resize --- Servers/WindowServer/WSWindowManager.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Servers/WindowServer/WSWindowManager.cpp b/Servers/WindowServer/WSWindowManager.cpp index e4ae251e50..e60efbeb49 100644 --- a/Servers/WindowServer/WSWindowManager.cpp +++ b/Servers/WindowServer/WSWindowManager.cpp @@ -940,7 +940,11 @@ void WSWindowManager::event(CEvent& event) return; } - if (key_event.type() == WSEvent::KeyUp && key_event.key() == Key_Logo && !m_switcher.is_visible()) { + if (key_event.type() == WSEvent::KeyUp + && key_event.key() == Key_Logo + && !m_switcher.is_visible() + && !m_move_window + && !m_resize_window) { WSMenuManager::the().open_menu(WSMenuManager::the().system_menu()); return; }