fix(windows): apply maximize state before minimize (#334)

tauri-apps · Mar 1, 2022 · 11dac10 · 11dac10
1 parent 19d7887
commit 11dac10
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/.changes/windows-maximize-minimize.md b/.changes/windows-maximize-minimize.md
@@ -0,0 +1,5 @@
+---
+"tao": "patch"
+---
+
+On Windows, apply maximize state before minimize. Fixes `Window::set_minimized` not working when the window is maximized.
diff --git a/src/platform_impl/windows/window_state.rs b/src/platform_impl/windows/window_state.rs
@@ -201,7 +201,6 @@ impl WindowFlags {
       style |= WS_THICKFRAME | WS_MAXIMIZEBOX;
     }
     if self.contains(WindowFlags::DECORATIONS) {
-      style |= WS_BORDER;
       style_ex |= WS_EX_WINDOWEDGE;
     }
     if self.contains(WindowFlags::VISIBLE) {
@@ -276,25 +275,25 @@ impl WindowFlags {
       }
     }
 
-    // Minimize operations should execute after maximize for proper window animations
-    if diff.contains(WindowFlags::MINIMIZED) {
+    if diff.contains(WindowFlags::MAXIMIZED) || new.contains(WindowFlags::MAXIMIZED) {
       unsafe {
         ShowWindow(
           window,
-          match new.contains(WindowFlags::MINIMIZED) {
-            true => SW_MINIMIZE,
+          match new.contains(WindowFlags::MAXIMIZED) {
+            true => SW_MAXIMIZE,
             false => SW_RESTORE,
           },
         );
       }
     }
 
-    if diff.contains(WindowFlags::MAXIMIZED) || new.contains(WindowFlags::MAXIMIZED) {
+    // Minimize operations should execute after maximize for proper window animations
+    if diff.contains(WindowFlags::MINIMIZED) {
       unsafe {
         ShowWindow(
           window,
-          match new.contains(WindowFlags::MAXIMIZED) {
-            true => SW_MAXIMIZE,
+          match new.contains(WindowFlags::MINIMIZED) {
+            true => SW_MINIMIZE,
             false => SW_RESTORE,
           },
         );