fix: dark mode flash in win

LibNyanpasu · Dec 26, 2023 · ffe2bde · ffe2bde
1 parent 4345dc2
commit ffe2bde
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 18 deletions.
diff --git a/backend/tauri/src/main.rs b/backend/tauri/src/main.rs
@@ -33,7 +33,10 @@ fn main() -> std::io::Result<()> {
     #[allow(unused_mut)]
     let mut builder = tauri::Builder::default()
         .system_tray(SystemTray::new())
-        .setup(|app| Ok(resolve::resolve_setup(app)))
+        .setup(|app| {
+            resolve::resolve_setup(app);
+            Ok(())
+        })
         .on_system_tray_event(core::tray::Tray::on_system_tray_event)
         .invoke_handler(tauri::generate_handler![
             // common

diff --git a/backend/tauri/src/utils/resolve.rs b/backend/tauri/src/utils/resolve.rs
@@ -142,8 +142,6 @@ pub fn create_window(app_handle: &AppHandle) {
 
     #[cfg(target_os = "windows")]
     {
-        use std::time::Duration;
-        use tokio::time::sleep;
         use window_shadows::set_shadow;
 
         match builder
@@ -161,6 +159,7 @@ pub fn create_window(app_handle: &AppHandle) {
                         trace_err!(win.set_fullscreen(true), "set win fullscreen");
                     }
                 }
+                trace_err!(set_shadow(&win, true), "set win shadow");
                 log::trace!("try to calculate the monitor size");
                 let center = (|| -> Result<bool> {
                     let mut center = false;
@@ -182,22 +181,22 @@ pub fn create_window(app_handle: &AppHandle) {
                     trace_err!(win.center(), "set win center");
                 }
 
-                log::trace!("try to create window");
-                let app_handle = app_handle.clone();
+                // log::trace!("try to create window");
+                // let app_handle = app_handle.clone();
 
                 // 加点延迟避免界面闪一下
-                tauri::async_runtime::spawn(async move {
-                    // sleep(Duration::from_millis(888)).await;
-
-                    if let Some(window) = app_handle.get_window("main") {
-                        trace_err!(set_shadow(&window, true), "set win shadow");
-                        trace_err!(window.show(), "set win visible");
-                        trace_err!(window.unminimize(), "set win unminimize");
-                        trace_err!(window.set_focus(), "set win focus");
-                    } else {
-                        log::error!(target: "app", "failed to create window, get_window is None")
-                    }
-                });
+                //     tauri::async_runtime::spawn(async move {
+                //         // sleep(Duration::from_millis(888)).await;
+
+                //         if let Some(window) = app_handle.get_window("main") {
+                //             trace_err!(set_shadow(&window, true), "set win shadow");
+                //             trace_err!(window.show(), "set win visible");
+                //             trace_err!(window.unminimize(), "set win unminimize");
+                //             trace_err!(window.set_focus(), "set win focus");
+                //         } else {
+                //             log::error!(target: "app", "failed to create window, get_window is None")
+                //         }
+                //     });
             }
             Err(err) => log::error!(target: "app", "failed to create window, {err}"),
         }

diff --git a/src/main.tsx b/src/main.tsx
@@ -9,8 +9,8 @@ if (!window.ResizeObserver) {
 
 import React from "react";
 import { createRoot } from "react-dom/client";
-import { RecoilRoot } from "recoil";
 import { BrowserRouter } from "react-router-dom";
+import { RecoilRoot } from "recoil";
 import { BaseErrorBoundary } from "./components/base";
 import Layout from "./pages/_layout";
 import "./services/i18n";

diff --git a/src/pages/_layout.tsx b/src/pages/_layout.tsx
@@ -73,6 +73,12 @@ export default function Layout() {
           break;
       }
     });
+
+    setTimeout(() => {
+      appWindow.show();
+      appWindow.unminimize();
+      appWindow.setFocus();
+    }, 50);
   }, []);
 
   useEffect(() => {