wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-11-26 16:34:23 +03:00
Code Issues Projects Releases Wiki Activity

fix: whole tab terminated when only zoomed pane exited

Browse Source 
closes: https://github.com/wez/wezterm/issues/1235
This commit is contained in:
Wez Furlong 2021-10-17 08:34:35 -07:00
parent d461c1c0b6
commit e7fc5f0e9e
2 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.md
View File

@ -59,6 +59,7 @@ As features stabilize some brief notes about them will accumulate here.
* Fixed: fonts with emoji presentation are shifted to better align with the primary font baseline [#1203](https://github.com/wez/wezterm/issues/1203)
* New: [window_padding](config/lua/config/window_padding.md) now accepts values such as `"1cell"` or `"30%"` to compute values based on font or window metrics.
* New: BSDish systems now support [toast notifications](https://github.com/wez/wezterm/issues/489)
* Fixed: the whole tab was closed when only the zoomed pane exited. [#1235](https://github.com/wez/wezterm/issues/1235)
### 20210814-124438-54e29167

51
mux/src/tab.rs
View File

@ -560,23 +560,35 @@ impl Tab {
/// Walks the pane tree to produce the topologically ordered flattened
/// list of PositionedPane instances along with their positioning information.
pub fn iter_panes(&self) -> Vec<PositionedPane> {
self.iter_panes_impl(true)
}
/// Like iter_panes, except that it will include all panes, regardless of
/// whether one of them is currently zoomed.
pub fn iter_panes_ignoring_zoom(&self) -> Vec<PositionedPane> {
self.iter_panes_impl(false)
}
fn iter_panes_impl(&self, respect_zoom_state: bool) -> Vec<PositionedPane> {
let mut panes = vec![];
if let Some(zoomed) = self.zoomed.borrow().as_ref() {
let size = *self.size.borrow();
panes.push(PositionedPane {
index: 0,
is_active: true,
is_zoomed: true,
left: 0,
top: 0,
width: size.cols.into(),
pixel_width: size.pixel_width.into(),
height: size.rows.into(),
pixel_height: size.pixel_height.into(),
pane: Rc::clone(zoomed),
});
return panes;
if respect_zoom_state {
if let Some(zoomed) = self.zoomed.borrow().as_ref() {
let size = *self.size.borrow();
panes.push(PositionedPane {
index: 0,
is_active: true,
is_zoomed: true,
left: 0,
top: 0,
width: size.cols.into(),
pixel_width: size.pixel_width.into(),
height: size.rows.into(),
pixel_height: size.pixel_height.into(),
pane: Rc::clone(zoomed),
});
return panes;
}
}
let active_idx = *self.active.borrow();
@ -1119,6 +1131,7 @@ impl Tab {
F: Fn(usize, &Rc<dyn Pane>) -> bool,
{
let mut dead_panes = vec![];
let zoomed_pane = self.zoomed.borrow().as_ref().map(|p| p.pane_id());
{
let root_size = *self.size.borrow();
@ -1147,6 +1160,10 @@ impl Tab {
if pane_index == active_idx {
active_idx = pane_index.saturating_sub(1);
}
if Some(pane.pane_id()) == zoomed_pane {
// If we removed the zoomed pane, un-zoom our state!
self.zoomed.borrow_mut().take();
}
let parent;
match cursor.unsplit_leaf() {
Ok((c, dead, p)) => {
@ -1225,7 +1242,9 @@ impl Tab {
}
pub fn is_dead(&self) -> bool {
let panes = self.iter_panes();
// Make sure we account for all panes, so that we don't
// kill the whole tab if the zoomed pane is dead!
let panes = self.iter_panes_ignoring_zoom();
let mut dead_count = 0;
for pos in &panes {
if pos.pane.is_dead() {