zellij-org/zellij
1
1
Fork 0
mirror of https://github.com/zellij-org/zellij.git synced 2024-11-26 22:15:19 +03:00
Code Issues Projects Releases Wiki Activity

refactor(tab): close_pane returns closed pane (#853)

Browse Source 
* refactor(tab): close_pane returns closed pane

Prepare for break pane command by making close_pane return the closed
pane. Also split the function up to hopefully be more readable.

* more refactoring
This commit is contained in:
Thomas Linford 2021-11-13 21:51:53 +01:00 committed by GitHub
parent ce3109ee7e
commit 44852cd6b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
zellij-server/src/tab.rs
View File

@ -2984,7 +2984,7 @@ impl Tab {
} }
} }
} }
pub fn close_pane(&mut self, id: PaneId) { pub fn close_pane(&mut self, id: PaneId) -> Option<Box<dyn Pane>> {
if self.fullscreen_is_active { if self.fullscreen_is_active {
self.unset_fullscreen(); self.unset_fullscreen();
} }
@ -2993,49 +2993,53 @@ impl Tab {
if let (Some(freed_width), Some(freed_height)) = if let (Some(freed_width), Some(freed_height)) =
(freed_space.cols.as_percent(), freed_space.rows.as_percent()) (freed_space.cols.as_percent(), freed_space.rows.as_percent())
{ {
if let Some(panes) = self.panes_to_the_left_between_aligning_borders(id) { if let Some((panes, direction)) = self.find_panes_to_grow(id) {
for pane_id in panes.iter() { self.grow_panes(&panes, direction, (freed_width, freed_height));
self.increase_pane_width(pane_id, freed_width); let pane = self.panes.remove(&id);
}
self.panes.remove(&id);
self.move_clients_out_of_pane(id); self.move_clients_out_of_pane(id);
self.relayout_tab(Direction::Horizontal); self.relayout_tab(direction);
return; return pane;
}
if let Some(panes) = self.panes_to_the_right_between_aligning_borders(id) {
for pane_id in panes.iter() {
self.increase_pane_width(pane_id, freed_width);
}
self.panes.remove(&id);
self.move_clients_out_of_pane(id);
self.relayout_tab(Direction::Horizontal);
return;
}
if let Some(panes) = self.panes_above_between_aligning_borders(id) {
for pane_id in panes.iter() {
self.increase_pane_height(pane_id, freed_height);
}
self.panes.remove(&id);
self.move_clients_out_of_pane(id);
self.relayout_tab(Direction::Vertical);
return;
}
if let Some(panes) = self.panes_below_between_aligning_borders(id) {
for pane_id in panes.iter() {
self.increase_pane_height(pane_id, freed_height);
}
self.panes.remove(&id);
self.move_clients_out_of_pane(id);
self.relayout_tab(Direction::Vertical);
return;
} }
} }
// if we reached here, this is either the last pane or there's some sort of // if we reached here, this is either the last pane or there's some sort of
// configuration error (eg. we're trying to close a pane surrounded by fixed panes) // configuration error (eg. we're trying to close a pane surrounded by fixed panes)
self.panes.remove(&id); let pane = self.panes.remove(&id);
self.active_panes.clear(); self.active_panes.clear();
self.resize_whole_tab(self.display_area); self.resize_whole_tab(self.display_area);
return pane;
} }
None
}
fn find_panes_to_grow(&self, id: PaneId) -> Option<(Vec<PaneId>, Direction)> {
if let Some(panes) = self
.panes_to_the_left_between_aligning_borders(id)
.or_else(|| self.panes_to_the_right_between_aligning_borders(id))
{
return Some((panes, Direction::Horizontal));
}
if let Some(panes) = self
.panes_above_between_aligning_borders(id)
.or_else(|| self.panes_below_between_aligning_borders(id))
{
return Some((panes, Direction::Vertical));
}
None
}
fn grow_panes(&mut self, panes: &[PaneId], direction: Direction, (width, height): (f64, f64)) {
match direction {
Direction::Horizontal => {
for pane_id in panes.iter() {
self.increase_pane_width(pane_id, width);
}
}
Direction::Vertical => {
for pane_id in panes.iter() {
self.increase_pane_height(pane_id, height);
}
}
};
} }
pub fn close_focused_pane(&mut self, client_id: ClientId) { pub fn close_focused_pane(&mut self, client_id: ClientId) {
if let Some(active_pane_id) = self.get_active_pane_id(client_id) { if let Some(active_pane_id) = self.get_active_pane_id(client_id) {