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
feat(gui): offer only show and auto-hide for the window tab row
RoversX0fccec8d2e5c
diff --git a/thinkterm-i18n/i18n/de-DE.ftl b/thinkterm-i18n/i18n/de-DE.ftlindex 1c3d83a5..a1755627 100644--- a/thinkterm-i18n/i18n/de-DE.ftl+++ b/thinkterm-i18n/i18n/de-DE.ftl@@ -150,10 +150,9 @@ settings-agents-status-description = Wie Agents zeigen, dass sie arbeiten oder asettings-tab-bar-shade = Farbe der Tableistensettings-tab-bar-shade-description = Wie dunkel beide Tableisten sind, in einem durchscheinenden Fenster.settings-window-tabs = Obere Tab-Leiste-settings-window-tabs-description = Automatisch ausblenden: Sie erscheint, wenn der Zeiger am oberen Rand ruht, und schiebt das Terminal nach unten, ohne seine Größe zu ändern; die Stecknadel hält sie fest. Ausgeblendet bleiben die Tabs erhalten: Wechseln Sie per Tastatur oder Befehlspalette.+settings-window-tabs-description = Automatisch ausblenden: Sie erscheint, wenn der Zeiger am oberen Rand ruht, und schiebt das Terminal nach unten, ohne seine Größe zu ändern; die Stecknadel hält sie fest.settings-window-tabs-show = Anzeigensettings-window-tabs-auto-hide = Automatisch-settings-window-tabs-hide = Ausblendensettings-terminal-shade = Farbe des Terminalssettings-terminal-shade-description = Wie dunkel der Hintergrund des Terminals ist, in einem durchscheinenden Fenster.settings-area-shade-dark = Dunkeldiff --git a/thinkterm-i18n/i18n/en-US.ftl b/thinkterm-i18n/i18n/en-US.ftlindex d61bdbe9..06d70581 100644--- a/thinkterm-i18n/i18n/en-US.ftl+++ b/thinkterm-i18n/i18n/en-US.ftl@@ -150,10 +150,9 @@ settings-agents-status-description = How agents show they are working or waitingsettings-tab-bar-shade = Tab bar colorsettings-tab-bar-shade-description = How dark both tab bars are, in a see-through window.settings-window-tabs = Top tab bar-settings-window-tabs-description = Auto-hide brings it down while the pointer rests at the top edge, pushing the terminal down without resizing it; its pin keeps it out. Hidden, the tabs are still there: switch with the keyboard or the command palette.+settings-window-tabs-description = Auto-hide brings it down while the pointer rests at the top edge, pushing the terminal down without resizing it; its pin keeps it out.settings-window-tabs-show = Showsettings-window-tabs-auto-hide = Auto-hide-settings-window-tabs-hide = Hidesettings-terminal-shade = Terminal colorsettings-terminal-shade-description = How dark the terminal's background is, in a see-through window.settings-area-shade-dark = Darkdiff --git a/thinkterm-i18n/i18n/fr-FR.ftl b/thinkterm-i18n/i18n/fr-FR.ftlindex 0f950417..9dfe8494 100644--- a/thinkterm-i18n/i18n/fr-FR.ftl+++ b/thinkterm-i18n/i18n/fr-FR.ftl@@ -150,10 +150,9 @@ settings-agents-status-description = Comment les agents montrent qu'ils travaillsettings-tab-bar-shade = Couleur des barres d'ongletssettings-tab-bar-shade-description = Le ton des deux barres d'onglets, dans une fenêtre transparente.settings-window-tabs = Barre d’onglets du haut-settings-window-tabs-description = Masquage automatique : elle descend quand le pointeur s’arrête en haut de la fenêtre et pousse le terminal vers le bas sans le redimensionner ; l’épingle la garde affichée. Masqués, les onglets restent là : passez de l’un à l’autre au clavier ou par la palette de commandes.+settings-window-tabs-description = Masquage automatique : elle descend quand le pointeur s’arrête en haut de la fenêtre et pousse le terminal vers le bas sans le redimensionner ; l’épingle la garde affichée.settings-window-tabs-show = Affichersettings-window-tabs-auto-hide = Automatique-settings-window-tabs-hide = Masquersettings-terminal-shade = Couleur du terminalsettings-terminal-shade-description = Le ton du fond du terminal, dans une fenêtre transparente.settings-area-shade-dark = Sombrediff --git a/thinkterm-i18n/i18n/ja-JP.ftl b/thinkterm-i18n/i18n/ja-JP.ftlindex b743e447..7b0592d1 100644--- a/thinkterm-i18n/i18n/ja-JP.ftl+++ b/thinkterm-i18n/i18n/ja-JP.ftl@@ -147,10 +147,9 @@ settings-agents-status-description = エージェントが作業中・返事待settings-tab-bar-shade = タブバーの色settings-tab-bar-shade-description = 2 段のタブバーの濃さ。ウインドウが透けているときに効きます。settings-window-tabs = 上段のタブバー-settings-window-tabs-description = 自動的に隠す:ポインターをウインドウの上端に置くと現れ、ターミナルをサイズを変えずに下へ押し下げます。右端のピンで固定できます。隠してもタブは残っており、キーボードやコマンドパレットで切り替えられます。+settings-window-tabs-description = 自動的に隠す:ポインターをウインドウの上端に置くと現れ、ターミナルをサイズを変えずに下へ押し下げます。右端のピンで固定できます。settings-window-tabs-show = 表示settings-window-tabs-auto-hide = 自動的に隠す-settings-window-tabs-hide = 隠すsettings-terminal-shade = ターミナルの色settings-terminal-shade-description = ターミナルの背景の濃さ。ウインドウが透けているときに効きます。settings-area-shade-dark = 濃いdiff --git a/thinkterm-i18n/i18n/zh-CN.ftl b/thinkterm-i18n/i18n/zh-CN.ftlindex db701423..b4c37270 100644--- a/thinkterm-i18n/i18n/zh-CN.ftl+++ b/thinkterm-i18n/i18n/zh-CN.ftl@@ -147,10 +147,9 @@ settings-agents-status-description = agent 在干活、等你回复时怎么显settings-tab-bar-shade = 标签栏颜色settings-tab-bar-shade-description = 两行标签栏的深浅,窗口透明时生效。settings-window-tabs = 一级标签栏-settings-window-tabs-description = 自动隐藏:鼠标停在窗口顶部边缘时滑出来,把终端整体往下推、不改变大小;点右边的图钉可以固定住。隐藏后标签都还在,用快捷键或命令面板切换。+settings-window-tabs-description = 自动隐藏:鼠标停在窗口顶部边缘时滑出来,把终端整体往下推、不改变大小;点右边的图钉可以固定住。settings-window-tabs-show = 显示settings-window-tabs-auto-hide = 自动隐藏-settings-window-tabs-hide = 隐藏settings-terminal-shade = 终端颜色settings-terminal-shade-description = 终端底色的深浅,窗口透明时生效。settings-area-shade-dark = 深diff --git a/wezterm-gui/src/native_settings.rs b/wezterm-gui/src/native_settings.rsindex a60ea31c..ab721729 100644--- a/wezterm-gui/src/native_settings.rs+++ b/wezterm-gui/src/native_settings.rs@@ -465,14 +465,14 @@ impl NativeBottomQuoteMode {/// its height back to the terminal and brings it down over the top of the/// window while the pointer rests at the top edge, pushing the terminal/// area down rather than resizing it; its pin keeps it out-/// (`window_tabs_pinned`). `Hide` leaves it out altogether, the tabs still-/// there behind the keyboard and the command palette.+/// (`window_tabs_pinned`). A file that chose to hide it outright, a choice+/// since withdrawn, has it auto-hide.#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Deserialize, Serialize)]#[serde(rename_all = "snake_case")]pub(crate) enum NativeWindowTabs {Show,+ #[serde(alias = "hide")]AutoHide,- Hide,}impl Default for NativeWindowTabs {@@ -483,7 +483,7 @@ impl Default for NativeWindowTabs {impl NativeWindowTabs {/// Every choice, in the order the settings window offers them.- pub(crate) const ALL: [Self; 3] = [Self::Show, Self::AutoHide, Self::Hide];+ pub(crate) const ALL: [Self; 2] = [Self::Show, Self::AutoHide];}#[derive(Debug, Clone, Default, Deserialize, Serialize)]@@ -3580,7 +3580,6 @@ mod tests {for (written, expected) in [("show", NativeWindowTabs::Show),("auto_hide", NativeWindowTabs::AutoHide),- ("hide", NativeWindowTabs::Hide),] {let json = format!(r#"{{"appearance": {{"window_tabs": "{written}"}}}}"#);let settings: ThinkTermNativeSettings =@@ -3597,6 +3596,18 @@ mod tests {}}+ /// Hiding the row outright was offered for a while; a file that chose+ /// it has the row auto-hide, and says so when saved.+ #[test]+ fn a_window_tabs_choice_to_hide_reads_as_auto_hide() {+ let json = r#"{"appearance": {"window_tabs": "hide"}}"#;+ let settings: ThinkTermNativeSettings =+ serde_json::from_str(json).expect("the file has to survive");+ assert_eq!(settings.appearance.window_tabs, NativeWindowTabs::AutoHide);+ let out = serde_json::to_string(&settings).expect("serialises");+ assert!(out.contains("\"window_tabs\":\"auto_hide\""), "{out}");+ }+#[test]fn a_cursor_shape_choice_round_trips_through_the_file() {for (written, expected) in [diff --git a/wezterm-gui/src/settings_window.rs b/wezterm-gui/src/settings_window.rsindex b37eff63..516a5a52 100644--- a/wezterm-gui/src/settings_window.rs+++ b/wezterm-gui/src/settings_window.rs@@ -1164,7 +1164,6 @@ impl SettingsSection {"Tab Bar","Top Tab Bar","Auto-hide",- "Hide Tabs","Effective Color Scheme","App Icon","Window Opacity",@@ -1796,7 +1795,6 @@ fn localized_window_tabs_label(mode: crate::native_settings::NativeWindowTabs) -crate::i18n::tr(match mode {NativeWindowTabs::Show => "settings-window-tabs-show",NativeWindowTabs::AutoHide => "settings-window-tabs-auto-hide",- NativeWindowTabs::Hide => "settings-window-tabs-hide",})}@@ -19219,7 +19217,7 @@ impl SettingsWindow {}}- /// Show, auto-hide or hide the window tab row, in every window. Choosing+ /// Show the window tab row or have it auto-hide, in every window. Choosing/// auto-hide here starts with the pin out: it is what was asked for.fn apply_window_tabs(&mut self, mode: crate::native_settings::NativeWindowTabs) {self.ui.open_dropdown = None;diff --git a/wezterm-gui/src/termwindow/window_tab_reveal.rs b/wezterm-gui/src/termwindow/window_tab_reveal.rsindex 77a7daee..2e19dc8b 100644--- a/wezterm-gui/src/termwindow/window_tab_reveal.rs+++ b/wezterm-gui/src/termwindow/window_tab_reveal.rs@@ -1,7 +1,7 @@-//! The window tab row when it does not keep its place: hidden outright, or-//! brought down from the top edge while the pointer rests there.+//! The window tab row when it auto-hides: out of the layout, and brought+//! down from the top edge while the pointer rests there.//!-//! Hidden, the row gives its height back to the terminal. Brought down, it+//! Away, the row gives its height back to the terminal. Brought down, it//! comes in over the window's top and pushes the terminal area down by the//! same amount -- painted lower, never resized, so nothing reflows and the//! last line or two drop out of view until it goes again. The hover is the@@ -73,18 +73,6 @@ fn row_in_layout(mode: NativeWindowTabs, pinned: bool) -> bool {match mode {NativeWindowTabs::Show => true,NativeWindowTabs::AutoHide => pinned,- NativeWindowTabs::Hide => false,- }-}--/// Whether the top edge may bring the row down. A hidden row comes down-/// only while it holds the window's own buttons: they have nowhere else to-/// be, and a window that cannot be closed is worse than a row that shows.-fn row_may_reveal(mode: NativeWindowTabs, pinned: bool, carries_window_buttons: bool) -> bool {- match mode {- NativeWindowTabs::Show => false,- NativeWindowTabs::AutoHide => !pinned,- NativeWindowTabs::Hide => carries_window_buttons,}}@@ -169,12 +157,6 @@ impl TermWindow {}])}- /// The window's own minimise, maximise and close buttons are on the row,- /// as they are with integrated buttons and the right sidebar closed.- fn window_tab_row_carries_window_buttons(&self) -> bool {- self.fancy_tab_bar_shows_window_buttons() && self.right_sidebar_width() == 0- }-/// A tab of the row is being renamed in place, which needs the row out.fn renaming_window_tab(&self) -> bool {self.inline_tab_rename@@ -202,11 +184,8 @@ impl TermWindow {// whatever the mode. Unlike the sidebars, a terminal that is// connecting or offline does not hold the row back: it is the way// to another tab.- let eligible = (row_may_reveal(- self.window_tab_reveal.mode,- self.window_tab_reveal.pinned,- self.window_tab_row_carries_window_buttons(),- ) || self.renaming_window_tab()+ let eligible = (!self.window_tab_reveal.in_layout()+ || self.renaming_window_tab()|| presented)&& self.tab_bar_pixel_height().unwrap_or(0.0) > 0.0&& !self.content_view_is_full_window()@@ -280,7 +259,7 @@ impl TermWindow {let (mode, pinned) = crate::native_settings::window_tabs_choice();self.window_tab_reveal.mode = mode;self.window_tab_reveal.pinned = pinned;- if !row_may_reveal(mode, pinned, self.window_tab_row_carries_window_buttons()) {+ if self.window_tab_reveal.in_layout() {self.window_tab_reveal.cancel();}if before != self.window_tab_reveal.in_layout() {@@ -343,15 +322,5 @@ mod tests {assert!(row_in_layout(NativeWindowTabs::Show, false));assert!(row_in_layout(NativeWindowTabs::AutoHide, true));assert!(!row_in_layout(NativeWindowTabs::AutoHide, false));- assert!(!row_in_layout(NativeWindowTabs::Hide, false));- }-- #[test]- fn a_hidden_row_comes_down_only_for_the_window_buttons() {- assert!(row_may_reveal(NativeWindowTabs::AutoHide, false, false));- assert!(!row_may_reveal(NativeWindowTabs::AutoHide, true, false));- assert!(!row_may_reveal(NativeWindowTabs::Show, false, true));- assert!(!row_may_reveal(NativeWindowTabs::Hide, false, false));- assert!(row_may_reveal(NativeWindowTabs::Hide, false, true));}}