RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:07:35 +00:00
Code Issues Activity Actions

WindowManager: Make the Logo key open the system menu

Browse source
This commit is contained in:
Jean-Baptiste Boric 2021-01-26 19:36:09 +01:00 • committed by Andreas Kling
parent c51209a06a
commit 7ee6c66ee9
2 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1087,6 +1087,9 @@ Gfx::IntRect WindowManager::arena_rect_for_type(WindowType type) const
void WindowManager::event(Core::Event& event) void WindowManager::event(Core::Event& event)
{ {
if (static_cast<Event&>(event).is_mouse_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; Window* hovered_window = nullptr;
process_mouse_event(static_cast<MouseEvent&>(event), hovered_window); process_mouse_event(static_cast<MouseEvent&>(event), hovered_window);
set_hovered_window(hovered_window); set_hovered_window(hovered_window);
@ -1116,6 +1119,20 @@ void WindowManager::event(Core::Event& event)
return; return;
} }
if (key_event.type() == Event::KeyDown && key_event.key() == Key_Logo) {
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 (key_event.type() == Event::KeyUp && key_event.key() == Key_Logo) {
if (MenuManager::the().has_open_menu()) {
MenuManager::the().close_everyone();
} else {
MenuManager::the().open_menu(*MenuManager::the().system_menu());
}
return;
}
}
if (MenuManager::the().current_menu()) { if (MenuManager::the().current_menu()) {
MenuManager::the().dispatch_event(event); MenuManager::the().dispatch_event(event);
return; return;

2
Userland/Services/WindowServer/WindowManager.h
View file

@ -353,6 +353,8 @@ private:
String m_dnd_text; String m_dnd_text;
RefPtr<Core::MimeData> m_dnd_mime_data; RefPtr<Core::MimeData> m_dnd_mime_data;
RefPtr<Gfx::Bitmap> m_dnd_bitmap; RefPtr<Gfx::Bitmap> m_dnd_bitmap;
bool m_previous_event_is_key_down_logo { false };
}; };
template<typename Callback> template<typename Callback>