pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tab): floating panes embed/fullscreen and frame color (#1267)

Browse source 
* fix(tab): floating panes embed/fullscreen and frame color

* style(fmt): rustfmt
This commit is contained in:
Aram Drevekenin 2022-03-24 18:53:54 +01:00 • committed by GitHub
parent 509f236023
commit f5a3d8f301
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
zellij-server/src/panes/tiled_panes/mod.rs
View file

@ -314,12 +314,12 @@ impl TiledPanes {
pub fn has_panes(&self) -> bool { pub fn has_panes(&self) -> bool {
!self.panes.is_empty() !self.panes.is_empty()
} }
pub fn render(&mut self, output: &mut Output) { pub fn render(&mut self, output: &mut Output, floating_panes_are_visible: bool) {
let connected_clients: Vec<ClientId> = let connected_clients: Vec<ClientId> =
{ 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 { let active_panes = if self.session_is_mirrored || floating_panes_are_visible {
HashMap::new() HashMap::new()
} else { } else {
self.active_panes self.active_panes

6
zellij-server/src/tab/mod.rs
View file

@ -554,6 +554,9 @@ impl Tab {
self.connected_clients.borrow().is_empty() self.connected_clients.borrow().is_empty()
} }
pub fn toggle_pane_embed_or_floating(&mut self, client_id: ClientId) { pub fn toggle_pane_embed_or_floating(&mut self, client_id: ClientId) {
if self.tiled_panes.fullscreen_is_active() {
self.tiled_panes.unset_fullscreen();
}
if self.floating_panes.panes_are_visible() { if self.floating_panes.panes_are_visible() {
if let Some(focused_floating_pane_id) = self.floating_panes.active_pane_id(client_id) { if let Some(focused_floating_pane_id) = self.floating_panes.active_pane_id(client_id) {
if self.tiled_panes.has_room_for_new_pane() { if self.tiled_panes.has_room_for_new_pane() {
@ -943,7 +946,8 @@ impl Tab {
); );
self.hide_cursor_and_clear_display_as_needed(output); self.hide_cursor_and_clear_display_as_needed(output);
self.tiled_panes.render(output); self.tiled_panes
.render(output, self.floating_panes.panes_are_visible());
if self.floating_panes.panes_are_visible() && self.floating_panes.has_active_panes() { if self.floating_panes.panes_are_visible() && self.floating_panes.has_active_panes() {
self.floating_panes.render(output); self.floating_panes.render(output);
} }