diff options
| author | Aram Drevekenin <aram@poor.dev> | 2023-08-24 13:36:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-24 13:36:24 +0200 |
| commit | bc628abc1266cdc0dbce4f19a89727527a3e39a8 (patch) | |
| tree | 6a0fcac6ec35c71a237bca0128a57a5b40afb0e3 /zellij-server/src/panes | |
| parent | bf3c072d6dd68da0abd838e95e6004091a4cd331 (diff) | |
feat(sessions): add a session manager to switch between sessions, tabs and panes and create new ones (#2721)
* write/read session metadata to disk for all sessions
* switch session client side
* fix tests
* various adjustments
* fix full screen focus bug in tiled panes
* fix tests
* fix permission sorting issue
* cleanups
* add session manager
* fix tests
* various cleanups
* style(fmt): rustfmt
* clear screen before switching sessions
* I hate you clippy
* truncate controls line to width
* version session cache
* attempt to fix plugin tests
* style(fmt): rustfmt
* another attempt to fix the tests in the ci
Diffstat (limited to 'zellij-server/src/panes')
| -rw-r--r-- | zellij-server/src/panes/grid.rs | 2 | ||||
| -rw-r--r-- | zellij-server/src/panes/tiled_panes/mod.rs | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/zellij-server/src/panes/grid.rs b/zellij-server/src/panes/grid.rs index d63fac562..6cafad7d3 100644 --- a/zellij-server/src/panes/grid.rs +++ b/zellij-server/src/panes/grid.rs @@ -1351,7 +1351,7 @@ impl Grid { self.viewport.get(y).unwrap().absolute_character_index(x) } pub fn move_cursor_forward_until_edge(&mut self, count: usize) { - let count_to_move = std::cmp::min(count, self.width - self.cursor.x); + let count_to_move = std::cmp::min(count, self.width.saturating_sub(self.cursor.x)); self.cursor.x += count_to_move; } pub fn replace_characters_in_line_after_cursor(&mut self, replace_with: TerminalCharacter) { diff --git a/zellij-server/src/panes/tiled_panes/mod.rs b/zellij-server/src/panes/tiled_panes/mod.rs index 736c16bc9..e85911b4f 100644 --- a/zellij-server/src/panes/tiled_panes/mod.rs +++ b/zellij-server/src/panes/tiled_panes/mod.rs @@ -523,6 +523,11 @@ impl TiledPanes { } } pub fn focus_pane(&mut self, pane_id: PaneId, client_id: ClientId) { + if self.panes_to_hide.contains(&pane_id) { + // this means there is a fullscreen pane that is not the current pane, let's unset it + // before changing focus + self.unset_fullscreen(); + } if self .panes .get(&pane_id) @@ -533,7 +538,6 @@ impl TiledPanes { .expand_pane(&pane_id); self.reapply_pane_frames(); } - self.active_panes .insert(client_id, pane_id, &mut self.panes); if self.session_is_mirrored { |