From b2e2b79c3d01c26fbb420006269baa8ab7890dbb Mon Sep 17 00:00:00 2001 From: Eric Nelson Date: Tue, 24 Sep 2024 18:24:24 -0700 Subject: [PATCH] Fix for floating pane not working with rotate_clockwise and rotate_counter_clockwise --- mux/src/tab.rs | 4 ---- wezterm-gui/src/termwindow/render/paint.rs | 12 ++++++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/mux/src/tab.rs b/mux/src/tab.rs index d651e86549b..a55f4b145e2 100644 --- a/mux/src/tab.rs +++ b/mux/src/tab.rs @@ -1116,10 +1116,6 @@ impl TabInner { } } - if let Some(float_pane) = self.get_float_pane() { - panes.push(float_pane); - } - let active_idx = self.active; let zoomed_id = self.zoomed.as_ref().map(|p| p.pane_id()); let root_size = self.size; diff --git a/wezterm-gui/src/termwindow/render/paint.rs b/wezterm-gui/src/termwindow/render/paint.rs index 1b037af284a..442b26dc30b 100644 --- a/wezterm-gui/src/termwindow/render/paint.rs +++ b/wezterm-gui/src/termwindow/render/paint.rs @@ -260,12 +260,12 @@ impl crate::TermWindow { mux::Mux::get().record_focus_for_current_identity(pos.pane.pane_id()); } } - if pos.is_float { - self.paint_pane(&pos, &mut float_layers).context("paint_pane")?; - self.paint_float_border(pos, &mut float_layers).context("paint_float_border")?; - } else { - self.paint_pane(&pos, &mut layers).context("paint_pane")?; - } + self.paint_pane(&pos, &mut layers).context("paint_pane")?; + } + + if let Some(float_pane) = self.get_float_pane_to_render(){ + self.paint_pane(&float_pane, &mut float_layers).context("paint_pane")?; + self.paint_float_border(float_pane, &mut float_layers).context("paint_float_border")?; } if let Some(pane) = self.get_active_pane_or_overlay() {