diff --git a/espanso/src/icon.rs b/espanso/src/icon.rs index 53b9d31..70d17ed 100644 --- a/espanso/src/icon.rs +++ b/espanso/src/icon.rs @@ -24,9 +24,11 @@ use std::path::{Path, PathBuf}; const ICON_BINARY: &[u8] = include_bytes!("res/icon.png"); #[cfg(target_os = "windows")] -const WINDOWS_ICO_BINARY: &[u8] = include_bytes!("res/windows/espanso.ico"); +const WINDOWS_NORMAL_DARK_ICO_BINARY: &[u8] = include_bytes!("res/windows/normal_dark.ico"); #[cfg(target_os = "windows")] -const WINDOWS_RED_ICO_BINARY: &[u8] = include_bytes!("res/windows/espansored.ico"); +const WINDOWS_DISABLED_DARK_ICO_BINARY: &[u8] = include_bytes!("res/windows/disabled_dark.ico"); +#[cfg(target_os = "windows")] +const WINDOWS_LOGO_ICO_BINARY: &[u8] = include_bytes!("res/windows/logo.ico"); #[cfg(target_os = "macos")] @@ -51,10 +53,10 @@ pub struct IconPaths { #[cfg(target_os = "windows")] pub fn load_icon_paths(runtime_dir: &Path) -> Result { Ok(IconPaths { - form_icon: Some(extract_icon(WINDOWS_ICO_BINARY, &runtime_dir.join("form.ico"))?), + form_icon: Some(extract_icon(WINDOWS_LOGO_ICO_BINARY, &runtime_dir.join("form.ico"))?), search_icon: Some(extract_icon(ICON_BINARY, &runtime_dir.join("search.png"))?), - tray_icon_normal: Some(extract_icon(WINDOWS_ICO_BINARY, &runtime_dir.join("normal.ico"))?), - tray_icon_disabled: Some(extract_icon(WINDOWS_RED_ICO_BINARY, &runtime_dir.join("disabled.ico"))?), + tray_icon_normal: Some(extract_icon(WINDOWS_NORMAL_DARK_ICO_BINARY, &runtime_dir.join("normal.ico"))?), + tray_icon_disabled: Some(extract_icon(WINDOWS_DISABLED_DARK_ICO_BINARY, &runtime_dir.join("disabled.ico"))?), logo: Some(extract_icon(ICON_BINARY, &runtime_dir.join("icon.png"))?), ..Default::default() }) diff --git a/espanso/src/res/windows/disabled_dark.ico b/espanso/src/res/windows/disabled_dark.ico new file mode 100644 index 0000000..78a845c Binary files /dev/null and b/espanso/src/res/windows/disabled_dark.ico differ diff --git a/espanso/src/res/windows/disabled_light.ico b/espanso/src/res/windows/disabled_light.ico new file mode 100644 index 0000000..75ca9e0 Binary files /dev/null and b/espanso/src/res/windows/disabled_light.ico differ diff --git a/espanso/src/res/windows/espanso.ico b/espanso/src/res/windows/espanso.ico deleted file mode 100644 index 1d1c06c..0000000 Binary files a/espanso/src/res/windows/espanso.ico and /dev/null differ diff --git a/espanso/src/res/windows/espansored.ico b/espanso/src/res/windows/espansored.ico deleted file mode 100644 index 334bab0..0000000 Binary files a/espanso/src/res/windows/espansored.ico and /dev/null differ diff --git a/espanso/src/res/windows/logo.ico b/espanso/src/res/windows/logo.ico new file mode 100644 index 0000000..4258066 Binary files /dev/null and b/espanso/src/res/windows/logo.ico differ diff --git a/espanso/src/res/windows/normal_dark.ico b/espanso/src/res/windows/normal_dark.ico new file mode 100644 index 0000000..53ef64b Binary files /dev/null and b/espanso/src/res/windows/normal_dark.ico differ diff --git a/espanso/src/res/windows/normal_light.ico b/espanso/src/res/windows/normal_light.ico new file mode 100644 index 0000000..b23bcc0 Binary files /dev/null and b/espanso/src/res/windows/normal_light.ico differ