Skip to content

A modern terminal with a built-in multiplexer: close it and your sessions keep running. Run shells and tons of AI agents across your machines, then pick them up from desktop, browser, TUI and more. Written in Rust with no UI framework: interface drawn straight on the GPU. No Electron, GPUI or webview.

fix(gui): preserve sidebar hover background beneath window controls

RoversXcbc252c85b05
diff --git a/wezterm-gui/src/termwindow/render/fancy_tab_bar.rs b/wezterm-gui/src/termwindow/render/fancy_tab_bar.rs
index 8673059c..416a9f12 100644
--- a/wezterm-gui/src/termwindow/render/fancy_tab_bar.rs
+++ b/wezterm-gui/src/termwindow/render/fancy_tab_bar.rs
@@ -41,6 +41,7 @@ impl crate::TermWindow {
pub fn paint_fancy_tab_bar(
&mut self,
layers: &mut TripleLayerQuadAllocator,
+ defer_trailing_actions: bool,
) -> anyhow::Result<Vec<UIItem>> {
let chrome = self.chrome();
let row_height = self.tab_bar_pixel_height()?.ceil() as usize;
@@ -273,6 +274,41 @@ impl crate::TermWindow {
.context("fancy tab bar trailing action mask")?;
}
+ if !defer_trailing_actions {
+ ui_items.extend(self.paint_window_tab_trailing_actions(layers)?);
+ }
+
+ Ok(ui_items)
+ }
+
+ pub(crate) fn paint_window_tab_trailing_actions(
+ &self,
+ layers: &mut TripleLayerQuadAllocator,
+ ) -> anyhow::Result<Vec<UIItem>> {
+ let row_height = self.tab_bar_pixel_height()?.ceil() as usize;
+ if row_height == 0 {
+ return Ok(Vec::new());
+ }
+ let border = self.get_os_border();
+ let content_top_spacer = self.ui_px(WINDOW_TAB_TOP_SPACER).min(row_height);
+ let content_row_y = border.top.get() as usize + content_top_spacer;
+ let content_row_height = row_height.saturating_sub(content_top_spacer);
+ let icon_size = self.ui_px(TAB_ICON_SIZE).min(content_row_height);
+ let button_size = content_row_height
+ .saturating_sub(self.ui_px(TAB_VERTICAL_PADDING) * 2)
+ .max(icon_size);
+ let row_x = self.tab_bar_left_edge();
+ let row_width = self
+ .dimensions
+ .pixel_width
+ .saturating_sub(row_x + border.right.get() as usize)
+ .saturating_sub(self.right_sidebar_width())
+ .max(1);
+ let row_right = row_x + row_width;
+ let chrome = self.chrome();
+ let foreground = chrome.text;
+ let muted_fg = chrome.secondary_text;
+ let mut ui_items = Vec::new();
let mut action_right = row_right.saturating_sub(self.ui_px(WINDOW_TAB_INSET) + 2);
if self.fancy_tab_bar_shows_window_buttons() {
let window_button_right = if self.right_sidebar_width() > 0 {
diff --git a/wezterm-gui/src/termwindow/render/paint.rs b/wezterm-gui/src/termwindow/render/paint.rs
index f9bb8811..3e810b74 100644
--- a/wezterm-gui/src/termwindow/render/paint.rs
+++ b/wezterm-gui/src/termwindow/render/paint.rs
@@ -3508,8 +3508,9 @@ impl crate::TermWindow {
return Ok(());
};
let edge = rect.x as f32;
- let top = rect.y as f32;
- let height = rect.height as f32;
+ let top = if cfg!(target_os = "macos") { rect.y } else { 0 };
+ let height = (rect.y + rect.height - top) as f32;
+ let top = top as f32;
let spread = self.ui_f32(16.0);
const STEPS: usize = 8;
const BASE_ALPHA: f32 = 0.22;
@@ -3600,11 +3601,7 @@ impl crate::TermWindow {
let offset_x = hidden * rect.width as f32;
let clip = crate::quad::QuadClipRect::from_top_left_pixels(
0.0,
- if cfg!(target_os = "macos") {
- 0.0
- } else {
- rect.y as f32
- },
+ 0.0,
self.dimensions.pixel_width as f32,
self.dimensions.pixel_height as f32,
&self.dimensions,
@@ -4514,8 +4511,11 @@ impl crate::TermWindow {
.context("paint_right_sidebar")?;
}
- self.paint_tab_bar(&mut chrome_layers)
+ let defer_trailing_actions = !cfg!(target_os = "macos") && right_hover_overlay.is_some();
+ let tab_items = self
+ .paint_fancy_tab_bar(&mut chrome_layers, defer_trailing_actions)
.context("paint_tab_bar")?;
+ self.ui_items.extend(tab_items);
drop(chrome_layers);
if let Some((overlay, hidden, items)) = hover_overlay {
@@ -4553,6 +4553,24 @@ impl crate::TermWindow {
self.paint_right_sidebar_hover_overlay(&overlay, hidden)
.context("paint hover-revealed right sidebar")?;
self.ui_items.extend(items);
+ if !cfg!(target_os = "macos") {
+ // Keep the full-height hover background, with the window
+ // and sidebar buttons above it. Flatten their sub-layers
+ // just like the panel so button fills remain visible too.
+ let mut buttons = HeapQuadAllocator::default();
+ let mut button_layers = TripleLayerQuadAllocator::Heap(&mut buttons);
+ let button_items = self.paint_window_tab_trailing_actions(&mut button_layers)?;
+ let mut layers = layer.quad_allocator();
+ let clip = QuadClipRect::from_top_left_pixels(
+ 0.0,
+ 0.0,
+ self.dimensions.pixel_width as f32,
+ self.dimensions.pixel_height as f32,
+ &self.dimensions,
+ );
+ buttons.apply_to_single_layer(&mut layers, 2, 0.0, clip)?;
+ self.ui_items.extend(button_items);
+ }
} else if self.right_sidebar_hover.is_arming() {
if let Some((zx, zy, zw, zh)) = self.right_sidebar_hover_hot_zone() {
let hint_width =
diff --git a/wezterm-gui/src/termwindow/render/tab_bar.rs b/wezterm-gui/src/termwindow/render/tab_bar.rs
index 0e9fbb66..25a90fb4 100644
--- a/wezterm-gui/src/termwindow/render/tab_bar.rs
+++ b/wezterm-gui/src/termwindow/render/tab_bar.rs
@@ -56,7 +56,7 @@ impl crate::TermWindow {
/// ThinkTerm's window tab row. The wezterm tab bar options configure the
/// terminal bar instead (see `tabbar::TabBarKind`).
pub fn paint_tab_bar(&mut self, layers: &mut TripleLayerQuadAllocator) -> anyhow::Result<()> {
- let mut tab_bar_items = self.paint_fancy_tab_bar(layers)?;
+ let mut tab_bar_items = self.paint_fancy_tab_bar(layers, false)?;
self.ui_items.append(&mut tab_bar_items);
Ok(())
}