RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 18:18:12 +00:00
Code Issues Activity Actions

WindowServer: Fix bug where window content could bleed through menus.

Browse source 
We have to iterate using for_each_visible_window_from_back_to_front()
if we want every window in the correct order.
This commit is contained in:
Andreas Kling 2019-03-10 01:07:01 +01:00
parent ed61fdbc32
commit 94df0c1ba6
1 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

35
WindowServer/WSWindowManager.cpp
View file

@ -871,18 +871,29 @@ void WSWindowManager::compose()
return false;
};
auto any_opaque_window_above_this_one_contains_rect = [this] (const WSWindow& a_window, const Rect& r) {
for (auto* window = a_window.next(); window; window = window->next()) {
if (!window->is_visible())
continue;
if (window->opacity() < 1.0f)
continue;
if (window->has_alpha_channel())
continue;
if (outer_window_rect(*window).contains(r))
return true;
}
return false;
auto any_opaque_window_above_this_one_contains_rect = [this] (const WSWindow& a_window, const Rect& rect) -> bool {
bool found = false;
bool checking = false;
for_each_visible_window_from_back_to_front([&] (WSWindow& window) {
if (&window == &a_window) {
checking = true;
return IterationDecision::Continue;
}
if (!checking)
return IterationDecision::Continue;
if (!window.is_visible())
return IterationDecision::Continue;;
if (window.opacity() < 1.0f)
return IterationDecision::Continue;;
if (window.has_alpha_channel())
return IterationDecision::Continue;;
if (outer_window_rect(window).contains(rect)) {
found = true;
return IterationDecision::Abort;
}
return IterationDecision::Continue;
});
return found;
};
auto any_dirty_rect_intersects_window = [&dirty_rects] (const WSWindow& window) {