Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix colored pane frames in mirrored sessions #2625

Merged
merged 3 commits into from
Jul 16, 2023
Merged

Fix colored pane frames in mirrored sessions #2625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5361ec8
server/panes/tiled: Fix colored frames
har7an Jul 13, 2023
f696647
CHANGELOG: Add PR #2625
har7an Jul 13, 2023
1f3716d
server/tab/unit: Fix unit tests for server.
har7an Jul 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
* 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): colored paneframes in mirrored sessions (https://github.com/zellij-org/zellij/pull/2625)

## [0.37.2] - 2023-06-20
* hotfix: include theme files into binary (https://github.com/zellij-org/zellij/pull/2566)
Expand Down
2 changes: 1 addition & 1 deletion zellij-server/src/panes/tiled_panes/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ impl TiledPanes {
{ self.connected_clients.borrow().iter().copied().collect() };
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 active_panes = if self.session_is_mirrored || floating_panes_are_visible {
let active_panes = if floating_panes_are_visible {
HashMap::new()
} else {
self.active_panes
Expand Down
3 changes: 1 addition & 2 deletions ...s/zellij_server__tab__tab_integration_tests__base_layout_is_included_in_swap_layouts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
source: zellij-server/src/tab/./unit/tab_integration_tests.rs
assertion_line: 4762
expression: snapshot
---
00 (C): I am a tab bar
Expand All @@ -20,7 +19,7 @@ expression: snapshot
14 (C): │ ││ ││ │
15 (C): │ ││ ││ │
16 (C): │ ││ ││ │
17 (C): └───────────────────────────────────────┘└──────────────────────────────────────┘└──────────────────────────────────────┘
17 (C): └───────────────────────────────────────┘└──────────────────────────────────────┘└─ <ENTER> to run, <Ctrl-c> to exit ───┘
18 (C): I am a
19 (C): status bar

3 changes: 1 addition & 2 deletions ...server__tab__tab_integration_tests__layout_with_plugins_and_commands_swaped_properly.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
source: zellij-server/src/tab/./unit/tab_integration_tests.rs
assertion_line: 4992
expression: snapshot
---
00 (C): I am a
Expand All @@ -10,7 +9,7 @@ expression: snapshot
04 (C): │ Waiting to run: command1 │
05 (C): │ │
06 (C): │ <ENTER> to run, <Ctrl-c> to exit │
07 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
07 (C): └─ <ENTER> to run, <Ctrl-c> to exit ────────────────────────────────────────────────────────────────────────────────────┘
08 (C): ┌ command2 ─────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
09 (C): │ │
10 (C): │ Waiting to run: command2 │
Expand Down
3 changes: 1 addition & 2 deletions ...tegration_tests__swap_layouts_not_including_command_panes_present_in_existing_layout.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
source: zellij-server/src/tab/./unit/tab_integration_tests.rs
assertion_line: 4904
expression: snapshot
---
00 (C): I am a
Expand All @@ -16,7 +15,7 @@ expression: snapshot
10 (C): │ Waiting to run: command1 │
11 (C): │ │
12 (C): │ <ENTER> to run, <Ctrl-c> to exit │
13 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
13 (C): └─ <ENTER> to run, <Ctrl-c> to exit ────────────────────────────────────────────────────────────────────────────────────┘
14 (C): ┌ command2 ─────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
15 (C): │ Waiting to run: command2 │
16 (C): │ │
Expand Down
3 changes: 1 addition & 2 deletions ...ntegration_tests__swap_layouts_not_including_plugin_panes_present_in_existing_layout.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
source: zellij-server/src/tab/./unit/tab_integration_tests.rs
assertion_line: 5035
expression: snapshot
---
00 (C): ┌ Pane #2 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
Expand All @@ -10,7 +9,7 @@ expression: snapshot
04 (C): │ Waiting to run: command1 │
05 (C): │ │
06 (C): │ <ENTER> to run, <Ctrl-c> to exit │
07 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
07 (C): └─ <ENTER> to run, <Ctrl-c> to exit ────────────────────────────────────────────────────────────────────────────────────┘
08 (C): ┌ command2 ─────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
09 (C): │ │
10 (C): │ Waiting to run: command2 │
Expand Down