[FancyZones] Fix moved to the current active monitor when maximized

quyenvsp · Dec 16, 2023 · f452e8e · f452e8e
1 parent bf7462b
commit f452e8e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/src/modules/fancyzones/FancyZonesLib/MonitorUtils.cpp b/src/modules/fancyzones/FancyZonesLib/MonitorUtils.cpp
@@ -360,7 +360,7 @@ namespace MonitorUtils
  if (GetMonitorInfo(monitor, &destMi))
  {
  RECT newPosition = FitOnScreen(placement.rcNormalPosition, originMi.rcWork, destMi.rcWork);
- FancyZonesWindowUtils::SizeWindowToRect(window, newPosition);
+ FancyZonesWindowUtils::SizeWindowToRect(window, newPosition, false);
  }
  }
  }

diff --git a/src/modules/fancyzones/FancyZonesLib/WindowUtils.cpp b/src/modules/fancyzones/FancyZonesLib/WindowUtils.cpp
@@ -253,7 +253,7 @@ void FancyZonesWindowUtils::SwitchToWindow(HWND window) noexcept
  }
 }
 
-void FancyZonesWindowUtils::SizeWindowToRect(HWND window, RECT rect) noexcept
+void FancyZonesWindowUtils::SizeWindowToRect(HWND window, RECT rect, BOOL snapZone) noexcept
 {
  WINDOWPLACEMENT placement{};
  ::GetWindowPlacement(window, &placement);
@@ -265,8 +265,15 @@ void FancyZonesWindowUtils::SizeWindowToRect(HWND window, RECT rect) noexcept
  ::GetWindowPlacement(window, &placement);
  }
 
+ BOOL maximizeLater = false;
  if (IsWindowVisible(window))
  {
+ // If is not snap zone then need keep maximize state (move to active monitor)
+ if (!snapZone && placement.showCmd == SW_SHOWMAXIMIZED)
+ {
+ maximizeLater = true;
+ }
+
  // Do not restore minimized windows. We change their placement though so they restore to the correct zone.
  if ((placement.showCmd != SW_SHOWMINIMIZED) &&
  (placement.showCmd != SW_MINIMIZE))
@@ -294,6 +301,12 @@ void FancyZonesWindowUtils::SizeWindowToRect(HWND window, RECT rect) noexcept
  Logger::error(L"SetWindowPlacement failed, {}", get_last_error_or_default(GetLastError()));
  }
 
+ // make sure window is moved to the correct monitor before maximize.
+ if (maximizeLater)
+ {
+ placement.showCmd = SW_SHOWMAXIMIZED;
+ }
+
  // Do it again, allowing Windows to resize the window and set correct scaling
  // This fixes Issue #365
  result = ::SetWindowPlacement(window, &placement);

diff --git a/src/modules/fancyzones/FancyZonesLib/WindowUtils.h b/src/modules/fancyzones/FancyZonesLib/WindowUtils.h
@@ -31,7 +31,7 @@ namespace FancyZonesWindowUtils
  bool IsExcludedByDefault(const HWND& hwnd, const std::wstring& processPath) noexcept;
 
  void SwitchToWindow(HWND window) noexcept;
- void SizeWindowToRect(HWND window, RECT rect) noexcept; // Parameter rect must be in screen coordinates (e.g. obtained from GetWindowRect)
+ void SizeWindowToRect(HWND window, RECT rect, BOOL snapZone = true) noexcept; // Parameter rect must be in screen coordinates (e.g. obtained from GetWindowRect)
  void SaveWindowSizeAndOrigin(HWND window) noexcept;
  void RestoreWindowSize(HWND window) noexcept;
  void RestoreWindowOrigin(HWND window) noexcept;