From 0c806bfa256fb05fe30f5853e9d2141fbd4ea9df Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 10 Mar 2019 13:30:43 +0100 Subject: [PATCH] WindowServer: Include switcher windows in the window iteration. --- WindowServer/WSWindowManager.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/WindowServer/WSWindowManager.h b/WindowServer/WSWindowManager.h index 0a5a468619..1ec12cbede 100644 --- a/WindowServer/WSWindowManager.h +++ b/WindowServer/WSWindowManager.h @@ -204,7 +204,9 @@ IterationDecision WSWindowManager::for_each_visible_window_from_back_to_front(Ca { if (for_each_visible_window_of_type_from_back_to_front(WSWindowType::Normal, callback) == IterationDecision::Abort) return IterationDecision::Abort; - return for_each_visible_window_of_type_from_back_to_front(WSWindowType::Menu, callback); + if (for_each_visible_window_of_type_from_back_to_front(WSWindowType::Menu, callback) == IterationDecision::Abort) + return IterationDecision::Abort; + return for_each_visible_window_of_type_from_back_to_front(WSWindowType::WindowSwitcher, callback); } template @@ -233,5 +235,7 @@ IterationDecision WSWindowManager::for_each_visible_window_from_front_to_back(Ca { if (for_each_visible_window_of_type_from_front_to_back(WSWindowType::Menu, callback) == IterationDecision::Abort) return IterationDecision::Abort; - return for_each_visible_window_of_type_from_front_to_back(WSWindowType::Normal, callback); + if (for_each_visible_window_of_type_from_front_to_back(WSWindowType::Normal, callback) == IterationDecision::Abort) + return IterationDecision::Abort; + return for_each_visible_window_of_type_from_front_to_back(WSWindowType::WindowSwitcher, callback); }