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.

Support Simple and Classic macOS app icons

RoversX8f60e815be09
diff --git a/assets/icon/ThinkTerm.png b/assets/icon/ThinkTerm.png
index 44f32c66..5535f9ba 100644
Binary files a/assets/icon/ThinkTerm.png and b/assets/icon/ThinkTerm.png differ
diff --git a/assets/icon/terminal.png b/assets/icon/terminal.png
index a57acbb3..9982b825 100644
Binary files a/assets/icon/terminal.png and b/assets/icon/terminal.png differ
diff --git a/assets/icon/update.sh b/assets/icon/update.sh
index f4e0ec23..fc0b10c5 100755
--- a/assets/icon/update.sh
+++ b/assets/icon/update.sh
@@ -1,11 +1,12 @@
#!/bin/bash
-# This script updates the icon files from the svg file.
-# It assumes that the svg file is square.
+# This script updates platform icon files from the default ThinkTerm icon.
+# It assumes that the source image is square.
set -x
cd $(git rev-parse --show-toplevel)/assets/icon
-src=wezterm-icon.svg
-macos_icns=ThinkTerm.icns
+src=ThinkTerm_simple.png
+macos_icns=ThinkTerm_simple.icns
+classic_macos_icns=ThinkTerm.icns
conv_opts="-colors 256 -background none -density 300"
@@ -16,16 +17,19 @@ for dim in 16 32 128 256 512 1024 ; do
# convert is the imagemagick convert utility
convert $conv_opts -border '10%' -bordercolor 'rgba(0,0,0,0)' -resize "!${dim}x${dim}" "$src" "icon_${dim}px.png"
done
-# Prefer the hand-authored ThinkTerm macOS icon when present.
+# Prefer the hand-authored ThinkTerm macOS icons when present.
# png2icns is part of the libicns-utils on Fedora systems and is kept as a fallback.
mkdir -p ../macos/ThinkTerm.app/Contents/Resources
if [ -f "$macos_icns" ]; then
- cp "$macos_icns" ../macos/ThinkTerm.app/Contents/Resources/ThinkTerm.icns
+ cp "$macos_icns" ../macos/ThinkTerm.app/Contents/Resources/ThinkTerm_simple.icns
+ if [ -f "$classic_macos_icns" ]; then
+ cp "$classic_macos_icns" ../macos/ThinkTerm.app/Contents/Resources/ThinkTerm.icns
+ fi
if command -v sips >/dev/null 2>&1 ; then
sips -z 512 512 -s format png "$macos_icns" --out ThinkTerm.png
fi
else
- png2icns ../macos/ThinkTerm.app/Contents/Resources/ThinkTerm.icns icon_*px.png
+ png2icns ../macos/ThinkTerm.app/Contents/Resources/ThinkTerm_simple.icns icon_*px.png
fi
# Clean up
diff --git a/assets/macos/ThinkTerm.app/Contents/Info.plist b/assets/macos/ThinkTerm.app/Contents/Info.plist
index 5ac687e1..91820b80 100644
--- a/assets/macos/ThinkTerm.app/Contents/Info.plist
+++ b/assets/macos/ThinkTerm.app/Contents/Info.plist
@@ -23,7 +23,7 @@
<key>CFBundleVersion</key>
<string>1</string>
<key>CFBundleIconFile</key>
- <string>ThinkTerm.icns</string>
+ <string>ThinkTerm_simple.icns</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>NSHighResolutionCapable</key>
@@ -70,7 +70,7 @@
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleTypeIconFile</key>
- <string>ThinkTerm.icns</string>
+ <string>ThinkTerm_simple.icns</string>
<key>CFBundleTypeExtensions</key>
<array>
<string>command</string>
diff --git a/assets/macos/ThinkTerm.app/Contents/Resources/ThinkTerm_simple.icns b/assets/macos/ThinkTerm.app/Contents/Resources/ThinkTerm_simple.icns
new file mode 100644
index 00000000..c38b7ba3
Binary files /dev/null and b/assets/macos/ThinkTerm.app/Contents/Resources/ThinkTerm_simple.icns differ
diff --git a/assets/windows/terminal.ico b/assets/windows/terminal.ico
index f52671cf..78739813 100644
Binary files a/assets/windows/terminal.ico and b/assets/windows/terminal.ico differ
diff --git a/wezterm-gui/src/native_settings.rs b/wezterm-gui/src/native_settings.rs
index acd55c3f..c05e5079 100644
--- a/wezterm-gui/src/native_settings.rs
+++ b/wezterm-gui/src/native_settings.rs
@@ -62,28 +62,29 @@ impl NativeThemeMode {
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Deserialize, Serialize)]
#[serde(rename_all = "lowercase")]
pub(crate) enum NativeAppIcon {
- Default,
Simple,
+ #[serde(alias = "default")]
+ Classic,
}
impl Default for NativeAppIcon {
fn default() -> Self {
- Self::Default
+ Self::Simple
}
}
impl NativeAppIcon {
pub(crate) fn label(self) -> &'static str {
match self {
- Self::Default => "Default",
Self::Simple => "Simple",
+ Self::Classic => "Classic",
}
}
fn file_name(self) -> &'static str {
match self {
- Self::Default => "ThinkTerm.icns",
Self::Simple => "ThinkTerm_simple.icns",
+ Self::Classic => "ThinkTerm.icns",
}
}
}
diff --git a/wezterm-gui/src/settings_window.rs b/wezterm-gui/src/settings_window.rs
index d4ddbf31..02f422dc 100644
--- a/wezterm-gui/src/settings_window.rs
+++ b/wezterm-gui/src/settings_window.rs
@@ -3299,8 +3299,9 @@ impl SettingsWindow {
let section_y = CONTENT_SECTION_Y - scroll;
let theme_row_count = 4;
let typography_row_count = 6;
+ let app_icon_note_space = self.metrics.cell_size.height as f32 + 10.0;
let (theme_card_y, mut y) = self.settings_card_geometry(section_y, theme_row_count);
- let theme_card_height = self.settings_card_height(theme_row_count);
+ let theme_card_height = self.settings_card_height(theme_row_count) + app_icon_note_space;
let typography_title_y =
theme_card_y + theme_card_height + self.settings_section_card_gap();
let typography_card_y = typography_title_y + self.settings_section_card_gap().min(54.0);
@@ -3339,10 +3340,11 @@ impl SettingsWindow {
row_x,
y,
row_width,
- "Switch the running macOS Dock and app switcher icon.",
+ "Switch the running Dock and app switcher icon.",
+ "Currently only works on macOS.",
true,
)?;
- y += row_step;
+ y += row_step + app_icon_note_space;
self.paint_setting_row(
layers,
row_x,
@@ -5554,6 +5556,7 @@ impl SettingsWindow {
y: f32,
width: f32,
description: &str,
+ note: &str,
draw_top_rule: bool,
) -> anyhow::Result<()> {
let palette = self.palette();
@@ -5594,6 +5597,15 @@ impl SettingsWindow {
palette.secondary_text,
text_width,
)?;
+ self.draw_text(
+ layers,
+ &ui_font,
+ x,
+ self.settings_row_description_y(y) + self.metrics.cell_size.height as f32 + 4.0,
+ note,
+ palette.muted_text,
+ text_width,
+ )?;
self.draw_rounded_frame(
layers,
0,
@@ -5871,16 +5883,16 @@ impl SettingsWindow {
width: f32,
) -> anyhow::Result<()> {
let options = [
- (
- NativeAppIcon::Default.label(),
- SettingsAction::SetAppIcon(NativeAppIcon::Default),
- self.native_settings.appearance.app_icon == NativeAppIcon::Default,
- ),
(
NativeAppIcon::Simple.label(),
SettingsAction::SetAppIcon(NativeAppIcon::Simple),
self.native_settings.appearance.app_icon == NativeAppIcon::Simple,
),
+ (
+ NativeAppIcon::Classic.label(),
+ SettingsAction::SetAppIcon(NativeAppIcon::Classic),
+ self.native_settings.appearance.app_icon == NativeAppIcon::Classic,
+ ),
];
self.paint_dropdown_menu(layers, x, y, width, &options)
}