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.
Rust agentagent-orchestrationaiai-agentsclaude-codecodexcoding-agentlinuxmacosmultiplayermultiplexerrustterminalterminal-emulatorterminal-multiplexertmuxtuiweztermwindows
Align pane tab sizing and ellipsize long titles
RoversXdf7d6ef9372a
diff --git a/wezterm-gui/src/termwindow/mouseevent.rs b/wezterm-gui/src/termwindow/mouseevent.rsindex 4c76145d..d13b80dd 100644--- a/wezterm-gui/src/termwindow/mouseevent.rs+++ b/wezterm-gui/src/termwindow/mouseevent.rs@@ -1,7 +1,6 @@use crate::frontend::front_end;use crate::tabbar::TabBarItem;use crate::termwindow::content_view::ContentViewId;-use crate::termwindow::ui::pane_nav_bar_height_for_metrics;use crate::termwindow::ui::platform_chrome::WindowTabChromeParams;use crate::termwindow::ui::tokens::{PANE_NAV_BUTTON_GAP, PANE_NAV_INSET, PANE_NAV_TAB_GAP, TAB_ROW_START_PADDING,@@ -88,7 +87,7 @@ const REMOTE_CONNECT_OVERALL_TIMEOUT_SECS: u64 = 20;impl super::TermWindow {pub(crate) fn collapsed_pane_min_cells(&self) -> usize {- let nav_height = pane_nav_bar_height_for_metrics(self.render_metrics);+ let nav_height = self.pane_nav_bar_height();let cell_height = self.render_metrics.cell_size.height.max(1) as usize;nav_height.div_ceil(cell_height).max(2)@@ -316,7 +315,7 @@ impl super::TermWindow {return 0.0;}- let nav_height = pane_nav_bar_height_for_metrics(self.render_metrics);+ let nav_height = self.pane_nav_bar_height();let icon_size = nav_height.saturating_sub(self.ui_px(PANE_NAV_INSET) * 2).clamp(self.ui_px(20), self.ui_px(24));@@ -498,7 +497,7 @@ impl super::TermWindow {let x = event.coords.x as f32;let y = event.coords.y as f32;- let nav_height = pane_nav_bar_height_for_metrics(self.render_metrics) as f32;+ let nav_height = self.pane_nav_bar_height() as f32;for pos in tab.iter_panes_ignoring_zoom() {let content_pane_x =padding_left + border.left.get() as f32 + pos.left as f32 * cell_width;@@ -850,7 +849,7 @@ impl super::TermWindow {+ (pos.left as isize * global_cell_size.width);let pane_top =padding_top as isize + first_line_offset + (pos.top as isize * global_cell_size.height);- let pane_nav_height = pane_nav_bar_height_for_metrics(self.render_metrics) as isize;+ let pane_nav_height = self.pane_nav_bar_height() as isize;let local_x = event.coords.x.sub(pane_left);let local_y = event.coords.y.sub(pane_top + pane_nav_height);diff --git a/wezterm-gui/src/termwindow/render/pane.rs b/wezterm-gui/src/termwindow/render/pane.rsindex 3b2c3e29..db274372 100644--- a/wezterm-gui/src/termwindow/render/pane.rs+++ b/wezterm-gui/src/termwindow/render/pane.rs@@ -8,7 +8,6 @@ use crate::termwindow::render::{RenderScreenLineParams,};use crate::termwindow::ui::icons::SvgIcon;-use crate::termwindow::ui::pane_nav_bar_height_for_metrics;use crate::termwindow::ui::status_icon::{split_leading_legacy_progress_marker, UiStatusKind};use crate::termwindow::ui::tokens::{CAPSULE_BORDER_WIDTH, ICON_BUTTON_BORDER_WIDTH, PANE_NAV_ACTION_BUTTON_RADIUS,@@ -57,8 +56,8 @@ pub(crate) fn client_pane_lag_ms(pane: &dyn mux::pane::Pane) -> Option<u64> {impl crate::TermWindow {/// Height of the nav bar for this pane: the metric height, clamped so/// that at least one terminal row of the pane's cell remains visible.- fn pane_nav_bar_height(&self, pos: &PositionedPane) -> usize {- pane_nav_bar_height_for_metrics(self.render_metrics).min(+ fn pane_nav_bar_height_for_pane(&self, pos: &PositionedPane) -> usize {+ self.pane_nav_bar_height().min(pos.pixel_height.saturating_sub(self.render_metrics.cell_size.height.max(1) as usize),)@@ -99,7 +98,7 @@ impl crate::TermWindow {};let mut height = (pos.height as f32 * self.render_metrics.cell_size.height as f32).max(1.0);if self.collapsed_pane_layouts.contains_key(&pos.pane_stack_id) && pos.top > 0 {- height = height.max(pane_nav_bar_height_for_metrics(self.render_metrics) as f32);+ height = height.max(self.pane_nav_bar_height() as f32);}Ok(euclid::rect(@@ -218,7 +217,7 @@ impl crate::TermWindow {// Draw height is always the metric height: for remote mux panes the// bar overlays the content (it steals no viewport rows), for local// panes the viewport was already shrunk to make room.- let chrome_height = pane_nav_bar_height_for_metrics(self.render_metrics).min(strip_height);+ let chrome_height = self.pane_nav_bar_height().min(strip_height);let icon_size = chrome_height.saturating_sub(self.ui_px(PANE_NAV_INSET) * 2).clamp(self.ui_px(20), self.ui_px(24));@@ -520,7 +519,7 @@ impl crate::TermWindow {return self.paint_collapsed_pane_nav_bar(pos, layers, layout);}- let nav_height = self.pane_nav_bar_height(pos);+ let nav_height = self.pane_nav_bar_height_for_pane(pos);if nav_height == 0 {return Ok(0);}@@ -938,7 +937,8 @@ impl crate::TermWindow {return Ok(());}- self.paint_ui_title_text(layers, font, &metrics, text, x, y, width, foreground)+ let text = self.ellipsize_ui_text(font, text, width)?;+ self.paint_ui_title_text(layers, font, &metrics, &text, x, y, width, foreground)}fn paint_pane_nav_icon(diff --git a/wezterm-gui/src/termwindow/resize.rs b/wezterm-gui/src/termwindow/resize.rsindex 419d8fd9..f7938001 100644--- a/wezterm-gui/src/termwindow/resize.rs+++ b/wezterm-gui/src/termwindow/resize.rs@@ -1,5 +1,4 @@use crate::resize_increment_calculator::ResizeIncrementCalculator;-use crate::termwindow::ui::pane_nav_bar_height_for_metrics;use crate::ui::rescale_ui_usize;use crate::utilsprites::RenderMetrics;use ::window::{Dimensions, ResizeIncrement, Window, WindowOps, WindowState};@@ -278,7 +277,8 @@ impl super::TermWindow {) -> TerminalSize {let cell_width = render_metrics.cell_size.width.max(1) as usize;let cell_height = render_metrics.cell_size.height.max(1) as usize;- let pane_nav_height = pane_nav_bar_height_for_metrics(render_metrics)+ let pane_nav_height = self+ .pane_nav_bar_height().min(pos.pixel_height.saturating_sub(cell_height));let pixel_width = pos.pixel_width.max(cell_width);let pixel_height = posdiff --git a/wezterm-gui/src/termwindow/ui/mod.rs b/wezterm-gui/src/termwindow/ui/mod.rsindex 87972e1d..21f0d6b3 100644--- a/wezterm-gui/src/termwindow/ui/mod.rs+++ b/wezterm-gui/src/termwindow/ui/mod.rs@@ -18,6 +18,17 @@ pub fn pane_nav_bar_height_for_metrics(render_metrics: RenderMetrics) -> usize {cell_height * 2}+impl crate::TermWindow {+ pub(crate) fn pane_nav_bar_height(&self) -> usize {+ let metrics = self+ .fonts+ .title_font_with_size(crate::native_settings::pane_header_font_size())+ .map(|font| RenderMetrics::with_font_metrics(&font.metrics()))+ .unwrap_or(self.render_metrics);+ pane_nav_bar_height_for_metrics(metrics)+ }+}+pub fn terminal_title_for_display(title: &str) -> &str {let title = title.trim();if title.is_empty() || is_default_shell_title(title) {