fix(Windows): fix set_minimized with Win + D (#676)

tauri-apps · Mar 7, 2023 · 373ca43 · 373ca43
1 parent 1be2574
commit 373ca43
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.changes/win+d-minimized.md b/.changes/win+d-minimized.md
@@ -0,0 +1,5 @@
+---
+"tao": "patch"
+---
+
+On Windows, fix `Window::set_minimized(false)` not working when the window was minimized using `Win + D` hotkey.
diff --git a/src/platform_impl/windows/window.rs b/src/platform_impl/windows/window.rs
@@ -485,7 +485,12 @@ impl Window {
     let window = self.window.clone();
     let window_state = Arc::clone(&self.window_state);
 
+    let is_minimized = self.is_minimized();
+
     self.thread_executor.execute_in_thread(move || {
+      WindowState::set_window_flags_in_place(&mut window_state.lock(), |f| {
+        f.set(WindowFlags::MINIMIZED, is_minimized)
+      });
       WindowState::set_window_flags(window_state.lock(), window.0, |f| {
         f.set(WindowFlags::MINIMIZED, minimized)
       });
@@ -512,8 +517,7 @@ impl Window {
 
   #[inline]
   pub fn is_minimized(&self) -> bool {
-    let window_state = self.window_state.lock();
-    window_state.window_flags.contains(WindowFlags::MINIMIZED)
+    unsafe { IsIconic(self.hwnd()) }.as_bool()
   }
 
   #[inline]