fix: 🐛 tray icon

maqi1520 · Sep 9, 2024 · e6858c0 · e6858c0
1 parent 5a65a6f
commit e6858c0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/next-env.d.ts b/next-env.d.ts
@@ -1,6 +1,5 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-/// <reference types="next/navigation-types/compat/navigation" />
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/basic-features/typescript for more information.
diff --git a/src-tauri/icons/appleTrayIcon.png b/src-tauri/icons/appleTrayIcon.png
diff --git a/src-tauri/icons/social-square.png b/src-tauri/icons/social-square.png
diff --git a/src-tauri/src/tray.rs b/src-tauri/src/tray.rs
@@ -29,19 +29,20 @@ fn create_window<R: Runtime>(app: &tauri::AppHandle<R>, label: String, path: Str
         .center()
         .resizable(true)
         .visible(false)
-        .decorations(true);
+        .decorations(false);
     #[cfg(target_os = "macos")]
     {
         builder
             .hidden_title(true)
             .title_bar_style(tauri::TitleBarStyle::Overlay)
+            .decorations(true)
             .build()
             .unwrap();
     }
 
     #[cfg(not(target_os = "macos"))]
     {
-        builder.decorations(true).build().unwrap();
+        builder.decorations(false).build().unwrap();
     }
 }
 
@@ -81,8 +82,12 @@ pub fn create_tray<R: Runtime>(app: &tauri::AppHandle<R>) -> tauri::Result<()> {
             _ => {}
         })
         .tooltip("MDX editor")
+        .icon(if cfg!(target_os = "macos") {
+            Image::from_bytes(include_bytes!("../icons/appleTrayIcon.png"))
+        } else {
+            Image::from_bytes(include_bytes!("../icons/128x128.png"))
+        }?)
         .icon_as_template(true)
-        .icon(Image::from_path("icons/social-square.png")?)
         .on_tray_icon_event(|tray, event| match event {
             TrayIconEvent::Click {
                 id: _,
@@ -92,15 +97,6 @@ pub fn create_tray<R: Runtime>(app: &tauri::AppHandle<R>) -> tauri::Result<()> {
                 button_state: _,
             } => match button {
                 MouseButton::Left {} => {
-                    // let windows = tray.app_handle().webview_windows();
-                    // for (key, value) in windows {
-                    //     if key == "login" || key == "main" {
-                    //         value.show().unwrap();
-                    //         value.unminimize().unwrap();
-                    //         value.set_focus().unwrap();
-                    //     }
-                    // }
-
                     tray.app_handle().emit("tray_menu", position).unwrap();
                 }
                 MouseButton::Right {} => {}