Add Windows restart

wyhaya · Sep 14, 2024 · 4dfe2c4 · 4dfe2c4
1 parent 7e39811
commit 4dfe2c4
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 55 deletions.
diff --git a/tauri-v2/src/lib.rs b/tauri-v2/src/lib.rs
@@ -14,7 +14,7 @@ const ERROR_MESSAGE: &str = "Get app config dir failed";
 pub fn init<R: Runtime>(config: &mut Config) -> TauriPlugin<R> {
     #[cfg(any(target_os = "macos", target_os = "windows"))]
     {
-        let theme = saved_theme_value_from_config(&config);
+        let theme = saved_theme_value_from_config(config);
         for window in &mut config.app.windows {
             match theme {
                 Theme::Auto => window.theme = None,
@@ -54,12 +54,12 @@ impl From<String> for Theme {
     }
 }
 
-impl ToString for Theme {
-    fn to_string(&self) -> String {
+impl std::fmt::Display for Theme {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Theme::Auto => "auto".into(),
-            Theme::Light => "light".into(),
-            Theme::Dark => "dark".into(),
+            Theme::Auto => write!(f, "auto"),
+            Theme::Light => write!(f, "light"),
+            Theme::Dark => write!(f, "dark"),
         }
     }
 }

diff --git a/tauri-v2/src/platform/windows.rs b/tauri-v2/src/platform/windows.rs
@@ -1,64 +1,35 @@
 use crate::{save_theme_value, Theme};
-use std::sync::atomic::{AtomicU8, Ordering};
-use std::sync::Arc;
 use tauri::{command, AppHandle, Manager, Runtime};
 use webview2_com::Microsoft::Web::WebView2::Win32::*;
 use windows_core::Interface;
 
 #[command]
 pub fn set_theme<R: Runtime>(app: AppHandle<R>, theme: Theme) -> Result<(), &'static str> {
     save_theme_value(&app, theme);
-    let err = Arc::new(AtomicU8::new(0));
     for (_, window) in app.webview_windows() {
+        let (app, app2) = (app.clone(), app.clone());
         // Window
-        let hwnd = window.hwnd().map_err(|_| "Invalid window handle")?;
+        let hwnd = window.hwnd().unwrap_or_else(|_| app.restart());
         darkmode::try_window_theme(hwnd, theme, false);
-
         // Webview
-        let (err, err2) = (err.clone(), err.clone());
-        let rst = window.with_webview(move |view| unsafe {
-            let controller = view.controller();
-            let coreview = match controller.CoreWebView2() {
-                Ok(coreview) => coreview,
-                Err(_) => {
-                    err.store(1, Ordering::SeqCst);
-                    return;
-                }
-            };
-            let webview = match coreview.cast::<ICoreWebView2_13>() {
-                Ok(webview) => webview,
-                Err(_) => {
-                    err.store(2, Ordering::SeqCst);
-                    return;
-                }
-            };
-            let profile = match webview.Profile() {
-                Ok(profile) => profile,
-                Err(_) => {
-                    err.store(3, Ordering::SeqCst);
-                    return;
-                }
-            };
-            let theme = match theme {
-                Theme::Dark => COREWEBVIEW2_PREFERRED_COLOR_SCHEME_DARK,
-                Theme::Light => COREWEBVIEW2_PREFERRED_COLOR_SCHEME_LIGHT,
-                Theme::Auto => COREWEBVIEW2_PREFERRED_COLOR_SCHEME_AUTO,
-            };
-            if let Err(_) = profile.SetPreferredColorScheme(theme) {
-                err.store(4, Ordering::SeqCst);
-                return;
-            }
-        });
-        if let Err(_) = rst {
-            return Err("Get webview error");
-        }
-        match err2.load(Ordering::SeqCst) {
-            1 => return Err("Get CoreWebView2 error"),
-            2 => return Err("Get ICoreWebView2_13 error"),
-            3 => return Err("Get webview.Profile error"),
-            4 => return Err("Set SetPreferredColorScheme error"),
-            _ => {}
-        }
+        window
+            .with_webview(move |view| unsafe {
+                let controller = view.controller();
+                let coreview = controller.CoreWebView2().unwrap_or_else(|_| app.restart());
+                let webview = coreview
+                    .cast::<ICoreWebView2_13>()
+                    .unwrap_or_else(|_| app.restart());
+                let profile = webview.Profile().unwrap_or_else(|_| app.restart());
+                let theme = match theme {
+                    Theme::Dark => COREWEBVIEW2_PREFERRED_COLOR_SCHEME_DARK,
+                    Theme::Light => COREWEBVIEW2_PREFERRED_COLOR_SCHEME_LIGHT,
+                    Theme::Auto => COREWEBVIEW2_PREFERRED_COLOR_SCHEME_AUTO,
+                };
+                profile
+                    .SetPreferredColorScheme(theme)
+                    .unwrap_or_else(|_| app.restart());
+            })
+            .unwrap_or_else(|_| app2.restart());
     }
     Ok(())
 }