Merge pull request #96 from unsecretised/fix-trayicon-for-windows

unsecretised · web-flow · commit 3404ecf17c2f · 2026-01-14T11:40:19.000+08:00
A few fixes
diff --git a/src/app/menubar.rs b/src/app/menubar.rs
@@ -50,7 +50,7 @@ pub fn menu_icon(hotkey: (Option<Modifiers>, Code), hotkey_id: u32, sender: ExtS
 }
 
 fn get_image() -> DynamicImage {
-    let image_path = if cfg!(debug_assertions) {
+    let image_path = if cfg!(debug_assertions) && !cfg!(target_os = "macos") {
         "docs/icon.png"
     } else {
         "/Applications/Rustcast.app/Contents/Resources/icon.png"
diff --git a/src/app/tile/update.rs b/src/app/tile/update.rs
@@ -137,7 +137,7 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
                     name: res.eval().to_string(),
                     name_lc: "".to_string(),
                 });
-            } else if let Err(_) = Url::parse(&tile.query)
+            } else if let Ok(_) = Url::parse(&tile.query)
                 && tile.results.is_empty()
             {
                 #[cfg(target_os = "macos")]

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ pub fn menu_icon(hotkey: (Option<Modifiers>, Code), hotkey_id: u32, sender: ExtS`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`fn get_image() -> DynamicImage {`
`53`		`- let image_path = if cfg!(debug_assertions) {`
	`53`	`+ let image_path = if cfg!(debug_assertions) && !cfg!(target_os = "macos") {`
`54`	`54`	`"docs/icon.png"`
`55`	`55`	`} else {`
`56`	`56`	`"/Applications/Rustcast.app/Contents/Resources/icon.png"`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {`
`137`	`137`	`name: res.eval().to_string(),`
`138`	`138`	`name_lc: "".to_string(),`
`139`	`139`	`});`
`140`		`- } else if let Err(_) = Url::parse(&tile.query)`
	`140`	`+ } else if let Ok(_) = Url::parse(&tile.query)`
`141`	`141`	`&& tile.results.is_empty()`
`142`	`142`	`{`
`143`	`143`	`#[cfg(target_os = "macos")]`