RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 00:17:46 +00:00
Code Issues Activity Actions

WindowServer: Simplify determining transparent/opaque occlusions

Browse source 
By moving the logic to determine what window areas (shadow, frame,
content) into WindowFrame::opaque/transparent_render_rects we can
simplify the occlusion calculation and properly handle more
arbitrary opaque/transparent areas.

This also solves the problem where we would render the entire
window frame as transparency only because the frame had a window
shadow.
This commit is contained in:
Tom 2021-06-05 14:37:48 -06:00 • committed by Linus Groh
parent 939da41fa1
commit 2c8309c841
3 changed files with 63 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -196,10 +196,8 @@ Gfx::Bitmap* WindowFrame::window_shadow() const
}
}
bool WindowFrame::frame_has_alpha() const
bool WindowFrame::has_shadow() const
{
if (m_has_alpha_channel)
return true;
if (auto* shadow_bitmap = window_shadow(); shadow_bitmap && shadow_bitmap->format() == Gfx::BitmapFormat::BGRA8888)
return true;
return false;
@ -514,6 +512,39 @@ Gfx::IntRect WindowFrame::render_rect() const
return inflated_for_shadow(rect());
}
Gfx::DisjointRectSet WindowFrame::opaque_render_rects() const
{
if (has_alpha_channel()) {
if (m_window.is_opaque())
return m_window.rect();
return {};
}
if (m_window.is_opaque())
return rect();
Gfx::DisjointRectSet opaque_rects;
opaque_rects.add_many(rect().shatter(m_window.rect()));
return opaque_rects;
}
Gfx::DisjointRectSet WindowFrame::transparent_render_rects() const
{
if (has_alpha_channel()) {
if (m_window.is_opaque()) {
Gfx::DisjointRectSet transparent_rects;
transparent_rects.add_many(render_rect().shatter(m_window.rect()));
return transparent_rects;
}
return render_rect();
}
Gfx::DisjointRectSet transparent_rects;
if (has_shadow())
transparent_rects.add_many(render_rect().shatter(rect()));
if (!m_window.is_opaque())
transparent_rects.add(m_window.rect());
return transparent_rects;
}
void WindowFrame::invalidate_titlebar()
{
m_dirty = true;