From 8ec031b754a2f483be711faf13b9b04e332f875c Mon Sep 17 00:00:00 2001
From: Tlntin <TlntinDeng01@Gmail.com>
Date: Tue, 27 Dec 2022 21:50:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E5=8F=91=E8=80=85?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E8=BF=90=E8=A1=8C=E6=8A=A5=E9=94=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json          |  1 +
 src-tauri/src/main.rs | 15 +++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index e8c639a..0edaf8d 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
   "scripts": {
     "start": "npm run dev",
     "dev": "npm run tauri dev",
+    "dev:debug": "npm run tauri dev -- --features devtools",
     "build": "npm run tauri build --release",
     "build:mac": "npm run tauri build -- --target universal-apple-darwin",
     "build:all-unix": "chmod +x ./script/build.sh && ./script/build.sh",
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index d17ac20..611f93a 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -58,7 +58,6 @@ pub fn get_pake_config() -> (PakeConfig, Config){
 
 pub fn get_menu() -> Menu {
     // first menu
-    let debug = CustomMenuItem::new("debug", "Debug");
     let hide = CustomMenuItem::new("hide", "Hide");
     let close = CustomMenuItem::new("close", "Close");
     let quit = CustomMenuItem::new("quit", "Quit");
@@ -80,7 +79,6 @@ pub fn get_menu() -> Menu {
         .add_item(quit);
     #[cfg(any(target_os = "linux", target_os = "windows"))]
     let first_menu = Menu::new()
-        .add_item(debug)
         .add_item(hide)
         .add_item(close)
         .add_item(quit);
@@ -182,6 +180,7 @@ pub fn get_window(app: & mut App, config: PakeConfig, data_dir: std::path::PathB
         .initialization_script(include_str!("pake.js"))
     };
     window.build().unwrap()
+    
 }
 
 pub fn set_zoom(webview: PlatformWebview, zoom_value: f64) {
@@ -224,7 +223,6 @@ pub fn zoom_reset(webview: PlatformWebview) {
 
 pub fn menu_event_handle(event: WindowMenuEvent) {
     match event.menu_item_id() {
-        "debug" => event.window().open_devtools(),
         "hide" => event.window().hide().expect("can't hide window"),
         "close" => event.window().close().expect("can't close window"),
         "quit" => std::process::exit(0),
@@ -249,13 +247,11 @@ pub fn menu_event_handle(event: WindowMenuEvent) {
 
 
 pub fn get_system_tray() -> SystemTray {
-    let debug = CustomMenuItem::new("debug", "Debug");
     let hide = CustomMenuItem::new("hide".to_string(), "Hide");
     let show = CustomMenuItem::new("show".to_string(), "Show");
     let quit = CustomMenuItem::new("quit".to_string(), "Quit");
     let about = CustomMenuItem::new("about".to_string(), "About");
     let tray_menu = SystemTrayMenu::new()
-        .add_item(debug)
         .add_item(hide)
         .add_item(show)
         .add_item(quit)
@@ -267,7 +263,6 @@ pub fn get_system_tray() -> SystemTray {
 pub fn system_tray_handle(app: &tauri::AppHandle, event: tauri::SystemTrayEvent) {
     if let SystemTrayEvent::MenuItemClick { tray_id: _, id, .. } = event {
         match id.as_str() {
-            "debug" => app.get_window("pake").unwrap().open_devtools(),
             "hide" => {
                 app.get_window("pake").unwrap().hide().unwrap();
             },
@@ -311,6 +306,10 @@ pub fn run_app() {
             .invoke_handler(tauri::generate_handler![])
             .setup(|app| {
                 let _window = get_window(app, pake_config, std::path::PathBuf::new());
+                #[cfg(feature = "devtools")]
+                {
+                    app.get_window("pake").unwrap().open_devtools();
+                }
                 Ok(())
             })
             .run(tauri::generate_context!())
@@ -330,6 +329,10 @@ pub fn run_app() {
             .invoke_handler(tauri::generate_handler![])
             .setup(|app| {
                 let _window = get_window(app, pake_config, data_dir);
+                #[cfg(feature = "devtools")]
+                {
+                    app.get_window("pake").unwrap().open_devtools();
+                }
                 Ok(())
             })
             .run(tauri::generate_context!())