vtimofei
/
smithay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #464 from Smithay/fix/multi_overlap_damage 

space: Handle multiple overlapping rects when merging damage
This commit is contained in:
Victoria Brekenfeld 2022-01-17 14:19:22 +01:00 committed by GitHub
parent 050c648bff a53d64053f
commit 3c7b84ff88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/desktop/space/mod.rs
View File

@ -572,12 +572,15 @@ impl Space {
damage.retain(|rect| rect.overlaps(output_geo)); damage.retain(|rect| rect.overlaps(output_geo));
damage.retain(|rect| rect.size.h > 0 && rect.size.w > 0); damage.retain(|rect| rect.size.h > 0 && rect.size.w > 0);
// merge overlapping rectangles // merge overlapping rectangles
damage = damage.into_iter().fold(Vec::new(), |mut new_damage, rect| { damage = damage.into_iter().fold(Vec::new(), |new_damage, mut rect| {
if let Some(existing) = new_damage.iter_mut().find(|other| rect.overlaps(**other)) { // replace with drain_filter, when that becomes stable to reuse the original Vec's memory
*existing = existing.merge(rect); let (overlapping, mut new_damage): (Vec<_>, Vec<_>) =
} else { new_damage.into_iter().partition(|other| other.overlaps(rect));
new_damage.push(rect);
for overlap in overlapping {
rect = rect.merge(overlap);
} }
new_damage.push(rect);
new_damage new_damage
}); });