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

WindowServer: Rename Window::outer_stack -> Window::window_stack

Browse source 
Also, make it return a reference as aside from only three special
situations (creating, destroying, and moving a window between stacks)
a window should always be on a window stack. Any access during those
brief situations would be a bug, so we should VERIFY this.
This commit is contained in:
Tom 2021-07-02 13:52:23 -06:00 • committed by Andreas Kling
parent 6ec35c91bc
commit 0fcb048448
6 changed files with 46 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Userland/Services/WindowServer/WindowSwitcher.cpp
View file

@ -137,8 +137,8 @@ void WindowSwitcher::select_window_at_index(int index)
VERIFY(highlight_window);
auto& wm = WindowManager::the();
if (m_mode == Mode::ShowAllWindows) {
if (auto* window_stack = highlight_window->outer_stack(); window_stack != &wm.current_window_stack())
wm.switch_to_window_stack(*window_stack, nullptr, false);
if (auto& window_stack = highlight_window->window_stack(); &window_stack != &wm.current_window_stack())
wm.switch_to_window_stack(window_stack, nullptr, false);
}
wm.set_highlight_window(highlight_window);
redraw();
@ -191,7 +191,7 @@ void WindowSwitcher::draw()
painter.fill_rect(icon_rect, palette.window());
painter.blit(icon_rect.location(), window.icon(), window.icon().rect());
painter.draw_text(item_rect.translated(thumbnail_width() + 12, 0), window.computed_title(), WindowManager::the().window_title_font(), Gfx::TextAlignment::CenterLeft, text_color);
auto window_details = m_windows_on_multiple_stacks ? String::formatted("{} on {}:{}", window.rect().to_string(), window.outer_stack()->row() + 1, window.outer_stack()->column() + 1) : window.rect().to_string();
auto window_details = m_windows_on_multiple_stacks ? String::formatted("{} on {}:{}", window.rect().to_string(), window.window_stack().row() + 1, window.window_stack().column() + 1) : window.rect().to_string();
painter.draw_text(item_rect, window_details, Gfx::TextAlignment::CenterRight, rect_text_color);
}
}
@ -221,10 +221,11 @@ void WindowSwitcher::refresh()
if (selected_window == &window)
m_selected_index = m_windows.size();
m_windows.append(window);
auto& window_stack = window.window_stack();
if (!last_added_on_window_stack) {
last_added_on_window_stack = window.outer_stack();
} else if (last_added_on_window_stack != window.outer_stack()) {
last_added_on_window_stack = window.outer_stack();
last_added_on_window_stack = &window_stack;
} else if (last_added_on_window_stack != &window_stack) {
last_added_on_window_stack = &window_stack;
m_windows_on_multiple_stacks = true;
}
return IterationDecision::Continue;