Update Smithay (last_acked refactor, Qt layer-shell popup grab fix, popup ordering fix)

1 files changed, 9 insertions, 8 deletions

diff --git a/src/handlers/compositor.rs b/src/handlers/compositor.rs
index 034ee0d0..cf2efaaf 100644
--- a/src/handlers/compositor.rs
+++ b/src/handlers/compositor.rs
@@ -14,7 +14,7 @@ use smithay::wayland::compositor::{
     SurfaceAttributes,
 };
 use smithay::wayland::dmabuf::get_dmabuf;
-use smithay::wayland::shell::xdg::XdgToplevelSurfaceData;
+use smithay::wayland::shell::xdg::ToplevelCachedState;
 use smithay::wayland::shm::{ShmHandler, ShmState};
 use smithay::{delegate_compositor, delegate_shm};
 
@@ -286,13 +286,14 @@ impl CompositorHandler for State {
                         .buffer_delta
                         .take();
 
-                    let role = states
-                        .data_map
-                        .get::<XdgToplevelSurfaceData>()
-                        .unwrap()
-                        .lock()
-                        .unwrap();
-                    (role.configure_serial, buffer_delta)
+                    let serial = states
+                        .cached_state
+                        .get::<ToplevelCachedState>()
+                        .current()
+                        .last_acked
+                        .as_ref()
+                        .map(|c| c.serial);
+                    (serial, buffer_delta)
                 });
                 if serial.is_none() {
                     error!("commit on a mapped surface without a configured serial");