diff options
| author | Ogulcan Celik <ogulcancelik@gmail.com> | 2026-03-28 15:23:29 +0300 |
|---|---|---|
| committer | Ogulcan Celik <ogulcancelik@gmail.com> | 2026-03-28 15:28:13 +0300 |
| commit | 7380e0ed16470c570984485930048a80034ba381 (patch) | |
| tree | a4dea216baad978f1f10d6af034f3aef883f9246 /src/app/actions.rs | |
| parent | f18f26d1c0fd8101baee946f71bdd77b9743df41 (diff) | |
refactor workspace identity and configurable navigate actions
Diffstat (limited to 'src/app/actions.rs')
| -rw-r--r-- | src/app/actions.rs | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/app/actions.rs b/src/app/actions.rs index 787f6869..7c323da5 100644 --- a/src/app/actions.rs +++ b/src/app/actions.rs @@ -46,7 +46,7 @@ impl AppState { if self.workspaces.is_empty() { return; } - let name = self.workspaces[self.selected].name.clone(); + let name = self.workspaces[self.selected].display_name(); info!(workspace = %name, "workspace closed"); self.workspaces.remove(self.selected); if self.workspaces.is_empty() { @@ -236,16 +236,7 @@ impl AppState { } } } else { - if ws.layout.focused() == pane_id { - ws.layout.close_focused(); - } else { - let prev_focus = ws.layout.focused(); - ws.layout.focus_pane(pane_id); - ws.layout.close_focused(); - ws.layout.focus_pane(prev_focus); - } - ws.panes.remove(&pane_id); - ws.runtimes.remove(&pane_id); + ws.remove_pane(pane_id); } } } @@ -311,7 +302,7 @@ mod tests { assert_eq!(state.workspaces.len(), 2); assert_eq!(state.selected, 1); assert_eq!(state.active, Some(1)); - assert_eq!(state.workspaces[1].name, "c"); + assert_eq!(state.workspaces[1].custom_name.as_deref(), Some("c")); } #[test] @@ -346,7 +337,7 @@ mod tests { state.handle_pane_died(pane_id); assert_eq!(state.workspaces.len(), 1); - assert_eq!(state.workspaces[0].name, "b"); + assert_eq!(state.workspaces[0].custom_name.as_deref(), Some("b")); } #[test] |
