feat(notifications): use the ligh windows-version crate (#750)

* feat(notifications): use the ligh `windows-version` crate * Update desktop.rs * optional
tauri-apps · Nov 21, 2023 · 445c1e6 · 445c1e6
1 parent 88d260d
commit 445c1e6
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/plugins/notification/Cargo.toml b/plugins/notification/Cargo.toml
@@ -32,6 +32,7 @@ notify-rust = "4.5"
 
 [target."cfg(windows)".dependencies]
 win7-notifications = { version = "0.3.1", optional = true }
+windows-version = { version = "0.1", optional = true }
 
 [features]
-windows7-compat = [ "win7-notifications" ]
+windows7-compat = [ "win7-notifications", "windows-version" ]
diff --git a/plugins/notification/src/desktop.rs b/plugins/notification/src/desktop.rs
@@ -226,7 +226,13 @@ mod imp {
         pub fn notify<R: tauri::Runtime>(self, app: &tauri::AppHandle<R>) -> crate::Result<()> {
             #[cfg(windows)]
             {
-                if tauri::utils::platform::is_windows_7() {
+                fn is_windows_7() -> bool {
+                    let v = windows_version::OsVersion::current();
+                    // windows 7 is 6.1
+                    v.major == 6 && v.minor == 1
+                }
+
+                if is_windows_7() {
                     self.notify_win7(app)
                 } else {
                     #[allow(deprecated)]