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

fix(panes): handle various invalid state situations (#3776)

Browse source
This commit is contained in:
Aram Drevekenin 2024-11-15 14:34:50 +01:00 • committed by GitHub
parent 05fc91eae7
commit f16ee0840d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
zellij-server/src/panes/tiled_panes/mod.rs
View file

@ -1620,8 +1620,9 @@ impl TiledPanes {
viewport_pane.reset_size_and_position_override(); viewport_pane.reset_size_and_position_override();
} }
self.panes_to_hide.clear(); self.panes_to_hide.clear();
let fullscreen_pane = self.get_pane_mut(fullscreen_pane_id).unwrap(); if let Some(fullscreen_pane) = self.get_pane_mut(fullscreen_pane_id) {
fullscreen_pane.reset_size_and_position_override(); fullscreen_pane.reset_size_and_position_override();
}
self.set_force_render(); self.set_force_render();
let display_area = *self.display_area.borrow(); let display_area = *self.display_area.borrow();
self.resize(display_area); self.resize(display_area);

10
zellij-server/src/panes/tiled_panes/tiled_pane_grid.rs
View file

@ -557,7 +557,7 @@ impl<'a> TiledPaneGrid<'a> {
} }
fn reduce_pane_height(&mut self, id: &PaneId, percent: f64) { fn reduce_pane_height(&mut self, id: &PaneId, percent: f64) {
if self.can_reduce_pane_height(id, percent).unwrap() { if self.can_reduce_pane_height(id, percent).unwrap_or(false) {
let current_pane_is_stacked = self let current_pane_is_stacked = self
.panes .panes
.borrow() .borrow()
@ -1292,7 +1292,9 @@ impl<'a> TiledPaneGrid<'a> {
// false => didn't succeed, so didn't do anything // false => didn't succeed, so didn't do anything
let (freed_width, freed_height, pane_to_close_is_stacked) = { let (freed_width, freed_height, pane_to_close_is_stacked) = {
let panes = self.panes.borrow_mut(); let panes = self.panes.borrow_mut();
let pane_to_close = panes.get(&id).unwrap(); let Some(pane_to_close) = panes.get(&id) else {
return false;
};
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(); let freed_width = freed_space.cols.as_percent();
let freed_height = freed_space.rows.as_percent(); let freed_height = freed_space.rows.as_percent();
@ -1350,7 +1352,9 @@ impl<'a> TiledPaneGrid<'a> {
}, },
); );
pane_id_to_split.and_then(|t_id_to_split| { pane_id_to_split.and_then(|t_id_to_split| {
let pane_to_split = panes.get(t_id_to_split).unwrap(); let Some(pane_to_split) = panes.get(t_id_to_split) else {
return None;
};
let direction = if pane_to_split.rows() let direction = if pane_to_split.rows()
* cursor_height_width_ratio.unwrap_or(DEFAULT_CURSOR_HEIGHT_WIDTH_RATIO) * cursor_height_width_ratio.unwrap_or(DEFAULT_CURSOR_HEIGHT_WIDTH_RATIO)
> pane_to_split.cols() > pane_to_split.cols()