pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(panes): do not crash when closing fixed pane (#987)

Browse source
This commit is contained in:
Aram Drevekenin 2022-01-04 11:43:34 +01:00 • committed by GitHub
parent 34634f77f7
commit 0d0064afff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
zellij-server/src/tab/pane_grid.rs
View file

@ -1647,27 +1647,30 @@ impl<'a> PaneGrid<'a> {
pub fn fill_space_over_pane(&mut self, id: PaneId) -> bool { pub fn fill_space_over_pane(&mut self, id: PaneId) -> bool {
// true => successfully filled space over pane // true => successfully filled space over pane
// false => didn't succeed, so didn't do anything // false => didn't succeed, so didn't do anything
log::info!("fill_space_over_pane");
let (freed_width, freed_height) = { let (freed_width, freed_height) = {
let panes = self.panes.borrow_mut(); let panes = self.panes.borrow_mut();
let pane_to_close = panes.get(&id).unwrap(); let pane_to_close = panes.get(&id).unwrap();
let freed_space = pane_to_close.position_and_size(); let freed_space = pane_to_close.position_and_size();
let freed_width = freed_space.cols.as_percent().unwrap(); let freed_width = freed_space.cols.as_percent();
let freed_height = freed_space.rows.as_percent().unwrap(); let freed_height = freed_space.rows.as_percent();
(freed_width, freed_height) (freed_width, freed_height)
}; };
if let Some((panes_to_grow, direction)) = self.find_panes_to_grow(id) { if let (Some(freed_width), Some(freed_height)) = (freed_width, freed_height) {
self.grow_panes(&panes_to_grow, direction, (freed_width, freed_height)); if let Some((panes_to_grow, direction)) = self.find_panes_to_grow(id) {
let side_length = match direction { self.grow_panes(&panes_to_grow, direction, (freed_width, freed_height));
Direction::Vertical => self.display_area.rows, let side_length = match direction {
Direction::Horizontal => self.display_area.cols, Direction::Vertical => self.display_area.rows,
}; Direction::Horizontal => self.display_area.cols,
{ };
let mut panes = self.panes.borrow_mut(); {
(*panes).remove(&id); let mut panes = self.panes.borrow_mut();
(*panes).remove(&id);
}
let mut pane_resizer = PaneResizer::new(self.panes.clone());
let _ = pane_resizer.layout(direction, side_length);
return true;
} }
let mut pane_resizer = PaneResizer::new(self.panes.clone());
let _ = pane_resizer.layout(direction, side_length);
return true;
} }
false false
} }