kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

Merge pull request #397 from mahkoh/jorth/subsurface-rendering-order

Browse source 
wl_subsurface: apply full damage when position or stacking changes
This commit is contained in:
mahkoh 2025-03-07 16:08:33 +01:00 • committed by GitHub
commit 2071918119
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/ifs/wl_surface/wl_subsurface.rs
View file

@ -131,9 +131,12 @@ impl WlSubsurface {
if let Some(state) = &mut pending.state.take() { if let Some(state) = &mut pending.state.take() {
self.surface.apply_state(state)?; self.surface.apply_state(state)?;
} }
let mut stacking_changed = false;
let mut position_changed = false;
if let Some(v) = pending.node.take() { if let Some(v) = pending.node.take() {
v.pending.set(false); v.pending.set(false);
self.node.borrow_mut().replace(v); self.node.borrow_mut().replace(v);
stacking_changed = true;
} }
if let Some((mut x, mut y)) = pending.position.take() { if let Some((mut x, mut y)) = pending.position.take() {
client_wire_scale_to_logical!(self.surface.client, x, y); client_wire_scale_to_logical!(self.surface.client, x, y);
@ -142,6 +145,12 @@ impl WlSubsurface {
self.surface self.surface
.set_absolute_position(parent_x + x, parent_y + y); .set_absolute_position(parent_x + x, parent_y + y);
self.parent.need_extents_update.set(true); self.parent.need_extents_update.set(true);
position_changed = true;
}
if (position_changed && self.surface.toplevel.is_some())
|| (!position_changed && stacking_changed)
{
self.damage();
} }
Ok(()) Ok(())
} }
@ -303,6 +312,9 @@ impl WlSubsurfaceRequestHandler for WlSubsurface {
} }
} }
self.surface.client.remove_obj(self)?; self.surface.client.remove_obj(self)?;
if self.surface.toplevel.is_some() {
self.damage();
}
self.surface.destroy_node(); self.surface.destroy_node();
Ok(()) Ok(())
} }