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.

compatibility test

RoversX47387a900329
diff --git a/wezterm-gui/src/termwindow/render/fancy_tab_bar.rs b/wezterm-gui/src/termwindow/render/fancy_tab_bar.rs
index 18f041f1..7f6410d7 100644
--- a/wezterm-gui/src/termwindow/render/fancy_tab_bar.rs
+++ b/wezterm-gui/src/termwindow/render/fancy_tab_bar.rs
@@ -268,18 +268,32 @@ impl crate::TermWindow {
}
if self.right_sidebar_width() > 0 {
- let new_button_x = action_right.saturating_sub(button_size);
- self.paint_window_tab_new_button(
- layers,
- &mut ui_items,
- new_button_x,
- content_row_y,
- content_row_height,
- button_size,
- icon_size,
- foreground,
- muted_fg,
- )?;
+ let action_button_x = action_right.saturating_sub(button_size);
+ if cfg!(target_os = "macos") {
+ self.paint_window_tab_new_button(
+ layers,
+ &mut ui_items,
+ action_button_x,
+ content_row_y,
+ content_row_height,
+ button_size,
+ icon_size,
+ foreground,
+ muted_fg,
+ )?;
+ } else {
+ self.paint_window_tab_right_sidebar_toggle_button(
+ layers,
+ &mut ui_items,
+ action_button_x,
+ content_row_y,
+ content_row_height,
+ button_size,
+ icon_size,
+ foreground,
+ muted_fg,
+ )?;
+ }
} else {
let right_sidebar_toggle_x = action_right.saturating_sub(button_size);
let new_button_x =
diff --git a/wezterm-gui/src/termwindow/ui/right_sidebar.rs b/wezterm-gui/src/termwindow/ui/right_sidebar.rs
index 9bb18686..f3e45d1f 100644
--- a/wezterm-gui/src/termwindow/ui/right_sidebar.rs
+++ b/wezterm-gui/src/termwindow/ui/right_sidebar.rs
@@ -705,83 +705,86 @@ impl crate::TermWindow {
return Ok(());
}
- let close_button_size = RIGHT_SIDEBAR_CLOSE_BUTTON_SIZE
- .min(top_bar_height)
- .min(content_width)
- .max(1);
- let window_button_reserve = self.right_sidebar_window_button_reserved_width();
- let close_button_right_limit = rect
- .x
- .saturating_add(rect.width)
- .saturating_sub(SIDEBAR_INSET)
- .saturating_sub(close_button_size)
- .saturating_sub(window_button_reserve);
- let close_button_x = content_x
- .saturating_add(content_width)
- .saturating_sub(close_button_size)
- .saturating_add(RIGHT_SIDEBAR_CLOSE_BUTTON_X_ADJUST)
- .min(close_button_right_limit);
- let close_button_y = (top_bar_y + (top_bar_height.saturating_sub(close_button_size)) / 2)
- .saturating_sub(RIGHT_SIDEBAR_CLOSE_BUTTON_Y_ADJUST);
- let close_hovered = self.is_pointer_over_ui_rect(
- close_button_x,
- close_button_y,
- close_button_size,
- close_button_size,
- );
- let close_pressed = close_hovered
- && self.is_pointer_pressing_ui_rect(
+ if cfg!(target_os = "macos") {
+ let close_button_size = RIGHT_SIDEBAR_CLOSE_BUTTON_SIZE
+ .min(top_bar_height)
+ .min(content_width)
+ .max(1);
+ let window_button_reserve = self.right_sidebar_window_button_reserved_width();
+ let close_button_right_limit = rect
+ .x
+ .saturating_add(rect.width)
+ .saturating_sub(SIDEBAR_INSET)
+ .saturating_sub(close_button_size)
+ .saturating_sub(window_button_reserve);
+ let close_button_x = content_x
+ .saturating_add(content_width)
+ .saturating_sub(close_button_size)
+ .saturating_add(RIGHT_SIDEBAR_CLOSE_BUTTON_X_ADJUST)
+ .min(close_button_right_limit);
+ let close_button_y = (top_bar_y
+ + (top_bar_height.saturating_sub(close_button_size)) / 2)
+ .saturating_sub(RIGHT_SIDEBAR_CLOSE_BUTTON_Y_ADJUST);
+ let close_hovered = self.is_pointer_over_ui_rect(
close_button_x,
close_button_y,
close_button_size,
close_button_size,
);
- let close_press_inset = if close_pressed { 1 } else { 0 };
- let close_visual_size = close_button_size.saturating_sub(close_press_inset * 2);
- if close_hovered || close_pressed {
- let close_fill = if close_pressed {
- chrome.control_pressed_bg
- } else {
- chrome.control_hover_bg
- };
- self.fill_rounded_rectangle_with_border(
+ let close_pressed = close_hovered
+ && self.is_pointer_pressing_ui_rect(
+ close_button_x,
+ close_button_y,
+ close_button_size,
+ close_button_size,
+ );
+ let close_press_inset = if close_pressed { 1 } else { 0 };
+ let close_visual_size = close_button_size.saturating_sub(close_press_inset * 2);
+ if close_hovered || close_pressed {
+ let close_fill = if close_pressed {
+ chrome.control_pressed_bg
+ } else {
+ chrome.control_hover_bg
+ };
+ self.fill_rounded_rectangle_with_border(
+ layers,
+ 2,
+ euclid::rect(
+ (close_button_x + close_press_inset) as f32,
+ (close_button_y + close_press_inset) as f32,
+ close_visual_size as f32,
+ close_visual_size as f32,
+ ),
+ close_fill,
+ foreground.mul_alpha(0.58),
+ WINDOW_TAB_ADD_BUTTON_RADIUS,
+ ICON_BUTTON_BORDER_WIDTH,
+ )
+ .context("right sidebar close button")?;
+ }
+ self.ui_items.push(UIItem {
+ x: close_button_x,
+ y: close_button_y,
+ width: close_button_size,
+ height: close_button_size,
+ item_type: UIItemType::RightSidebarToggle,
+ });
+ let close_icon_size = RIGHT_SIDEBAR_CLOSE_ICON_SIZE
+ .min(close_visual_size.saturating_sub(4))
+ .max(1);
+ self.paint_sidebar_icon(
layers,
- 2,
- euclid::rect(
- (close_button_x + close_press_inset) as f32,
- (close_button_y + close_press_inset) as f32,
- close_visual_size as f32,
- close_visual_size as f32,
- ),
- close_fill,
- foreground.mul_alpha(0.58),
- WINDOW_TAB_ADD_BUTTON_RADIUS,
- ICON_BUTTON_BORDER_WIDTH,
- )
- .context("right sidebar close button")?;
+ self.right_sidebar_toggle_icon(),
+ close_button_x
+ + close_press_inset
+ + (close_visual_size.saturating_sub(close_icon_size)) / 2,
+ close_button_y
+ + close_press_inset
+ + (close_visual_size.saturating_sub(close_icon_size)) / 2,
+ close_icon_size,
+ if close_hovered { foreground } else { muted_fg },
+ )?;
}
- self.ui_items.push(UIItem {
- x: close_button_x,
- y: close_button_y,
- width: close_button_size,
- height: close_button_size,
- item_type: UIItemType::RightSidebarToggle,
- });
- let close_icon_size = RIGHT_SIDEBAR_CLOSE_ICON_SIZE
- .min(close_visual_size.saturating_sub(4))
- .max(1);
- self.paint_sidebar_icon(
- layers,
- self.right_sidebar_toggle_icon(),
- close_button_x
- + close_press_inset
- + (close_visual_size.saturating_sub(close_icon_size)) / 2,
- close_button_y
- + close_press_inset
- + (close_visual_size.saturating_sub(close_icon_size)) / 2,
- close_icon_size,
- if close_hovered { foreground } else { muted_fg },
- )?;
let mode_y = top_bar_y + top_bar_height + RIGHT_SIDEBAR_SECTION_GAP;
let mode_height = RIGHT_SIDEBAR_MODE_HEIGHT.min(