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

WindowServer: Use nearest modeless window for modal Taskbar rects

Browse source 
Modeless windows are guaranteed Taskbar buttons which lets us
simplify getting the proper taskbar rect for modals.
This commit is contained in:
thankyouverycool 2022-08-22 14:59:55 -04:00 • committed by Andreas Kling
parent df2f479810
commit 5a0472d8d2
2 changed files with 8 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Userland/Services/WindowServer/Window.cpp
View file

@ -287,8 +287,9 @@ void Window::set_closeable(bool closeable)
void Window::set_taskbar_rect(Gfx::IntRect const& rect) void Window::set_taskbar_rect(Gfx::IntRect const& rect)
{ {
if (m_taskbar_rect == rect)
return;
m_taskbar_rect = rect; m_taskbar_rect = rect;
m_have_taskbar_rect = !m_taskbar_rect.is_empty();
} }
static Gfx::IntRect interpolate_rect(Gfx::IntRect const& from_rect, Gfx::IntRect const& to_rect, float progress) static Gfx::IntRect interpolate_rect(Gfx::IntRect const& from_rect, Gfx::IntRect const& to_rect, float progress)
@ -312,26 +313,13 @@ void Window::start_minimize_animation()
return; return;
if (!WindowManager::the().system_effects().animate_windows()) if (!WindowManager::the().system_effects().animate_windows())
return; return;
if (!m_have_taskbar_rect) { if (is_modal()) {
// If this is a modal window, it may not have its own taskbar if (auto modeless = modeless_ancestor(); modeless) {
// button, so there is no rectangle. In that case, walk the auto rect = modeless->taskbar_rect();
// modal stack until we find a window that may have one VERIFY(!rect.is_empty());
WindowManager::the().for_each_window_in_modal_stack(*this, [&](Window& w, bool) { m_taskbar_rect = rect;
if (w.has_taskbar_rect()) { }
// We purposely do NOT set m_have_taskbar_rect to true here
// because we want to only copy the rectangle from the
// window that has it, but since this window wouldn't receive
// any updates down the road we want to query it again
// next time we want to start the animation
m_taskbar_rect = w.taskbar_rect();
VERIFY(!m_have_taskbar_rect); // should remain unset!
return IterationDecision::Break;
};
return IterationDecision::Continue;
});
} }
m_animation = Animation::create(); m_animation = Animation::create();
m_animation->set_duration(150); m_animation->set_duration(150);
m_animation->on_update = [this](float progress, Gfx::Painter& painter, Screen& screen, Gfx::DisjointRectSet& flush_rects) { m_animation->on_update = [this](float progress, Gfx::Painter& painter, Screen& screen, Gfx::DisjointRectSet& flush_rects) {

2
Userland/Services/WindowServer/Window.h
View file

@ -292,7 +292,6 @@ public:
void request_update(Gfx::IntRect const&, bool ignore_occlusion = false); void request_update(Gfx::IntRect const&, bool ignore_occlusion = false);
Gfx::DisjointRectSet take_pending_paint_rects() { return move(m_pending_paint_rects); } Gfx::DisjointRectSet take_pending_paint_rects() { return move(m_pending_paint_rects); }
bool has_taskbar_rect() const { return m_have_taskbar_rect; };
void start_minimize_animation(); void start_minimize_animation();
void start_launch_animation(Gfx::IntRect const&); void start_launch_animation(Gfx::IntRect const&);
@ -422,7 +421,6 @@ private:
bool m_fullscreen { false }; bool m_fullscreen { false };
bool m_destroyed { false }; bool m_destroyed { false };
bool m_default_positioned { false }; bool m_default_positioned { false };
bool m_have_taskbar_rect { false };
bool m_invalidated { true }; bool m_invalidated { true };
bool m_invalidated_all { true }; bool m_invalidated_all { true };
bool m_invalidated_frame { true }; bool m_invalidated_frame { true };