Merge pull request #58 from olback/hicon

Allow use raw HICON object as icon on Windows (Closes #54)
olback · Apr 7, 2024 · 16a72ae · 16a72ae
2 parents 5374b93 + 890795d
commit 16a72ae
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/api/windows/mod.rs b/src/api/windows/mod.rs
@@ -18,9 +18,9 @@ use windows_sys::Win32::{
     UI::{
         Shell::{Shell_NotifyIconW, NIF_ICON, NIF_TIP, NIM_DELETE, NIM_MODIFY, NOTIFYICONDATAW},
         WindowsAndMessaging::{
-            InsertMenuItemW, SetMenuItemInfoW, LoadImageW, PostMessageW, HICON, IMAGE_ICON, LR_DEFAULTCOLOR,
-            MENUITEMINFOW, MFS_DISABLED, MFS_UNHILITE, MFT_SEPARATOR, MFT_STRING, MIIM_FTYPE,
-            MIIM_ID, MIIM_STATE, MIIM_STRING, WM_DESTROY,
+            InsertMenuItemW, LoadImageW, PostMessageW, SetMenuItemInfoW, HICON, IMAGE_ICON,
+            LR_DEFAULTCOLOR, MENUITEMINFOW, MFS_DISABLED, MFS_UNHILITE, MFT_SEPARATOR, MFT_STRING,
+            MIIM_FTYPE, MIIM_ID, MIIM_STATE, MIIM_STRING, WM_DESTROY,
         },
     },
 };
@@ -111,7 +111,10 @@ impl TrayItemWindows {
     }
 
     pub fn set_icon(&self, icon: IconSource) -> Result<(), TIError> {
-        self.set_icon_from_resource(icon.as_str())
+        match icon {
+            IconSource::Resource(icon_str) => return self.set_icon_from_resource(icon_str),
+            IconSource::RawIcon(raw_icon) => self._set_icon(raw_icon),
+        }
     }
 
     pub fn add_label(&mut self, label: &str) -> Result<(), TIError> {

diff --git a/src/lib.rs b/src/lib.rs
@@ -7,6 +7,8 @@ pub struct TrayItem(api::TrayItemImpl);
 #[derive(Clone)]
 pub enum IconSource {
     Resource(&'static str),
+    #[cfg(target_os = "windows")]
+    RawIcon(windows_sys::Win32::UI::WindowsAndMessaging::HICON),
     #[cfg(any(target_os = "macos", all(target_os = "linux", feature = "ksni")))]
     Data {
         height: i32,