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

WindowServer: Include minimised windows for switching

Browse source
This commit is contained in:
Shannon Booth 2019-12-29 15:06:04 +13:00 • committed by Andreas Kling
parent 24bc674d94
commit d1d7db2745
2 changed files with 25 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Servers/WindowServer/WSWindowManager.h
View file

@ -193,6 +193,8 @@ private:
void for_each_window_listening_to_wm_events(Callback); void for_each_window_listening_to_wm_events(Callback);
template<typename Callback> template<typename Callback>
void for_each_window(Callback); void for_each_window(Callback);
template<typename Callback>
IterationDecision for_each_window_of_type_from_front_to_back(WSWindowType, Callback, bool ignore_highlight = false);
virtual void event(CEvent&) override; virtual void event(CEvent&) override;
void paint_window_frame(const WSWindow&); void paint_window_frame(const WSWindow&);
@ -412,3 +414,22 @@ void WSWindowManager::for_each_window(Callback callback)
return; return;
} }
} }
template<typename Callback>
IterationDecision WSWindowManager::for_each_window_of_type_from_front_to_back(WSWindowType type, Callback callback, bool ignore_highlight)
{
if (!ignore_highlight && m_highlight_window && m_highlight_window->type() == type && m_highlight_window->is_visible()) {
if (callback(*m_highlight_window) == IterationDecision::Break)
return IterationDecision::Break;
}
for (auto* window = m_windows_in_order.tail(); window; window = window->prev()) {
if (window->type() != type)
continue;
if (!ignore_highlight && window == m_highlight_window)
continue;
if (callback(*window) == IterationDecision::Break)
return IterationDecision::Break;
}
return IterationDecision::Continue;
}

6
Servers/WindowServer/WSWindowSwitcher.cpp
View file

@ -47,8 +47,10 @@ void WSWindowSwitcher::on_key_event(const WSKeyEvent& event)
{ {
if (event.type() == WSEvent::KeyUp) { if (event.type() == WSEvent::KeyUp) {
if (event.key() == Key_Logo) { if (event.key() == Key_Logo) {
if (auto* window = selected_window()) if (auto* window = selected_window()) {
window->set_minimized(false);
WSWindowManager::the().move_to_front_and_make_active(*window); WSWindowManager::the().move_to_front_and_make_active(*window);
}
WSWindowManager::the().set_highlight_window(nullptr); WSWindowManager::the().set_highlight_window(nullptr);
hide(); hide();
} }
@ -119,7 +121,7 @@ void WSWindowSwitcher::refresh()
m_selected_index = 0; m_selected_index = 0;
int window_count = 0; int window_count = 0;
int longest_title_width = 0; int longest_title_width = 0;
wm.for_each_visible_window_of_type_from_front_to_back(WSWindowType::Normal, [&](WSWindow& window) { wm.for_each_window_of_type_from_front_to_back(WSWindowType::Normal, [&](WSWindow& window) {
++window_count; ++window_count;
longest_title_width = max(longest_title_width, wm.font().width(window.title())); longest_title_width = max(longest_title_width, wm.font().width(window.title()));
if (selected_window == &window) if (selected_window == &window)