From 894342e206c430bc1a1e7defa5106c7dbc4fe391 Mon Sep 17 00:00:00 2001
From: wangxianqiao <wangxianqiao@cloudfine.com>
Date: Thu, 30 Jun 2022 01:11:41 +0800
Subject: [PATCH] Revert `on_page_load`

---
 Cargo.lock                              |  2 +-
 packages/tauriapp/Cargo.toml            |  2 +-
 packages/tauriapp/src/main.rs           |  3 ++-
 packages/tauriapp/src/window_ext.rs     | 28 ++++++++++++-------------
 packages/tauriapp/tauri.conf.json       |  5 +----
 packages/tauriapp/tauri.macos.conf.json | 11 ++++++++++
 6 files changed, 30 insertions(+), 21 deletions(-)
 create mode 100644 packages/tauriapp/tauri.macos.conf.json

diff --git a/Cargo.lock b/Cargo.lock
index b3aff855..0c5244be 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -404,7 +404,7 @@ checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704"
 
 [[package]]
 name = "app"
-version = "0.1.1"
+version = "1.0.0"
 dependencies = [
  "cocoa",
  "objc",
diff --git a/packages/tauriapp/Cargo.toml b/packages/tauriapp/Cargo.toml
index a1fed490..2451ec94 100644
--- a/packages/tauriapp/Cargo.toml
+++ b/packages/tauriapp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "app"
-version = "0.1.1"
+version = "1.0.0"
 description = "A Tauri App"
 authors = ["you"]
 license = ""
diff --git a/packages/tauriapp/src/main.rs b/packages/tauriapp/src/main.rs
index bdc3fa92..59f23c86 100644
--- a/packages/tauriapp/src/main.rs
+++ b/packages/tauriapp/src/main.rs
@@ -12,7 +12,7 @@ extern crate objc;
 
 #[cfg(target_os = "macos")]
 use tauri::Menu;
-use tauri::{generate_handler, Manager};
+use tauri::{generate_handler, Manager, Window};
 #[cfg(target_os = "macos")]
 use window_ext::WindowExt;
 
@@ -45,6 +45,7 @@ fn main() {
             // main_window.open_devtools();
             Ok(())
         })
+        .on_page_load(|w: Window, _| w.get_window("main").unwrap().show().unwrap())
         .plugin(preload::PreloadPlugin::new())
         .invoke_handler(generate_handler![play_sound, set_badge])
         .run(context)
diff --git a/packages/tauriapp/src/window_ext.rs b/packages/tauriapp/src/window_ext.rs
index 422bfb4d..7b7dfe64 100644
--- a/packages/tauriapp/src/window_ext.rs
+++ b/packages/tauriapp/src/window_ext.rs
@@ -17,6 +17,20 @@ impl WindowExt for Window {
         unsafe {
             let id = self.ns_window().unwrap() as cocoa::base::id;
 
+            let color = NSColor::colorWithSRGBRed_green_blue_alpha_(nil, 0.0, 0.0, 0.0, 1.0);
+            let _: cocoa::base::id = msg_send![id, setBackgroundColor: color];
+
+            // https://github.com/tauri-apps/tauri/issues/1564
+            // https://github.com/tauri-apps/wry/blob/765fe5ae413a1c13ad99802b49f3af859a2445d5/src/webview/macos/mod.rs#L180
+            self.with_webview(|webview| {
+                // !!! has delay
+                let id = webview.inner();
+                let no: cocoa::base::id = msg_send![class!(NSNumber), numberWithBool:0];
+                let _: cocoa::base::id =
+                    msg_send![id, setValue:no forKey: NSString::alloc(nil).init_str("drawsBackground")];
+            })
+            .ok();
+
             let mut style_mask = id.styleMask();
             style_mask.set(
                 NSWindowStyleMask::NSFullSizeContentViewWindowMask,
@@ -47,20 +61,6 @@ impl WindowExt for Window {
 
             // https://github.com/tauri-apps/tauri/issues/2663#issuecomment-1151240533
             id.setToolbar_(msg_send![class!(NSToolbar), new]);
-
-            // https://github.com/tauri-apps/tauri/issues/1564
-            // https://github.com/tauri-apps/wry/blob/765fe5ae413a1c13ad99802b49f3af859a2445d5/src/webview/macos/mod.rs#L180
-            self
-                .with_webview(|webview|  {
-                    let id = webview.inner();
-                    let no: cocoa::base::id = msg_send![class!(NSNumber), numberWithBool:0];
-                    let _: cocoa::base::id =
-                        msg_send![id, setValue:no forKey: NSString::alloc(nil).init_str("drawsBackground")];
-                })
-                .ok();
-
-            let color = NSColor::colorWithSRGBRed_green_blue_alpha_(nil, 0.0, 0.0, 0.0, 1.0);
-            let _: cocoa::base::id = msg_send![id, setBackgroundColor: color];
         }
     }
 }
diff --git a/packages/tauriapp/tauri.conf.json b/packages/tauriapp/tauri.conf.json
index e7afd3da..de0d9053 100644
--- a/packages/tauriapp/tauri.conf.json
+++ b/packages/tauriapp/tauri.conf.json
@@ -9,7 +9,7 @@
   },
   "package": {
     "productName": "NESBox",
-    "version": "0.1.2"
+    "version": "1.0.0"
   },
   "tauri": {
     "allowlist": {
@@ -60,11 +60,8 @@
     },
     "windows": [
       {
-        "title": "NESBox",
         "width": 1024,
         "height": 640,
-        "fullscreen": false,
-        "resizable": true,
         "visible": true
       }
     ]
diff --git a/packages/tauriapp/tauri.macos.conf.json b/packages/tauriapp/tauri.macos.conf.json
new file mode 100644
index 00000000..2fe8c121
--- /dev/null
+++ b/packages/tauriapp/tauri.macos.conf.json
@@ -0,0 +1,11 @@
+{
+  "tauri": {
+    "windows": [
+      {
+        "width": 1024,
+        "height": 640,
+        "visible": false
+      }
+    ]
+  }
+}