RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-23 16:47:41 +00:00
Code Issues Activity Actions

WindowServer: Mark window frame as invalidated when updating title

Browse source 
We need to set Window::m_invalidated_frame to true when invalidating
the title, otherwise we may miss re-rendering the frame if nothing
else triggers it.
This commit is contained in:
Tom 2022-02-21 19:26:31 -07:00 • committed by Brian Gianforcaro
parent 678d26dd19
commit 97e18a6ce1
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -650,23 +650,23 @@ void Window::invalidate(bool invalidate_frame, bool re_render_frame)
Compositor::the().invalidate_window(); Compositor::the().invalidate_window();
} }
void Window::invalidate(Gfx::IntRect const& rect) void Window::invalidate(Gfx::IntRect const& rect, bool invalidate_frame)
{ {
if (type() == WindowType::Applet) { if (type() == WindowType::Applet) {
AppletManager::the().invalidate_applet(*this, rect); AppletManager::the().invalidate_applet(*this, rect);
return; return;
} }
if (invalidate_no_notify(rect)) if (invalidate_no_notify(rect, invalidate_frame))
Compositor::the().invalidate_window(); Compositor::the().invalidate_window();
} }
bool Window::invalidate_no_notify(const Gfx::IntRect& rect, bool with_frame) bool Window::invalidate_no_notify(const Gfx::IntRect& rect, bool invalidate_frame)
{ {
if (rect.is_empty()) if (rect.is_empty())
return false; return false;
if (m_invalidated_all) { if (m_invalidated_all) {
if (with_frame) if (invalidate_frame)
m_invalidated_frame |= true; m_invalidated_frame |= true;
return false; return false;
} }
@ -680,7 +680,7 @@ bool Window::invalidate_no_notify(const Gfx::IntRect& rect, bool with_frame)
return false; return false;
m_invalidated = true; m_invalidated = true;
if (with_frame) if (invalidate_frame)
m_invalidated_frame |= true; m_invalidated_frame |= true;
m_dirty_rects.add(inner_rect.translated(-outer_rect.location())); m_dirty_rects.add(inner_rect.translated(-outer_rect.location()));
return true; return true;

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

@ -211,9 +211,9 @@ public:
Gfx::IntSize size() const { return m_rect.size(); } Gfx::IntSize size() const { return m_rect.size(); }
void invalidate(bool with_frame = true, bool re_render_frame = false); void invalidate(bool with_frame = true, bool re_render_frame = false);
void invalidate(Gfx::IntRect const&); void invalidate(Gfx::IntRect const&, bool invalidate_frame = false);
void invalidate_menubar(); void invalidate_menubar();
bool invalidate_no_notify(const Gfx::IntRect& rect, bool with_frame = false); bool invalidate_no_notify(const Gfx::IntRect& rect, bool invalidate_frame = false);
void invalidate_last_rendered_screen_rects(); void invalidate_last_rendered_screen_rects();
void invalidate_last_rendered_screen_rects_now(); void invalidate_last_rendered_screen_rects_now();
[[nodiscard]] bool should_invalidate_last_rendered_screen_rects() { return exchange(m_invalidate_last_render_rects, false); } [[nodiscard]] bool should_invalidate_last_rendered_screen_rects() { return exchange(m_invalidate_last_render_rects, false); }

2
Userland/Services/WindowServer/WindowFrame.cpp
View file

@ -624,7 +624,7 @@ void WindowFrame::invalidate(Gfx::IntRect relative_rect)
auto window_rect = m_window.rect(); auto window_rect = m_window.rect();
relative_rect.translate_by(frame_rect.x() - window_rect.x(), frame_rect.y() - window_rect.y()); relative_rect.translate_by(frame_rect.x() - window_rect.x(), frame_rect.y() - window_rect.y());
set_dirty(); set_dirty();
m_window.invalidate(relative_rect); m_window.invalidate(relative_rect, true);
} }
void WindowFrame::window_rect_changed(const Gfx::IntRect& old_rect, const Gfx::IntRect& new_rect) void WindowFrame::window_rect_changed(const Gfx::IntRect& old_rect, const Gfx::IntRect& new_rect)