Skip to content

feat: add TypeX app icons #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LRainner merged 1 commit into from
Jun 23, 2026
Merged

feat: add TypeX app icons #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ hound = "3.5"
reqwest = { version = "0.12", features = ["json", "multipart", "stream"] }

# Desktop (Tauri)
tauri = { version = "2", features = ["tray-icon", "macos-private-api"] }
tauri = { version = "2", features = ["tray-icon", "macos-private-api", "image-png"] }
tauri-build = "2"
tauri-plugin-global-shortcut = "2"
log = "0.4"
Expand Down
Binary file modified apps/desktop/icons/icon.ico
View file
Open in desktop
Binary file not shown.
Binary file modified apps/desktop/icons/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/desktop/icons/tray-template.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 12 additions & 1 deletion apps/desktop/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ use std::{
use futures::{StreamExt, stream};
use rusqlite::Connection;
use serde::{Deserialize, Serialize};
#[cfg(target_os = "macos")]
use tauri::image::Image;
Comment on lines +13 to +14

@gemini-code-assist gemini-code-assist Bot Jun 23, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Import Image unconditionally since it will be used on non-macOS platforms as well for the fallback icon.

Suggested change
#[cfg(target_os = "macos")]
use tauri::image::Image;
use tauri::image::Image;

use tauri::{
Emitter, Manager, WindowEvent,
menu::{Menu, MenuItem, PredefinedMenuItem},
Expand Down Expand Up @@ -1203,8 +1205,17 @@ pub fn run() {
let separator = PredefinedMenuItem::separator(app)?;
let menu = Menu::with_items(app, &[&show_item, &separator, &quit_item])?;

#[cfg(target_os = "macos")]
let tray_icon = Image::from_bytes(include_bytes!("../icons/tray-template.png"))?;
#[cfg(not(target_os = "macos"))]
let tray_icon = app
.default_window_icon()
.cloned()
.ok_or("default window icon is missing")?;
Comment on lines +1208 to +1214

@gemini-code-assist gemini-code-assist Bot Jun 23, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

When running the application directly via cargo run (instead of cargo tauri dev or tauri build), app.default_window_icon() can return None because the resources are not packaged. This causes the application to fail to start. Adding a fallback to the embedded icon.png improves the developer experience and application robustness.

            #[cfg(target_os = "macos")]
            let tray_icon = Image::from_bytes(include_bytes!("../icons/tray-template.png"))?;
            #[cfg(not(target_os = "macos"))]
            let tray_icon = match app.default_window_icon().cloned() {
                Some(icon) => icon,
                None => {
                    tracing::warn!("Default window icon is missing, falling back to embedded icon.png");
                    Image::from_bytes(include_bytes!("../icons/icon.png"))?
                }
            };


TrayIconBuilder::new()
.icon(app.default_window_icon().unwrap().clone())
.icon(tray_icon)
.icon_as_template(cfg!(target_os = "macos"))
.menu(&menu)
.show_menu_on_left_click(false)
.tooltip("TypeX")
Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/tauri.conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
"bundle": {
"active": true,
"targets": "all",
"icon": ["icons/icon.ico"]
"icon": ["icons/icon.png", "icons/icon.ico"]
}
}
Loading