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

WindowServer: Toggling desktop should only toggle current desktop

Browse source 
We should only show/hide the windows on the current virtual desktop.
This commit is contained in:
Tom 2021-07-04 11:06:39 -06:00 • committed by Andreas Kling
parent f6cca0b8f0
commit 812ee194b7
1 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Userland/Services/WindowServer/WMClientConnection.cpp
View file

@ -118,8 +118,8 @@ void WMClientConnection::set_window_minimized(i32 client_id, i32 window_id, bool
void WMClientConnection::toggle_show_desktop() void WMClientConnection::toggle_show_desktop()
{ {
bool should_hide = false; bool should_hide = false;
WindowServer::ClientConnection::for_each_client([&should_hide](auto& client) { auto& current_window_stack = WindowManager::the().current_window_stack();
client.for_each_window([&should_hide](Window& window) { current_window_stack.for_each_window([&](auto& window) {
if (window.type() == WindowType::Normal && window.is_minimizable()) { if (window.type() == WindowType::Normal && window.is_minimizable()) {
if (!window.is_hidden() && !window.is_minimized()) { if (!window.is_hidden() && !window.is_minimized()) {
should_hide = true; should_hide = true;
@ -128,10 +128,8 @@ void WMClientConnection::toggle_show_desktop()
} }
return IterationDecision::Continue; return IterationDecision::Continue;
}); });
});
WindowServer::ClientConnection::for_each_client([should_hide](auto& client) { current_window_stack.for_each_window([&](auto& window) {
client.for_each_window([should_hide](Window& window) {
if (window.type() == WindowType::Normal && window.is_minimizable()) { if (window.type() == WindowType::Normal && window.is_minimizable()) {
auto state = window.minimized_state(); auto state = window.minimized_state();
if (state == WindowMinimizedState::None || state == WindowMinimizedState::Hidden) { if (state == WindowMinimizedState::None || state == WindowMinimizedState::Hidden) {
@ -140,7 +138,6 @@ void WMClientConnection::toggle_show_desktop()
} }
return IterationDecision::Continue; return IterationDecision::Continue;
}); });
});
} }
void WMClientConnection::set_event_mask(u32 event_mask) void WMClientConnection::set_event_mask(u32 event_mask)