Merge pull request #121 from lgou2w/develop

v1.1.6

Author: lgou2w

Cargo.lock

@@ -1,7 +1,7 @@
 {
   "name": "hoyo_gacha",
   "displayName": "HoYo.Gacha",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "An unofficial tool for managing and analyzing your miHoYo gacha records",
   "author": "lgou2w <lgou2w@hotmail.com>",
   "homepage": "https://github.com/lgou2w/HoYo.Gacha#readme",
@@ -39,11 +39,11 @@
   },
   "dependencies": {
     "@fluentui/react-components": "^9.70.0",
-    "@fluentui/react-icons": "^2.0.310",
+    "@fluentui/react-icons": "^2.0.311",
     "@fluentui/react-motion-components-preview": "^0.10.0",
     "@tanstack/react-query": "^5.90.2",
     "@tanstack/react-query-devtools": "^5.90.2",
-    "@tanstack/react-router": "^1.131.50",
+    "@tanstack/react-router": "^1.132.23",
     "@tauri-apps/api": "^2.8.0",
     "@tauri-apps/plugin-clipboard-manager": "^2.3.0",
     "@tauri-apps/plugin-process": "^2.3.0",
@@ -56,16 +56,16 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-hook-form": "^7.63.0",
-    "react-i18next": "^15.7.3",
-    "react-virtuoso": "^4.14.0",
+    "react-i18next": "^16.0.0",
+    "react-virtuoso": "^4.14.1",
     "use-immer": "^0.11.0"
   },
   "devDependencies": {
     "@babel/preset-react": "^7.27.1",
     "@babel/preset-typescript": "^7.27.1",
     "@griffel/tag-processor": "^1.0.13",
     "@griffel/vite-plugin": "^0.1.13",
-    "@tanstack/eslint-plugin-query": "^5.90.1",
+    "@tanstack/eslint-plugin-query": "^5.91.0",
     "@tauri-apps/cli": "^2.8.4",
     "@testing-library/jest-dom": "^6.8.0",
     "@testing-library/react": "^16.3.0",
@@ -90,11 +90,11 @@
     "eslint-plugin-promise": "^7.2.1",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^5.2.0",
-    "eslint-plugin-react-refresh": "^0.4.21",
-    "eslint-plugin-testing-library": "^7.9.1",
+    "eslint-plugin-react-refresh": "^0.4.22",
+    "eslint-plugin-testing-library": "^7.10.0",
     "husky": "^9.1.7",
-    "jest": "^30.1.3",
-    "jest-environment-jsdom": "^30.1.2",
+    "jest": "^30.2.0",
+    "jest-environment-jsdom": "^30.2.0",
     "rimraf": "^6.0.1",
     "ts-jest": "^29.4.4",
     "typescript": "^5.9.2",

package.json

@@ -1,6 +1,6 @@
 [package]
 name = "hoyo_gacha"
-version = "1.1.5"
+version = "1.1.6"
 edition = "2024"
 rust-version = "1.85"
 authors = ["lgou2w <lgou2w@hotmail.com>"]
@@ -33,18 +33,18 @@ num_enum = "0.7.4"
 os_info = "3.12.0"
 paste = "1.0.15"
 raw-window-handle = "0.6.2"
-regex = "1.11.2"
+regex = "1.11.3"
 reqwest = { version = "0.12.23", features = ["json"] }
 rfd = { version = "0.15.4", default-features = false }
 sha1 = "0.10.6"
-serde = { version = "1.0.226", features = ["derive"] }
+serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.145"
 serde_repr = "0.1.20"
 sys-locale = "0.3.2"
 tauri-plugin-shell = "2.3.1"
 tauri-plugin-clipboard-manager = "2.3.0"
 tauri-plugin-process = "2.3.0"
-thiserror = "2.0.16"
+thiserror = "2.0.17"
 time = { version = "0.3.44", features = ["local-offset", "macros", "serde-human-readable"] }
 tokio = { version = "1.47.1", features = ["macros", "rt-multi-thread"] }
 tracing = "0.1.41"
@@ -76,7 +76,7 @@ features = [
 
 [target.'cfg(windows)'.dependencies]
 windows-registry = "0.6.0"
-windows-version = "0.1.5"
+windows-version = "0.1.6"
 webview2-com = "0.38.0"
 
 [target.'cfg(windows)'.dependencies.windows]
@@ -89,6 +89,7 @@ features = [
   "Win32_Security",
   "Win32_System_Com",
   "Win32_System_Console",
+  "Win32_System_Registry",
   "Win32_System_Threading",
   "Win32_UI",
   "Win32_UI_Controls",

pnpm-lock.yaml

@@ -2,7 +2,7 @@
 # identifier = "com.lgou2w.hoyo.gacha"
 identifier = "com.lgou2w.hoyo.gacha.v1"
 product-name = "HoYo.Gacha"
-version = "1.1.5"
+version = "1.1.6"
 
 [build]
 # See: package.json - scripts - dev & build

src-tauri/Cargo.toml

@@ -1,13 +1,18 @@
 use std::env;
 use std::mem::{self, MaybeUninit};
+use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::thread;
 
 use tauri::{Theme, WebviewWindow};
 use webview2_com::Microsoft::Web::WebView2::Win32::{
   COREWEBVIEW2_PREFERRED_COLOR_SCHEME_DARK, COREWEBVIEW2_PREFERRED_COLOR_SCHEME_LIGHT,
   ICoreWebView2Settings4,
 };
 use webview2_com::Microsoft::Web::WebView2::Win32::{ICoreWebView2_2, ICoreWebView2_13};
-use windows::Win32::Foundation::{FALSE, HANDLE, TRUE};
+use windows::Win32::Foundation::{
+  CloseHandle, FALSE, HANDLE, TRUE, WAIT_EVENT, WAIT_FAILED, WAIT_OBJECT_0,
+};
 use windows::Win32::Graphics::DirectWrite::{
   DWRITE_FACTORY_TYPE_SHARED, DWriteCreateFactory, IDWriteFactory,
 };
@@ -21,10 +26,15 @@ use windows::Win32::System::Com::{
   CoInitialize, CoInitializeEx, CoUninitialize, IPersistFile,
 };
 use windows::Win32::System::Console::{ATTACH_PARENT_PROCESS, AttachConsole};
+use windows::Win32::System::Registry::{
+  HKEY, HKEY_CURRENT_USER, KEY_NOTIFY, REG_NOTIFY_CHANGE_LAST_SET, RegCloseKey,
+  RegNotifyChangeKeyValue, RegOpenKeyExA,
+};
+use windows::Win32::System::Threading::{CreateEventA, INFINITE, SetEvent, WaitForMultipleObjects};
 use windows::Win32::UI::Controls::MARGINS;
 use windows::Win32::UI::Shell::{IShellLinkW, ShellLink};
 use windows::Win32::UI::WindowsAndMessaging::SetPropW;
-use windows::core::{BOOL, Interface, PCWSTR, PWSTR, w};
+use windows::core::{BOOL, Interface, PCWSTR, PWSTR, s, w};
 
 use crate::consts;
 
@@ -287,3 +297,116 @@ pub fn system_fonts() -> Result<Vec<String>, windows::core::Error> {
     Ok(fonts)
   }
 }
+
+#[derive(Default)]
+pub struct AppsUseThemeMonitor {
+  is_running: Arc<AtomicBool>,
+  hshutdown: HANDLE,
+  hthread: Option<thread::JoinHandle<()>>,
+}
+
+impl AppsUseThemeMonitor {
+  pub fn start<F>(&mut self, callback: F)
+  where
+    F: Fn(Theme) + Send + 'static,
+  {
+    if self.is_running.load(Ordering::Relaxed) {
+      return;
+    }
+
+    self.is_running.store(true, Ordering::Relaxed);
+    self.hshutdown =
+      unsafe { CreateEventA(None, true, false, None) }.expect("Shutdown event create failed");
+
+    let initial_theme = apps_use_theme();
+    let mut last_theme = initial_theme;
+
+    let callback = Box::new(callback);
+    let is_running = Arc::clone(&self.is_running);
+
+    // https://github.com/microsoft/windows-rs/issues/3169#issuecomment-2489378071
+    let hshutdown = self.hshutdown.0 as isize;
+    let hthread = thread::spawn(move || {
+      use tracing::error;
+
+      let mut hkey = HKEY::default();
+      if let Err(error) = unsafe {
+        RegOpenKeyExA(
+          HKEY_CURRENT_USER,
+          s!("Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"),
+          None,
+          KEY_NOTIFY,
+          &mut hkey,
+        )
+      }
+      .ok()
+      {
+        error!(message = "Open registry key failed", ?error);
+        return;
+      }
+
+      'monitor: while is_running.load(Ordering::Relaxed) {
+        let hevent = match unsafe { CreateEventA(None, true, false, None) } {
+          Ok(hevent) => hevent,
+          Err(error) => {
+            error!("Create event failed: {error:?}");
+            break;
+          }
+        };
+
+        if let Err(error) = unsafe {
+          RegNotifyChangeKeyValue(hkey, false, REG_NOTIFY_CHANGE_LAST_SET, Some(hevent), true)
+        }
+        .ok()
+        {
+          error!("RegNotifyChangeKeyValue failed: {error:?}");
+          let _ = unsafe { CloseHandle(hevent) };
+          break;
+        }
+
+        let handles = [hevent, HANDLE(hshutdown as _)];
+        let wait_event = unsafe { WaitForMultipleObjects(&handles, false, INFINITE) };
+        let _ = unsafe { CloseHandle(hevent) };
+
+        match wait_event {
+          WAIT_OBJECT_0 => {
+            let new_theme = apps_use_theme();
+            if new_theme != last_theme {
+              last_theme = new_theme;
+              callback(new_theme);
+            }
+          }
+          WAIT_EVENT(1) => break 'monitor,
+          WAIT_FAILED => {
+            error!("WaitForMultipleObjects failed: {wait_event:?}");
+            break 'monitor;
+          }
+          _ => {
+            error!("WaitForMultipleObjects unexpected result: {wait_event:?}");
+            break 'monitor;
+          }
+        }
+      }
+
+      let _ = unsafe { RegCloseKey(hkey) };
+    });
+
+    self.hthread = Some(hthread);
+  }
+
+  pub fn stop(&mut self) {
+    if !self.is_running.load(Ordering::Relaxed) {
+      return;
+    }
+
+    self.is_running.store(false, Ordering::Relaxed);
+
+    let _ = unsafe { SetEvent(self.hshutdown) };
+
+    if let Some(hthread) = self.hthread.take() {
+      hthread.join().expect("Thread join failed");
+    }
+
+    let _ = unsafe { CloseHandle(self.hshutdown) };
+  }
+}

src-tauri/Tauri.toml

@@ -1,4 +1,6 @@
 use std::path::PathBuf;
+use std::sync::atomic::AtomicBool;
+use std::sync::atomic::Ordering;
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
 use std::{env, process};
@@ -16,6 +18,7 @@ use super::internals;
 use super::singleton::Singleton;
 use super::tracing::Tracing;
 use super::updater::{UpdatedKind, Updater};
+use crate::bootstrap::ffi::AppsUseThemeMonitor;
 use crate::business::GachaMetadata;
 use crate::database::{self, Database, KvMut};
 use crate::models::{ThemeData, WindowState};
@@ -32,6 +35,9 @@ pub async fn start(singleton: Singleton, tracing: Tracing, database: Database) {
   // Arc shared database to Tauri state
   let database = Arc::new(database);
 
+  #[cfg(windows)]
+  let mut apps_use_theme_monitor = AppsUseThemeMonitor::default();
+
   info!("Loading theme data...");
   let color_scheme = KvMut::from(&database, consts::KV_THEME_DATA)
     .try_read_val_json::<ThemeData>()
@@ -42,6 +48,7 @@ pub async fn start(singleton: Singleton, tracing: Tracing, database: Database) {
     .and_then(|theme_data| theme_data.color_scheme)
     .unwrap_or_else(|| {
       if cfg!(windows) {
+        FLAG_AUTO_COLOR_SCHEME.store(true, Ordering::Relaxed);
         ffi::apps_use_theme()
       } else {
         Theme::Light
@@ -318,9 +325,30 @@ pub async fn start(singleton: Singleton, tracing: Tracing, database: Database) {
     .build(generate_context!())
     .expect("Error while building Tauri application");
 
+  #[cfg(windows)]
+  {
+    info!("Start AppsUseTheme monitor thread...");
+    let app_handle = app.handle().clone();
+    apps_use_theme_monitor.start(move |color_scheme| {
+      info!("Detected system color scheme change: {color_scheme:?}");
+
+      if FLAG_AUTO_COLOR_SCHEME.load(Ordering::Relaxed)
+        && let Some(main_window) = app_handle.get_webview_window(consts::TAURI_MAIN_WINDOW_LABEL)
+      {
+        ffi::set_window_theme(&main_window, color_scheme);
+        let _ = ffi::set_webview_theme(&main_window, color_scheme);
+        let _ = main_window.emit(consts::EVENT_COLOR_SCHEME_CHANGED, color_scheme);
+      }
+    });
+  }
+
   let exit_code = app.run_return(|_app_handle, _event| {});
 
   info!("Tauri exiting...");
+
+  #[cfg(windows)]
+  apps_use_theme_monitor.stop();
+
   database.close().await;
   tracing.close();
   drop(singleton);
@@ -406,12 +434,22 @@ fn core_is_supported_window_vibrancy() -> bool {
   ffi::is_supported_window_vibrancy()
 }
 
+#[cfg(windows)]
+static FLAG_AUTO_COLOR_SCHEME: AtomicBool = AtomicBool::new(false);
+
 #[tauri::command]
-fn core_change_theme(window: WebviewWindow, color_scheme: Theme) -> Result<(), tauri::Error> {
+fn core_change_theme(
+  window: WebviewWindow,
+  color_scheme: Option<Theme>,
+) -> Result<(), tauri::Error> {
+  FLAG_AUTO_COLOR_SCHEME.store(color_scheme.is_none(), Ordering::Relaxed);
+
+  let color_scheme = color_scheme.unwrap_or(ffi::apps_use_theme());
   if !consts::TAURI_MAIN_WINDOW_DECORATIONS {
     ffi::set_window_theme(&window, color_scheme);
     ffi::set_webview_theme(&window, color_scheme)?;
   }
+
   Ok(())
 }