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.

feat(gui): show the sidebar add buttons' circles only under the pointer

RoversX6641d7636e69
diff --git a/thinkterm-i18n/i18n/de-DE.ftl b/thinkterm-i18n/i18n/de-DE.ftl
index e8366d92..87491866 100644
--- a/thinkterm-i18n/i18n/de-DE.ftl
+++ b/thinkterm-i18n/i18n/de-DE.ftl
@@ -1791,6 +1791,10 @@ share-pill-expired = Die Freigabe ist abgelaufen · Schließen
share-pill-closed = Das geteilte Terminal wurde geschlossen · Schließen
settings-section-share-sync = Teilen & Synchronisieren
settings-section-privacy = Berechtigungen
+settings-section-accessibility = Bedienungshilfen
+settings-accessibility-heading = Anzeige
+settings-button-shapes = Tastenformen anzeigen
+settings-button-shapes-description = Die Hinzufügen-Tasten in der Seitenleiste zeigen immer ihren runden Hintergrund. Ist dies aus, erscheint er erst, wenn der Zeiger darüber ist.
settings-share-sync-description = Lassen Sie andere Konten auf diesem Rechner Ihren Terminals zusehen.
settings-sharing = Terminals teilen
settings-sharing-description = Eingeschaltet haben Terminals einen Teilen-Knopf, und die Seitenleiste zeigt, was andere mit Ihnen teilen. Andere sehen nur zu; zum Tippen fragen sie an, und Sie entscheiden. Ausschalten beendet Ihre laufenden Freigaben.
diff --git a/thinkterm-i18n/i18n/en-US.ftl b/thinkterm-i18n/i18n/en-US.ftl
index 0078df49..fab43287 100644
--- a/thinkterm-i18n/i18n/en-US.ftl
+++ b/thinkterm-i18n/i18n/en-US.ftl
@@ -1791,6 +1791,10 @@ share-pill-expired = The share ran out · Close
share-pill-closed = The shared terminal closed · Close
settings-section-share-sync = Share & Sync
settings-section-privacy = Permissions
+settings-section-accessibility = Accessibility
+settings-accessibility-heading = Display
+settings-button-shapes = Show button shapes
+settings-button-shapes-description = The sidebar's add buttons always show their round background. When this is off, it appears when the pointer is over them.
settings-share-sync-description = Let other accounts on this machine watch your terminals.
settings-sharing = Share terminals
settings-sharing-description = When on, terminals have a share button, and the sidebar lists what others share with you. Others can only watch; to type, they ask and you decide. Turning it off stops what you share.
diff --git a/thinkterm-i18n/i18n/fr-FR.ftl b/thinkterm-i18n/i18n/fr-FR.ftl
index 2ece4f91..304e1e6b 100644
--- a/thinkterm-i18n/i18n/fr-FR.ftl
+++ b/thinkterm-i18n/i18n/fr-FR.ftl
@@ -1785,6 +1785,10 @@ share-pill-expired = Le partage a expiré · Fermer
share-pill-closed = Le terminal partagé s'est fermé · Fermer
settings-section-share-sync = Partage et synchronisation
settings-section-privacy = Autorisations
+settings-section-accessibility = Accessibilité
+settings-accessibility-heading = Affichage
+settings-button-shapes = Afficher la forme des boutons
+settings-button-shapes-description = Les boutons d’ajout de la barre latérale gardent toujours leur fond rond. Quand c’est désactivé, il n’apparaît qu’au survol du pointeur.
settings-share-sync-description = Laissez d'autres comptes de cette machine regarder vos terminaux.
settings-sharing = Partager les terminaux
settings-sharing-description = Activé, les terminaux ont un bouton de partage et la barre latérale liste ce que d'autres partagent avec vous. Les autres ne font que regarder ; pour taper, ils le demandent et vous décidez. Le désactiver arrête vos partages en cours.
diff --git a/thinkterm-i18n/i18n/ja-JP.ftl b/thinkterm-i18n/i18n/ja-JP.ftl
index 231a001a..e1be9275 100644
--- a/thinkterm-i18n/i18n/ja-JP.ftl
+++ b/thinkterm-i18n/i18n/ja-JP.ftl
@@ -1739,6 +1739,10 @@ share-pill-expired = 共有の時間が終わりました · 閉じる
share-pill-closed = 共有されていたターミナルが閉じました · 閉じる
settings-section-share-sync = 共有と同期
settings-section-privacy = 権限
+settings-section-accessibility = アクセシビリティ
+settings-accessibility-heading = 表示
+settings-button-shapes = ボタンの形状を表示
+settings-button-shapes-description = サイドバーの追加ボタンに丸い背景を常に表示します。オフのときは、ポインタを重ねたときだけ表示されます。
settings-share-sync-description = このマシンの他のアカウントにターミナルを見せます。
settings-sharing = ターミナルを共有
settings-sharing-description = オンにすると、ターミナルに共有ボタンが付き、サイドバーに共有されたターミナルが表示されます。相手は見るだけで、入力するには申請してあなたが許可します。オフにすると共有中のものは止まります。
diff --git a/thinkterm-i18n/i18n/ru-RU.ftl b/thinkterm-i18n/i18n/ru-RU.ftl
index 5dff6dd5..a29900d8 100644
--- a/thinkterm-i18n/i18n/ru-RU.ftl
+++ b/thinkterm-i18n/i18n/ru-RU.ftl
@@ -1706,6 +1706,10 @@ share-pill-expired = Срок доступа истёк · Закрыть
share-pill-closed = Общий терминал закрыт · Закрыть
settings-section-share-sync = Общий доступ и синхронизация
settings-section-privacy = Разрешения
+settings-section-accessibility = Универсальный доступ
+settings-accessibility-heading = Отображение
+settings-button-shapes = Показывать формы кнопок
+settings-button-shapes-description = Кнопки добавления на боковой панели всегда показывают круглый фон. Если выключено, он появляется только при наведении указателя.
settings-share-sync-description = Разрешить другим учётным записям этого компьютера смотреть ваши терминалы.
settings-sharing = Общий доступ к терминалам
settings-sharing-description = Добавляет кнопку общего доступа и список доступных вам терминалов сбоку. Другие могут только смотреть; для ввода запрашивают ваше разрешение. Выключение закрывает предоставленный вами доступ.
diff --git a/thinkterm-i18n/i18n/zh-CN.ftl b/thinkterm-i18n/i18n/zh-CN.ftl
index c7888e79..6c026eba 100644
--- a/thinkterm-i18n/i18n/zh-CN.ftl
+++ b/thinkterm-i18n/i18n/zh-CN.ftl
@@ -1739,6 +1739,10 @@ share-pill-expired = 分享到时间了 · 关闭
share-pill-closed = 分享的终端已关闭 · 关闭
settings-section-share-sync = 共享与同步
settings-section-privacy = 权限
+settings-section-accessibility = 辅助功能
+settings-accessibility-heading = 显示
+settings-button-shapes = 显示按钮形状
+settings-button-shapes-description = 侧栏的添加按钮始终显示圆形底。关闭后,鼠标移到按钮上才显示。
settings-share-sync-description = 让这台机器上的其他账户看你的终端。
settings-sharing = 分享终端
settings-sharing-description = 打开后,终端右上角会有分享按钮,侧栏会列出别人分享给你的终端。对方只能看,要打字得你同意。关掉会停止你正在进行的分享。
diff --git a/wezterm-gui/src/native_settings.rs b/wezterm-gui/src/native_settings.rs
index 0b036bba..be78e4d2 100644
--- a/wezterm-gui/src/native_settings.rs
+++ b/wezterm-gui/src/native_settings.rs
@@ -2132,6 +2132,15 @@ pub(crate) use thinkterm_tab_icons::{
TabIconCard as NativeTabIconCard, TabIconSettings as NativeTabIconSettings,
};
+/// Settings › Accessibility.
+#[derive(Debug, Clone, Default, Deserialize, Serialize)]
+#[serde(default)]
+pub(crate) struct NativeAccessibilitySettings {
+ /// The sidebar's add buttons keep their circle when the pointer is not
+ /// over them.
+ pub(crate) show_button_shapes: bool,
+}
+
#[derive(Debug, Clone, Deserialize, Serialize)]
#[serde(default)]
pub(crate) struct ThinkTermNativeSettings {
@@ -2151,6 +2160,7 @@ pub(crate) struct ThinkTermNativeSettings {
pub(crate) tab_icons: NativeTabIconSettings,
pub(crate) sharing: NativeSharingSettings,
pub(crate) agents: NativeAgentsSettings,
+ pub(crate) accessibility: NativeAccessibilitySettings,
}
impl Default for ThinkTermNativeSettings {
@@ -2172,6 +2182,7 @@ impl Default for ThinkTermNativeSettings {
tab_icons: NativeTabIconSettings::default(),
sharing: NativeSharingSettings::default(),
agents: NativeAgentsSettings::default(),
+ accessibility: NativeAccessibilitySettings::default(),
}
}
}
@@ -3213,6 +3224,10 @@ pub(crate) fn right_sidebar_open_with_app() -> Option<NativeOpenWithApp> {
load().chrome.right_sidebar_open_with_app
}
+pub(crate) fn show_button_shapes() -> bool {
+ load_shared().accessibility.show_button_shapes
+}
+
pub(crate) fn sidebar_thread_icons() -> NativeThreadIcons {
load_shared().appearance.sidebar_thread_icons
}
diff --git a/wezterm-gui/src/settings_window.rs b/wezterm-gui/src/settings_window.rs
index 6fd5cb22..f26aef5f 100644
--- a/wezterm-gui/src/settings_window.rs
+++ b/wezterm-gui/src/settings_window.rs
@@ -932,6 +932,7 @@ enum SettingsSection {
Keymap,
CommandPalette,
Import,
+ Accessibility,
Developer,
UiKit,
Memory,
@@ -955,6 +956,7 @@ const BASE_SECTIONS: &[SettingsSection] = &[
SettingsSection::Keymap,
SettingsSection::CommandPalette,
SettingsSection::Import,
+ SettingsSection::Accessibility,
SettingsSection::Developer,
SettingsSection::Backup,
SettingsSection::Update,
@@ -1021,6 +1023,7 @@ fn initial_section() -> SettingsSection {
let section = match name.as_str() {
"general" => SettingsSection::General,
"appearance" => SettingsSection::Appearance,
+ "accessibility" => SettingsSection::Accessibility,
"tabicons" | "tab-icons" | "tab_icons" => SettingsSection::TabIcons,
"sidebar" => SettingsSection::Sidebar,
"terminal" => SettingsSection::Terminal,
@@ -1059,6 +1062,7 @@ impl SettingsSection {
match self {
Self::General => crate::i18n::tr("settings-section-general"),
Self::Appearance => crate::i18n::tr("settings-section-appearance"),
+ Self::Accessibility => crate::i18n::tr("settings-section-accessibility"),
Self::TabIcons => crate::i18n::tr("settings-section-tab-icons"),
Self::Sidebar => crate::i18n::tr("settings-section-sidebar"),
Self::Terminal => crate::i18n::tr("settings-section-terminal"),
@@ -1085,6 +1089,7 @@ impl SettingsSection {
match self {
Self::General => SettingsIcon::General,
Self::Appearance => SettingsIcon::Appearance,
+ Self::Accessibility => SettingsIcon::Accessibility,
Self::TabIcons => SettingsIcon::TabIcons,
Self::Sidebar => SettingsIcon::Sidebar,
Self::Terminal => SettingsIcon::Terminal,
@@ -1113,6 +1118,7 @@ impl SettingsSection {
match self {
Self::General => TileColor::Gray,
Self::Appearance => TileColor::Purple,
+ Self::Accessibility => TileColor::Blue,
Self::TabIcons => TileColor::Pink,
Self::Sidebar => TileColor::Blue,
Self::Terminal => TileColor::Slate,
@@ -1201,6 +1207,7 @@ impl SettingsSection {
"Logo",
"Agent",
],
+ Self::Accessibility => &["Accessibility", "Button Shapes", "Buttons", "Hover"],
Self::Appearance => &[
"Theme Mode",
"Tab Bar",
@@ -1429,6 +1436,10 @@ impl SettingsSection {
&& ["settings-language", "settings-restore-pane-output"]
.iter()
.any(|key| crate::i18n::tr(key).to_lowercase().contains(query)))
+ || (self == Self::Accessibility
+ && crate::i18n::tr("settings-button-shapes")
+ .to_lowercase()
+ .contains(query))
|| (self == Self::Privacy
&& [
"settings-privacy-heading",
@@ -2371,6 +2382,7 @@ enum SettingsAction {
SetCursorBlink(crate::native_settings::NativeCursorBlink),
SetCursorShape(crate::native_settings::NativeCursorShape),
ToggleOverlayScrollbar,
+ ToggleButtonShapes,
ToggleSplitAnimation,
SetBottomQuoteMode(NativeBottomQuoteMode),
DecreaseBottomQuoteFontSize,
@@ -7040,6 +7052,30 @@ impl SettingsWindow {
};
self.save_and_apply_bottom_quote_settings(status);
}
+ SettingsAction::ToggleButtonShapes => {
+ self.ui.open_dropdown = None;
+ let shapes = !self.native_settings.accessibility.show_button_shapes;
+ self.native_settings.accessibility.show_button_shapes = shapes;
+ let setting = crate::i18n::tr("settings-button-shapes");
+ match crate::native_settings::save(&self.native_settings) {
+ Ok(()) => {
+ if let Some(front_end) = crate::frontend::try_front_end() {
+ front_end.invalidate_all_windows();
+ }
+ let value = if shapes { "common-on" } else { "common-off" };
+ self.status = settings_tr(
+ "settings-status-value-now",
+ &[("setting", setting), ("value", crate::i18n::tr(value))],
+ );
+ }
+ Err(err) => {
+ self.status = settings_tr(
+ "settings-status-save-error",
+ &[("setting", setting), ("error", format!("{err:#}"))],
+ );
+ }
+ }
+ }
SettingsAction::ToggleOverlayScrollbar => {
self.ui.open_dropdown = None;
self.native_settings.terminal.overlay_scrollbar =
@@ -8863,6 +8899,7 @@ impl SettingsWindow {
SettingsSection::Web => self.paint_web(layers, x, max_width)?,
SettingsSection::ShareSync => self.paint_share_sync(layers, x, max_width)?,
SettingsSection::Privacy => self.paint_privacy(layers, x, max_width)?,
+ SettingsSection::Accessibility => self.paint_accessibility(layers, x, max_width)?,
// Never selected: picking it opens Remote Hosts instead.
SettingsSection::Tailscale => {}
SettingsSection::Archived => self.paint_archived(layers, x, max_width)?,
@@ -14119,6 +14156,60 @@ impl SettingsWindow {
);
}
+ fn paint_accessibility(
+ &mut self,
+ layers: &mut TripleLayerQuadAllocator<'_>,
+ x: f32,
+ max_width: f32,
+ ) -> anyhow::Result<()> {
+ let palette = self.palette();
+ let body_font = Rc::clone(&self.body_font);
+ let scroll = self.ui.content_scroll.offset;
+ let section_y = self.ui_px(CONTENT_SECTION_Y) - scroll;
+ let card_padding = self.ui_px(36.0);
+ let row_x = x + card_padding;
+ let row_width = max_width - card_padding * 2.0;
+
+ self.draw_text(
+ layers,
+ &body_font,
+ x,
+ section_y,
+ &crate::i18n::tr("settings-accessibility-heading"),
+ palette.muted_text,
+ max_width,
+ )?;
+ let (card_y, _) = self.settings_card_geometry(section_y, 0);
+ let bottom = self.paint_card(layers, x, card_y, max_width, |this, layers, top| {
+ let mut rows = RowCursor::new(top, this);
+ let (tx, tw) = this.paint_row_tile(
+ layers,
+ row_x,
+ rows.y,
+ row_width,
+ SvgIcon::CirclePlus,
+ TileColor::Blue,
+ )?;
+ rows.add(this.paint_toggle_setting_row(
+ layers,
+ tx,
+ rows.y,
+ tw,
+ &crate::i18n::tr("settings-button-shapes"),
+ &crate::i18n::tr("settings-button-shapes-description"),
+ this.native_settings.accessibility.show_button_shapes,
+ SettingsAction::ToggleButtonShapes,
+ rows.rule(),
+ )?);
+ Ok(rows.bottom)
+ })?;
+ self.ui.content_scroll.set_extents(
+ self.content_viewport_extent(),
+ self.settings_content_extent(bottom + scroll),
+ );
+ Ok(())
+ }
+
fn paint_terminal(
&mut self,
layers: &mut TripleLayerQuadAllocator<'_>,
diff --git a/wezterm-gui/src/termwindow/ui/icons.rs b/wezterm-gui/src/termwindow/ui/icons.rs
index 1594a194..923dce03 100644
--- a/wezterm-gui/src/termwindow/ui/icons.rs
+++ b/wezterm-gui/src/termwindow/ui/icons.rs
@@ -78,6 +78,7 @@ pub enum SvgIcon {
PanelRightOpen,
Package,
Pencil,
+ PersonStanding,
Pin,
PinOff,
Pipette,
@@ -358,6 +359,9 @@ impl SvgIcon {
include_bytes!("../../../../third_party/lucide/icons/panel-right-open.svg")
}
Self::Pencil => include_bytes!("../../../../third_party/lucide/icons/pencil.svg"),
+ Self::PersonStanding => {
+ include_bytes!("../../../../third_party/lucide/icons/person-standing.svg")
+ }
Self::Package => include_bytes!("../../../../third_party/lucide/icons/package.svg"),
Self::Pin => include_bytes!("../../../../third_party/lucide/icons/pin.svg"),
Self::PinOff => include_bytes!("../../../../third_party/lucide/icons/pin-off.svg"),
@@ -962,6 +966,7 @@ mod tests {
SvgIcon::Minimize2,
SvgIcon::NotebookTabs,
SvgIcon::Palette,
+ SvgIcon::PersonStanding,
SvgIcon::PanelLeft,
SvgIcon::PanelLeftClose,
SvgIcon::PanelLeftOpen,
diff --git a/wezterm-gui/src/termwindow/ui/sidebar.rs b/wezterm-gui/src/termwindow/ui/sidebar.rs
index e674d8c1..398fc82c 100644
--- a/wezterm-gui/src/termwindow/ui/sidebar.rs
+++ b/wezterm-gui/src/termwindow/ui/sidebar.rs
@@ -2434,7 +2434,7 @@ impl crate::TermWindow {
button_x.saturating_sub(item_x + self.ui_px(SIDEBAR_INSET) * 2),
muted_fg,
)?;
- self.paint_sidebar_action_button(
+ self.paint_sidebar_icon_button(
layers,
1,
euclid::rect(
@@ -2608,7 +2608,7 @@ impl crate::TermWindow {
project_action_size,
project_action_size,
);
- self.paint_sidebar_action_button(
+ self.paint_sidebar_icon_button(
layers,
1,
euclid::rect(
@@ -3020,7 +3020,7 @@ impl crate::TermWindow {
group_action_size,
group_action_size,
);
- self.paint_sidebar_action_button(
+ self.paint_sidebar_icon_button(
layers,
1,
euclid::rect(
@@ -4258,6 +4258,24 @@ impl crate::TermWindow {
)
}
+ /// One of the sidebar's add buttons: an action button whose circle shows
+ /// only under the pointer, unless Settings › Accessibility keeps button
+ /// shapes.
+ fn paint_sidebar_icon_button(
+ &self,
+ layers: &mut TripleLayerQuadAllocator,
+ layer_num: usize,
+ rect: RectF,
+ chrome: UiPalette,
+ hovered: bool,
+ dimmed: bool,
+ ) -> anyhow::Result<()> {
+ if !hovered && !crate::native_settings::show_button_shapes() {
+ return Ok(());
+ }
+ self.paint_sidebar_action_button(layers, layer_num, rect, chrome, hovered, dimmed)
+ }
+
pub(crate) fn fill_rounded_rectangle(
&self,
layers: &mut TripleLayerQuadAllocator,
diff --git a/wezterm-gui/src/ui/icons.rs b/wezterm-gui/src/ui/icons.rs
index cdb2d98a..aa54ad3b 100644
--- a/wezterm-gui/src/ui/icons.rs
+++ b/wezterm-gui/src/ui/icons.rs
@@ -4,6 +4,7 @@ pub(crate) use crate::termwindow::ui::icons::{BrandIcon, SvgIcon};
pub(crate) enum SettingsIcon {
General,
Appearance,
+ Accessibility,
TabIcons,
Sidebar,
Terminal,
@@ -33,6 +34,7 @@ impl SettingsIcon {
match self {
Self::General => SvgIcon::SlidersHorizontal,
Self::Appearance => SvgIcon::Palette,
+ Self::Accessibility => SvgIcon::PersonStanding,
Self::TabIcons => SvgIcon::Grid2x2,
Self::Sidebar => SvgIcon::PanelRightOpen,
Self::Terminal => SvgIcon::Terminal,