WindowServer: Include minimised windows for switching
This commit is contained in:
parent
24bc674d94
commit
d1d7db2745
Notes:
sideshowbarker
2024-07-19 10:33:30 +09:00
Author: https://github.com/shannonbooth Commit: https://github.com/SerenityOS/serenity/commit/d1d7db27459 Pull-request: https://github.com/SerenityOS/serenity/pull/952
2 changed files with 25 additions and 2 deletions
|
@ -193,6 +193,8 @@ private:
|
|||
void for_each_window_listening_to_wm_events(Callback);
|
||||
template<typename 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;
|
||||
void paint_window_frame(const WSWindow&);
|
||||
|
@ -412,3 +414,22 @@ void WSWindowManager::for_each_window(Callback callback)
|
|||
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;
|
||||
}
|
||||
|
|
|
@ -47,8 +47,10 @@ void WSWindowSwitcher::on_key_event(const WSKeyEvent& event)
|
|||
{
|
||||
if (event.type() == WSEvent::KeyUp) {
|
||||
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().set_highlight_window(nullptr);
|
||||
hide();
|
||||
}
|
||||
|
@ -119,7 +121,7 @@ void WSWindowSwitcher::refresh()
|
|||
m_selected_index = 0;
|
||||
int window_count = 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;
|
||||
longest_title_width = max(longest_title_width, wm.font().width(window.title()));
|
||||
if (selected_window == &window)
|
||||
|
|
Loading…
Add table
Reference in a new issue