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

shell: Fix closed x11 windows closing stacks

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-09-12 13:20:34 +02:00
parent bc3c304b12
commit 8038034a62
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/xwayland.rs
View file

@ -200,6 +200,7 @@ impl XwmHandler for Data {
} }
fn unmapped_window(&mut self, _xwm: XwmId, window: X11Surface) { fn unmapped_window(&mut self, _xwm: XwmId, window: X11Surface) {
let surface = CosmicSurface::X11(window.clone());
if window.is_override_redirect() { if window.is_override_redirect() {
self.state self.state
.common .common
@ -210,7 +211,7 @@ impl XwmHandler for Data {
.state .state
.common .common
.shell .shell
.element_for_surface(&CosmicSurface::X11(window.clone())) .element_for_surface(&surface)
.cloned() .cloned()
.and_then(|element| { .and_then(|element| {
self.state self.state
@ -220,7 +221,11 @@ impl XwmHandler for Data {
.map(|space| (element, space)) .map(|space| (element, space))
}) })
{ {
space.unmap(&element); if element.is_stack() && element.stack_ref().unwrap().len() >= 2 {
element.stack_ref().unwrap().remove_window(&surface);
} else {
space.unmap(&element);
}
} }
let outputs = if let Some(wl_surface) = window.wl_surface() { let outputs = if let Some(wl_surface) = window.wl_surface() {