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

subsurface_widget: Sort parent WlSurface, not ObjectId

Browse source
This commit is contained in:
Ian Douglas Scott 2025-03-27 12:10:32 -07:00 • committed by Ashley Wulber
parent 9f07d15617
commit 02bd5d17ef
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
5 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
winit/src/platform_specific/wayland/event_loop/mod.rs
View file

@ -132,7 +132,7 @@ impl SctkEventLoop {
.enumerate()
.filter_map(|(i, s)| {
(winit::window::WindowId::from_raw(
s.instance.parent.as_ptr()
s.instance.parent.id().as_ptr()
as usize,
) == w.window.id())
.then_some(i)

10
winit/src/platform_specific/wayland/event_loop/state.rs
View file

@ -1016,7 +1016,7 @@ impl SctkState {
.subsurfaces
.drain(..)
.partition(|s| {
s.instance.parent == l.surface.wl_surface().id()
s.instance.parent == *l.surface.wl_surface()
});
self.subsurfaces = remaining;
@ -1244,7 +1244,7 @@ impl SctkState {
.subsurfaces
.drain(..)
.partition(|s| {
s.instance.parent == popup.popup.wl_surface().id()
s.instance.parent == *popup.popup.wl_surface()
});
self.subsurfaces = remaining;
@ -1365,7 +1365,7 @@ impl SctkState {
.subsurfaces
.drain(..)
.partition(|s| {
s.instance.parent == surface.session_lock_surface.wl_surface().id()
s.instance.parent == *surface.session_lock_surface.wl_surface()
});
self.subsurfaces = remaining;
@ -1443,7 +1443,7 @@ impl SctkState {
for (destroyed, parent) in destroyed {
if let Some((wl_surface, f)) = self.seats.iter_mut().find(|f| {
f.kbd_focus.as_ref().is_some_and(|f| *f == destroyed)
}).and_then(|f| WlSurface::from_id(&self.connection, parent).ok().map(|wl| (wl, &mut f.kbd_focus))) {
}).and_then(|f| Some((parent, &mut f.kbd_focus))) {
*f = Some(wl_surface);
}
}
@ -1610,7 +1610,7 @@ impl SctkState {
transform:
cctk::wayland_client::protocol::wl_output::Transform::Normal,
z: settings.z,
parent: parent_wl_surface.id(),
parent: parent_wl_surface.clone(),
};
common.wp_viewport = Some(wp_viewport);
let common = Arc::new(Mutex::new(common));