RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-22 22:22:10 +00:00
Code Issues Activity Actions

WindowServer: Do not open system menu after window tiling

Browse source
This commit is contained in:
Shannon Booth 2020-01-15 20:45:29 +13:00 • committed by Andreas Kling
parent bd3b64efb7
commit e455b1095a
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Servers/WindowServer/WSWindowManager.cpp
View file

@ -942,11 +942,14 @@ void WSWindowManager::event(CEvent& event)
return; return;
} }
if (key_event.type() == WSEvent::KeyUp && key_event.key() == Key_Logo) { if (key_event.key() == Key_Logo) {
if (!m_moved_or_resized_since_logo_keydown && !m_switcher.is_visible() && !m_move_window && !m_resize_window) if (key_event.type() == WSEvent::KeyUp) {
WSMenuManager::the().open_menu(WSMenuManager::the().system_menu()); if (!m_moved_or_resized_since_logo_keydown && !m_switcher.is_visible() && !m_move_window && !m_resize_window)
m_moved_or_resized_since_logo_keydown = false; WSMenuManager::the().open_menu(WSMenuManager::the().system_menu());
return; return;
} else if (key_event.type() == WSEvent::KeyDown) {
m_moved_or_resized_since_logo_keydown = false;
}
} }
if (WSMenuManager::the().current_menu()) { if (WSMenuManager::the().current_menu()) {
@ -964,6 +967,7 @@ void WSWindowManager::event(CEvent& event)
if (m_active_window) { if (m_active_window) {
if (key_event.type() == WSEvent::KeyDown && key_event.modifiers() == Mod_Logo) { if (key_event.type() == WSEvent::KeyDown && key_event.modifiers() == Mod_Logo) {
if (key_event.key() == Key_Down) { if (key_event.key() == Key_Down) {
m_moved_or_resized_since_logo_keydown = true;
if (m_active_window->is_resizable() && m_active_window->is_maximized()) { if (m_active_window->is_resizable() && m_active_window->is_maximized()) {
m_active_window->set_maximized(false); m_active_window->set_maximized(false);
return; return;
@ -974,10 +978,12 @@ void WSWindowManager::event(CEvent& event)
} }
if (m_active_window->is_resizable()) { if (m_active_window->is_resizable()) {
if (key_event.key() == Key_Up) { if (key_event.key() == Key_Up) {
m_moved_or_resized_since_logo_keydown = true;
m_active_window->set_maximized(!m_active_window->is_maximized()); m_active_window->set_maximized(!m_active_window->is_maximized());
return; return;
} }
if (key_event.key() == Key_Left) { if (key_event.key() == Key_Left) {
m_moved_or_resized_since_logo_keydown = true;
if (m_active_window->tiled() != WindowTileType::None) { if (m_active_window->tiled() != WindowTileType::None) {
m_active_window->set_tiled(WindowTileType::None); m_active_window->set_tiled(WindowTileType::None);
return; return;
@ -988,6 +994,7 @@ void WSWindowManager::event(CEvent& event)
return; return;
} }
if (key_event.key() == Key_Right) { if (key_event.key() == Key_Right) {
m_moved_or_resized_since_logo_keydown = true;
if (m_active_window->tiled() != WindowTileType::None) { if (m_active_window->tiled() != WindowTileType::None) {
m_active_window->set_tiled(WindowTileType::None); m_active_window->set_tiled(WindowTileType::None);
return; return;