InfoshockTech/xcrab
6
0
Fork 1
Code Issues 5 Pull requests Projects 1 Releases Wiki Activity

try to not crash when windows are deleted

Browse source
This commit is contained in:
missing 2022-06-27 11:43:31 -05:00
parent b38087f2eb
commit 947a051b48
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/x11/client.rs
View file

@ -460,17 +460,17 @@ impl XcrabWindowManager {
match &mut rect.contents {
RectangleContents::Pane(pane) => {
// TODO: gap
if !pane.children.is_empty() {
let new_dimensions = dimensions.split(pane.directionality, pane.children.len());
let new_dimensions = dimensions.split(pane.directionality, pane.children.len());
for (key, dimensions) in pane
.children
.clone()
.into_iter()
.zip(new_dimensions.into_iter())
{
self.update_rectangle(conn, key, Some(dimensions)).await?;
for (key, dimensions) in pane
.children
.clone()
.into_iter()
.zip(new_dimensions.into_iter())
{
self.update_rectangle(conn, key, Some(dimensions)).await?;
}
}
}
RectangleContents::Client(client) => {
@ -525,11 +525,13 @@ impl XcrabWindowManager {
self.rects.remove(client_key);
if self.focused.unwrap() == win {
self.focused = Some(*self.clients.keys().next().unwrap());
self.focused = self.clients.keys().next().copied();
}
self.update_rectangle(conn, parent_key, None).await?;
// TODO: remove panes if they have 1 or 0 children
Ok(())
}
}