From 5bd6c1f2e8720b378d71a0d1555bb2674c52a1a8 Mon Sep 17 00:00:00 2001 From: m1911star Date: Wed, 9 Nov 2022 17:45:03 +0800 Subject: [PATCH] fix: fix code review comments --- src-tauri/src/main.rs | 49 ++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 33 deletions(-) diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index b50da05..015ddf0 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -1,17 +1,8 @@ use tauri_utils::config::{Config, WindowConfig}; #[cfg(target_os = "macos")] -use wry::{ - application::{ - platform::macos::WindowBuilderExtMacOS, - } -}; - +use wry::application::platform::macos::WindowBuilderExtMacOS; #[cfg(target_os = "windows")] -use wry::{ - application::{ - platform::windows::WindowBuilderExtWindows - } -}; +use wry::application::platform::windows::WindowBuilderExtWindows; fn main() -> wry::Result<()> { use wry::{ @@ -68,29 +59,21 @@ fn main() -> wry::Result<()> { None }) .with_inner_size(wry::application::dpi::LogicalSize::new(width, height)); - #[cfg(windows)] - let init_window = || { - let window = common_window - .with_decorations(false) - .with_title("") - .build(&event_loop) - .unwrap(); - window - }; - #[cfg(macos)] - let init_window = || { - let window = common_window - .with_fullsize_content_view(true) - .with_titlebar_buttons_hidden(false) - .with_title_hidden(true) - .with_menu(menu_bar_menu) - .build(&event_loop) - .unwrap(); - window - }; - - let window = init_window(); + #[cfg(target_os = "windows")] + let window = common_window + .with_decorations(false) + .with_title("") + .build(&event_loop) + .unwrap(); + #[cfg(target_os = "macos")] + let window = common_window + .with_fullsize_content_view(true) + .with_titlebar_buttons_hidden(false) + .with_title_hidden(true) + .with_menu(menu_bar_menu) + .build(&event_loop) + .unwrap(); let handler = move |window: &Window, req: String| { if req == "drag_window" {