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

fix(ux): only damage the relevant swap layout layer when resizing panes (#3654)

Browse source
This commit is contained in:
Aram Drevekenin 2024-10-09 12:21:06 +02:00 • committed by GitHub
parent b71959e9f9
commit 8a8ffb37be
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2312,19 +2312,20 @@ impl Tab {
} }
pub fn resize(&mut self, client_id: ClientId, strategy: ResizeStrategy) -> Result<()> { pub fn resize(&mut self, client_id: ClientId, strategy: ResizeStrategy) -> Result<()> {
let err_context = || format!("unable to resize pane"); let err_context = || format!("unable to resize pane");
self.swap_layouts.set_is_floating_damaged();
self.swap_layouts.set_is_tiled_damaged();
if self.floating_panes.panes_are_visible() { if self.floating_panes.panes_are_visible() {
let successfully_resized = self let successfully_resized = self
.floating_panes .floating_panes
.resize_active_pane(client_id, &mut self.os_api, &strategy) .resize_active_pane(client_id, &mut self.os_api, &strategy)
.with_context(err_context)?; .with_context(err_context)?;
if successfully_resized { if successfully_resized {
self.swap_layouts.set_is_floating_damaged();
self.set_force_render(); // we force render here to make sure the panes under the floating pane render and don't leave "garbage" in case of a decrease self.set_force_render(); // we force render here to make sure the panes under the floating pane render and don't leave "garbage" in case of a decrease
} }
} else { } else {
match self.tiled_panes.resize_active_pane(client_id, &strategy) { match self.tiled_panes.resize_active_pane(client_id, &strategy) {
Ok(_) => {}, Ok(_) => {
self.swap_layouts.set_is_tiled_damaged();
},
Err(err) => match err.downcast_ref::<ZellijError>() { Err(err) => match err.downcast_ref::<ZellijError>() {
Some(ZellijError::CantResizeFixedPanes { pane_ids }) => { Some(ZellijError::CantResizeFixedPanes { pane_ids }) => {
let mut pane_ids_to_error = vec![]; let mut pane_ids_to_error = vec![];