aboutsummaryrefslogtreecommitdiff
path: root/src/handlers/xdg_shell.rs
diff options
context:
space:
mode:
authorIvan Molodetskikh <yalterz@gmail.com>2025-09-05 16:41:54 +0300
committerIvan Molodetskikh <yalterz@gmail.com>2025-09-17 22:04:23 +0300
commit4808ba2b2055a09008be17d3e9eeae2d592b7b18 (patch)
tree2ca186112158a9b69e36aa6f76cd78f0361fc911 /src/handlers/xdg_shell.rs
parent35cbab476ebfc271909777029f56f666b29d76a2 (diff)
downloadniri-4808ba2b2055a09008be17d3e9eeae2d592b7b18.tar.gz
niri-4808ba2b2055a09008be17d3e9eeae2d592b7b18.tar.bz2
niri-4808ba2b2055a09008be17d3e9eeae2d592b7b18.zip
Update Smithay (last_acked refactor, Qt layer-shell popup grab fix, popup ordering fix)
Diffstat (limited to 'src/handlers/xdg_shell.rs')
-rw-r--r--src/handlers/xdg_shell.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/handlers/xdg_shell.rs b/src/handlers/xdg_shell.rs
index 970dcb5b..5d8adc06 100644
--- a/src/handlers/xdg_shell.rs
+++ b/src/handlers/xdg_shell.rs
@@ -1259,8 +1259,9 @@ pub fn add_mapped_toplevel_pre_commit_hook(toplevel: &ToplevelSurface) -> HookId
.unwrap()
.lock()
.unwrap();
+ let serial = role.last_acked.as_ref().map(|c| c.serial);
- (got_unmapped, dmabuf, role.configure_serial)
+ (got_unmapped, dmabuf, serial)
});
let mut transaction_for_dmabuf = None;
@@ -1305,7 +1306,7 @@ pub fn add_mapped_toplevel_pre_commit_hook(toplevel: &ToplevelSurface) -> HookId
}
animate = mapped.should_animate_commit(serial);
- } else {
+ } else if !got_unmapped {
error!("commit on a mapped surface without a configured serial");
};