Fix window can't be hidden when maximized (#384)

* Fix window can't be hidden when maximized * remove `WindowFlags::MAXIMIZED` from diff if we are hiding * Update src/platform_impl/windows/window_state.rs Co-authored-by: Lucas Fernandes Nogueira <[email protected]> * Revert "Update src/platform_impl/windows/window_state.rs" This reverts commit a5083fd. Co-authored-by: amrbashir <[email protected]> Co-authored-by: Lucas Fernandes Nogueira <[email protected]>
tauri-apps · Jun 15, 2022 · cd9ad33 · cd9ad33
1 parent 74b9608
commit cd9ad33
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/.changes/flag.md b/.changes/flag.md
@@ -0,0 +1,5 @@
+---
+"tao": patch
+---
+
+Fix window can't be hidden when maximized.
diff --git a/src/platform_impl/windows/window_state.rs b/src/platform_impl/windows/window_state.rs
@@ -244,7 +244,19 @@ impl WindowFlags {
     self = self.mask();
     new = new.mask();
 
-    let diff = self ^ new;
+    let mut diff = self ^ new;
+
+    // when hiding a maximized window, `self` contains `WindowFlags::MAXIMIZED`
+    // but `new` won't have it as it is removed in `new.mask()` call by applying `WindowFlags::INVISIBLE_AND_MASK`
+    // so `diff` will contain `WindowFlags::MAXIMIZED` and that will cause the window to unmaximize, but
+    // since we are trying to hide the window, we need to apply `WindowFlags::INVISIBLE_AND_MASK` on `diff` too.
+    if diff.contains(WindowFlags::MAXIMIZED)
+      && diff.contains(WindowFlags::VISIBLE)
+      && !new.contains(WindowFlags::VISIBLE)
+    {
+      diff &= WindowFlags::INVISIBLE_AND_MASK;
+    }
+
     if diff == WindowFlags::empty() {
       return;
     }