RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 09:48:11 +00:00
Code Issues Activity Actions

WindowServer: Remove "system menu" concept from WindowServer

Browse source
This commit is contained in:
Andreas Kling 2021-03-25 23:08:34 +01:00
parent 619a223800
commit 327866520a
9 changed files with 19 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Userland/Services/WindowServer/WindowManager.cpp
View file

@ -1155,9 +1155,6 @@ Gfx::IntRect WindowManager::arena_rect_for_type(WindowType type) const
void WindowManager::event(Core::Event& event)
{
if (static_cast<Event&>(event).is_mouse_event()) {
if (event.type() != Event::MouseMove)
m_previous_event_is_key_down_logo = false;
Window* hovered_window = nullptr;
process_mouse_event(static_cast<MouseEvent&>(event), hovered_window);
set_hovered_window(hovered_window);
@ -1187,20 +1184,6 @@ void WindowManager::event(Core::Event& event)
return;
}
if (key_event.type() == Event::KeyDown && key_event.key() == Key_Super) {
m_previous_event_is_key_down_logo = true;
} else if (m_previous_event_is_key_down_logo) {
m_previous_event_is_key_down_logo = false;
if (!m_dnd_client && key_event.type() == Event::KeyUp && key_event.key() == Key_Super) {
if (MenuManager::the().has_open_menu()) {
MenuManager::the().close_everyone();
} else {
MenuManager::the().open_menu(*MenuManager::the().system_menu(), true);
}
return;
}
}
if (MenuManager::the().current_menu()) {
MenuManager::the().dispatch_event(event);
return;
@ -1371,8 +1354,6 @@ void WindowManager::set_active_window(Window* window, bool make_input)
Core::EventLoop::current().post_event(*m_active_window, make<Event>(Event::WindowActivated));
m_active_window->invalidate(true, true);
tell_wm_listeners_window_state_changed(*m_active_window);
} else {
MenuManager::the().set_current_menubar(nullptr);
}
// Window shapes may have changed (e.g. shadows for inactive/active windows)