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

WindowServer: Fix redrawing menu window that already existed

Browse source 
This fixes redrawing a menu where the window menu is reused at a
different location or with different content.
This commit is contained in:
Tom 2021-07-01 17:17:31 -06:00 • committed by Andreas Kling
parent 179d8f6815
commit 26e9140ea1
1 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Userland/Services/WindowServer/Menu.cpp
View file

@ -135,13 +135,6 @@ Window& Menu::ensure_menu_window(Gfx::IntPoint const& position)
return { position, { width, window_height } };
};
if (m_menu_window) {
// We might be on a different screen than previously, so recalculate the
// menu's rectangle as we have more or less screen available now
m_menu_window->set_rect(calculate_window_rect());
return *m_menu_window;
}
Gfx::IntPoint next_item_location(frame_thickness(), frame_thickness());
for (auto& item : m_items) {
int height = 0;
@ -153,11 +146,21 @@ Window& Menu::ensure_menu_window(Gfx::IntPoint const& position)
next_item_location.translate_by(0, height);
}
auto window = Window::construct(*this, WindowType::Menu);
window->set_visible(false);
window->set_rect(calculate_window_rect());
m_menu_window = move(window);
draw();
if (m_menu_window) {
// We might be on a different screen than previously, so recalculate the
// menu's rectangle as we have more or less screen available now
auto new_rect = calculate_window_rect();
if (new_rect != m_menu_window->rect()) {
m_menu_window->set_rect(new_rect);
redraw();
}
} else {
auto window = Window::construct(*this, WindowType::Menu);
window->set_visible(false);
window->set_rect(calculate_window_rect());
m_menu_window = move(window);
draw();
}
return *m_menu_window;
}