leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

subsurface_widget: Fix use of place_above

Browse source 
`place_above` moves the subsurface within the stack of subsurfaces, so
calling it for all previous surfaces is wrong.

We also need to use the `z` from `view_subsurfaces` if this is called
before `attach_and_commit`, or an old value will be used.
This commit is contained in:
Ian Douglas Scott 2025-03-26 15:49:22 -07:00 • committed by Ashley Wulber
parent 5b0468e535
commit 9f07d15617
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
winit/src/platform_specific/wayland/subsurface_widget.rs
View file

@ -512,12 +512,14 @@ impl SubsurfaceState {
let mut sorted_subsurfaces: Vec<_> = view_subsurfaces
.iter()
.zip(subsurfaces.iter_mut())
.map(|(_, instance)| {
.map(|(subsurface_info, instance)| {
(
instance.parent.clone(),
instance.wl_subsurface.clone(),
instance.wl_surface.clone(),
instance.z,
// Use from `view_subsurfaces`; not updated in `subsurfaces`
// until `attach_and_commit`
subsurface_info.z,
)
})
.chain(self.new_iced_subsurfaces.clone().into_iter().map(
@ -544,10 +546,10 @@ impl SubsurfaceState {
let prev = &sorted_subsurfaces[0..i];
let subsurface = &sorted_subsurfaces[i];
for prev in prev.iter().rev() {
if prev.0 != subsurface.0 {
continue;
if prev.0 == subsurface.0 {
subsurface.1.place_above(&prev.2);
break;
}
subsurface.1.place_above(&prev.2);
}
}
}