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

Fix colored pane frames in mirrored sessions (#2625)

Browse Source 
* server/panes/tiled: Fix colored frames

in mirrored sessions. Colored frames were previously ignored because
they were treated like floating panes when rendering tiled panes.

* CHANGELOG: Add PR #2625

* server/tab/unit: Fix unit tests for server.
This commit is contained in:
har7an 2023-07-16 14:35:34 +00:00 committed by GitHub
parent 5bf421ecdc
commit fa8ef2a973
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
* fix(tab-bar,compact-bar): tab switching with mouse sometimes not working (https://github.com/zellij-org/zellij/pull/2587) * fix(tab-bar,compact-bar): tab switching with mouse sometimes not working (https://github.com/zellij-org/zellij/pull/2587)
* feat(status-bar): supermode to prevent colliding keybindings (https://github.com/zellij-org/zellij/pull/2619) * feat(status-bar): supermode to prevent colliding keybindings (https://github.com/zellij-org/zellij/pull/2619)
* fix(rendering): occasional glitches while resizing (https://github.com/zellij-org/zellij/pull/2621) * fix(rendering): occasional glitches while resizing (https://github.com/zellij-org/zellij/pull/2621)
* fix(rendering): colored paneframes in mirrored sessions (https://github.com/zellij-org/zellij/pull/2625)
## [0.37.2] - 2023-06-20 ## [0.37.2] - 2023-06-20
* hotfix: include theme files into binary (https://github.com/zellij-org/zellij/pull/2566) * hotfix: include theme files into binary (https://github.com/zellij-org/zellij/pull/2566)

2
zellij-server/src/panes/tiled_panes/mod.rs
View File

@ -623,7 +623,7 @@ impl TiledPanes {
{ self.connected_clients.borrow().iter().copied().collect() }; { self.connected_clients.borrow().iter().copied().collect() };
let multiple_users_exist_in_session = { self.connected_clients_in_app.borrow().len() > 1 }; let multiple_users_exist_in_session = { self.connected_clients_in_app.borrow().len() > 1 };
let mut client_id_to_boundaries: HashMap<ClientId, Boundaries> = HashMap::new(); let mut client_id_to_boundaries: HashMap<ClientId, Boundaries> = HashMap::new();
let active_panes = if self.session_is_mirrored || floating_panes_are_visible { let active_panes = if floating_panes_are_visible {
HashMap::new() HashMap::new()
} else { } else {
self.active_panes self.active_panes

3
zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__base_layout_is_included_in_swap_layouts.snap
View File

@ -1,6 +1,5 @@
--- ---
source: zellij-server/src/tab/./unit/tab_integration_tests.rs source: zellij-server/src/tab/./unit/tab_integration_tests.rs
assertion_line: 4762
expression: snapshot expression: snapshot
--- ---
00 (C): I am a tab bar 00 (C): I am a tab bar
@ -20,7 +19,7 @@ expression: snapshot
14 (C): │ ││ ││ │ 14 (C): │ ││ ││ │
15 (C): │ ││ ││ │ 15 (C): │ ││ ││ │
16 (C): │ ││ ││ │ 16 (C): │ ││ ││ │
17 (C): └───────────────────────────────────────┘└──────────────────────────────────────┘└──────────────────────────────────────┘ 17 (C): └───────────────────────────────────────┘└──────────────────────────────────────┘└─ <ENTER> to run, <Ctrl-c> to exit ───┘
18 (C): I am a 18 (C): I am a
19 (C): status bar 19 (C): status bar

3
zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__layout_with_plugins_and_commands_swaped_properly.snap
View File

@ -1,6 +1,5 @@
--- ---
source: zellij-server/src/tab/./unit/tab_integration_tests.rs source: zellij-server/src/tab/./unit/tab_integration_tests.rs
assertion_line: 4992
expression: snapshot expression: snapshot
--- ---
00 (C): I am a 00 (C): I am a
@ -10,7 +9,7 @@ expression: snapshot
04 (C): │ Waiting to run: command1 │ 04 (C): │ Waiting to run: command1 │
05 (C): │ │ 05 (C): │ │
06 (C): │ <ENTER> to run, <Ctrl-c> to exit │ 06 (C): │ <ENTER> to run, <Ctrl-c> to exit │
07 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ 07 (C): └─ <ENTER> to run, <Ctrl-c> to exit ────────────────────────────────────────────────────────────────────────────────────┘
08 (C): ┌ command2 ─────────────────────────────────────────────────────────────────────────────────────────────────────────────┐ 08 (C): ┌ command2 ─────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
09 (C): │ │ 09 (C): │ │
10 (C): │ Waiting to run: command2 │ 10 (C): │ Waiting to run: command2 │

3
zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__swap_layouts_not_including_command_panes_present_in_existing_layout.snap
View File

@ -1,6 +1,5 @@
--- ---
source: zellij-server/src/tab/./unit/tab_integration_tests.rs source: zellij-server/src/tab/./unit/tab_integration_tests.rs
assertion_line: 4904
expression: snapshot expression: snapshot
--- ---
00 (C): I am a 00 (C): I am a
@ -16,7 +15,7 @@ expression: snapshot
10 (C): │ Waiting to run: command1 │ 10 (C): │ Waiting to run: command1 │
11 (C): │ │ 11 (C): │ │
12 (C): │ <ENTER> to run, <Ctrl-c> to exit │ 12 (C): │ <ENTER> to run, <Ctrl-c> to exit │
13 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ 13 (C): └─ <ENTER> to run, <Ctrl-c> to exit ────────────────────────────────────────────────────────────────────────────────────┘
14 (C): ┌ command2 ─────────────────────────────────────────────────────────────────────────────────────────────────────────────┐ 14 (C): ┌ command2 ─────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
15 (C): │ Waiting to run: command2 │ 15 (C): │ Waiting to run: command2 │
16 (C): │ │ 16 (C): │ │

3
zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__swap_layouts_not_including_plugin_panes_present_in_existing_layout.snap
View File

@ -1,6 +1,5 @@
--- ---
source: zellij-server/src/tab/./unit/tab_integration_tests.rs source: zellij-server/src/tab/./unit/tab_integration_tests.rs
assertion_line: 5035
expression: snapshot expression: snapshot
--- ---
00 (C): ┌ Pane #2 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐ 00 (C): ┌ Pane #2 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
@ -10,7 +9,7 @@ expression: snapshot
04 (C): │ Waiting to run: command1 │ 04 (C): │ Waiting to run: command1 │
05 (C): │ │ 05 (C): │ │
06 (C): │ <ENTER> to run, <Ctrl-c> to exit │ 06 (C): │ <ENTER> to run, <Ctrl-c> to exit │
07 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ 07 (C): └─ <ENTER> to run, <Ctrl-c> to exit ────────────────────────────────────────────────────────────────────────────────────┘
08 (C): ┌ command2 ─────────────────────────────────────────────────────────────────────────────────────────────────────────────┐ 08 (C): ┌ command2 ─────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
09 (C): │ │ 09 (C): │ │
10 (C): │ Waiting to run: command2 │ 10 (C): │ Waiting to run: command2 │