Rust format + PR feedback

Author: ykogan-discord

crates/tauri/src/tray/mod.rs

@@ -596,7 +596,9 @@ pub fn set_icon_with_template(
       None => None,
     };
     run_item_main_thread!(self, |self_: Self| {
-      self_.inner.set_icon_with_as_template(tray_icon, is_template)
+      self_
+        .inner
+        .set_icon_with_as_template(tray_icon, is_template)
     })??;
   }
   #[cfg(not(target_os = "macos"))]

crates/tauri/src/tray/plugin.rs

@@ -203,6 +203,24 @@ fn set_icon_as_template<R: Runtime>(
   tray.set_icon_as_template(as_template)
 }
 
+#[command(root = "crate")]
+fn set_icon_with_template<R: Runtime>(
+  app: AppHandle<R>,
+  webview: Webview<R>,
+  rid: ResourceId,
+  icon: Option<JsImage>,
+  as_template: bool,
+) -> crate::Result<()> {
+  let resources_table = app.resources_table();
+  let tray = resources_table.get::<TrayIcon<R>>(rid)?;
+  let webview_resources_table = webview.resources_table();
+  let icon = match icon {
+    Some(i) => Some(i.into_img(&webview_resources_table)?.as_ref().clone()),
+    None => None,
+  };
+  tray.set_icon_with_template(icon, as_template)
+}
+
 #[command(root = "crate")]
 fn set_show_menu_on_left_click<R: Runtime>(
   app: AppHandle<R>,
@@ -228,6 +246,7 @@ pub(crate) fn init<R: Runtime>() -> TauriPlugin<R> {
       set_visible,
       set_temp_dir_path,
       set_icon_as_template,
+      set_icon_with_template,
       set_show_menu_on_left_click,
     ])
     .build()

packages/api/src/tray.ts

@@ -296,6 +296,27 @@ export class TrayIcon extends Resource {
     })
   }
 
+ /**
+   * Sets a new tray icon and template status atomically. **macOS only**.
+   *
+   * Note that you may need the `image-ico` or `image-png` Cargo features to use this API.
+   * To enable it, change your Cargo.toml file:
+   * ```toml
+   * [dependencies]
+   * tauri = { version = "...", features = ["...", "image-png"] }
+   * ```
+   */
+ async setIconWithTemplate(
+  icon: string | Image | Uint8Array | ArrayBuffer | number[] | null,
+  asTemplate: boolean
+): Promise<void> {
+  let trayIcon = null
+  if (icon) {
+    trayIcon = transformImage(icon)
+  }
+  return invoke('plugin:tray|set_icon_with_template', { rid: this.rid, icon: trayIcon, asTemplate })
+}
+
   /**
    *  Disable or enable showing the tray menu on left click.
    *