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

layer_shell: Fix popup positioning

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-07-07 19:45:55 +02:00
parent 1fb49824f9
commit 1a3e779eb9
3 changed files with 88 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/wayland/handlers/xdg_shell/mod.rs
View file

@ -61,14 +61,17 @@ impl XdgShellHandler for State {
state.positioner = positioner;
});
self.common.shell.unconstrain_popup(&surface, &positioner);
if surface.get_parent_surface().is_some() {
// let other shells deal with their popups
self.common.shell.unconstrain_popup(&surface, &positioner);
if surface.send_configure().is_ok() {
self.common
.shell
.popups
.track_popup(PopupKind::from(surface))
.unwrap();
if surface.send_configure().is_ok() {
self.common
.shell
.popups
.track_popup(PopupKind::from(surface))
.unwrap();
}
}
}
@ -149,8 +152,13 @@ impl XdgShellHandler for State {
});
self.common.shell.unconstrain_popup(&surface, &positioner);
surface.send_repositioned(token);
if let Err(err) = surface.send_configure() {
slog_scope::warn!(
"Compositor bug: Unable to re configure repositioned popup: {}",
err
);
}
}
fn move_request(