Miroirs/pinnacle
1
0
Fork 0
mirror of https://github.com/pinnacle-comp/pinnacle.git synced 2025-01-26 19:58:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #60 from Ottatop/floating_fix

Browse source 
Fix floating windows not reappearing
This commit is contained in:
Ottatop 2023-08-21 18:06:35 -05:00 • committed by GitHub
commit ed4bc91b20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/layout.rs
View file

@ -11,7 +11,7 @@ use crate::{
backend::Backend,
state::{State, WithState},
window::{
window_state::{FullscreenOrMaximized, LocationRequestState},
window_state::{FloatingOrTiled, FullscreenOrMaximized, LocationRequestState},
WindowElement,
},
};
@ -101,7 +101,13 @@ impl<B: Backend> State<B> {
};
window.change_geometry(geo);
}
FullscreenOrMaximized::Neither => (),
FullscreenOrMaximized::Neither => {
if let FloatingOrTiled::Floating(rect) =
window.with_state(|state| state.floating_or_tiled)
{
window.change_geometry(rect);
}
}
}
}
@ -113,10 +119,13 @@ impl<B: Backend> State<B> {
let serial = window.toplevel().send_configure();
state.loc_request_state = LocationRequestState::Requested(serial, loc);
}
WindowElement::X11(_) => {
WindowElement::X11(surface) => {
// already configured, just need to map
// maybe wait for all wayland windows to commit before mapping
self.space.map_element(window.clone(), loc, false);
surface
.set_mapped(true)
.expect("failed to set x11 win to mapped");
state.loc_request_state = LocationRequestState::Idle;
}
}