更新代码格式

src-tauri/src/lib.rs

@@ -10,7 +10,7 @@ use tauri::{
     SystemTrayEvent, SystemTrayMenu, Window, WindowBuilder, WindowMenuEvent, WindowUrl,
 };
 mod pake;
-use pake::pake::PakeConfig;
+use pake::PakeConfig;
 
 pub fn get_menu() -> Menu {
     // first menu

src-tauri/src/pake.rs

@@ -1,58 +1,56 @@
-pub mod pake {
+use serde::Deserialize;
-    use serde::Deserialize;
 
-    #[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize)]
-    pub struct WindowConfig {
+pub struct WindowConfig {
-        pub url: String,
+    pub url: String,
-        pub transparent: bool,
+    pub transparent: bool,
-        pub fullscreen: bool,
+    pub fullscreen: bool,
-        pub width: f64,
+    pub width: f64,
-        pub height: f64,
+    pub height: f64,
-        pub resizable: bool,
+    pub resizable: bool,
-        pub url_type: String,
+    pub url_type: String,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct UserAgent {
+    pub macos: String,
+    pub linux: String,
+    pub windows: String,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct FunctionON {
+    pub macos: bool,
+    pub linux: bool,
+    pub windows: bool,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct PakeConfig {
+    pub windows: Vec<WindowConfig>,
+    pub user_agent: UserAgent,
+    pub menu: FunctionON,
+    pub system_tray: FunctionON,
+}
+
+impl PakeConfig {
+    pub fn show_menu(&self) -> bool {
+        #[cfg(target_os = "macos")]
+        let menu_status = self.menu.macos;
+        #[cfg(target_os = "linux")]
+        let menu_status = self.menu.linux;
+        #[cfg(target_os = "windows")]
+        let menu_status = self.menu.windows;
+        menu_status
     }
 
-    #[derive(Debug, Deserialize)]
+    pub fn show_system_tray(&self) -> bool {
-    pub struct UserAgent {
+        #[cfg(target_os = "macos")]
-        pub macos: String,
+        let tray_status = self.system_tray.macos;
-        pub linux: String,
+        #[cfg(target_os = "linux")]
-        pub windows: String,
+        let tray_status = self.system_tray.linux;
-    }
+        #[cfg(target_os = "windows")]
-
+        let tray_status = self.system_tray.windows;
-    #[derive(Debug, Deserialize)]
+        tray_status
-    pub struct FunctionON {
-        pub macos: bool,
-        pub linux: bool,
-        pub windows: bool,
-    }
-
-    #[derive(Debug, Deserialize)]
-    pub struct PakeConfig {
-        pub windows: Vec<WindowConfig>,
-        pub user_agent: UserAgent,
-        pub menu: FunctionON,
-        pub system_tray: FunctionON,
-    }
-
-    impl PakeConfig {
-        pub fn show_menu(&self) -> bool {
-            #[cfg(target_os = "macos")]
-            let menu_status = self.menu.macos;
-            #[cfg(target_os = "linux")]
-            let menu_status = self.menu.linux;
-            #[cfg(target_os = "windows")]
-            let menu_status = self.menu.windows;
-            menu_status
-        }
-
-        pub fn show_system_tray(&self) -> bool {
-            #[cfg(target_os = "macos")]
-            let tray_status = self.system_tray.macos;
-            #[cfg(target_os = "linux")]
-            let tray_status = self.system_tray.linux;
-            #[cfg(target_os = "windows")]
-            let tray_status = self.system_tray.windows;
-            tray_status
-        }
     }
 }