fix: maximized windows stay maximized when new windows are created an…

…d after switching worskpaces
glzr-io · Oct 4, 2023 · 1298f8e · 1298f8e
1 parent f292744
commit 1298f8e
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 5 deletions.
diff --git a/GlazeWM.Domain/Containers/CommandHandlers/RedrawContainersHandler.cs b/GlazeWM.Domain/Containers/CommandHandlers/RedrawContainersHandler.cs
@@ -39,8 +39,8 @@ public CommandResponse Handle(RedrawContainersCommand command)
       var windowsToRestore = windowsToRedraw
         .Where(
           (window) =>
-            window is not MinimizedWindow &&
-            window.HasWindowStyle(WindowStyles.Maximize | WindowStyles.Minimize)
+            (window is not MinimizedWindow && window.HasWindowStyle(WindowStyles.Minimize)) ||
+            (window is not MaximizedWindow && window.HasWindowStyle(WindowStyles.Maximize))
         )
         .ToList();
 
@@ -109,6 +109,13 @@ DisplayState.Shown or
         return;
       }
 
+      if (window is MaximizedWindow)
+      {
+        defaultFlags |= SetWindowPosFlags.NoSize;
+        defaultFlags |= SetWindowPosFlags.NoMove;
+        defaultFlags |= SetWindowPosFlags.NoZOrder;
+      }
+
       // Get z-order to set for floating windows.
       var shouldShowOnTop = _userConfigService.GeneralConfig.ShowFloatingOnTop;
       var floatingZOrder = shouldShowOnTop

diff --git a/GlazeWM.Domain/Windows/CommandHandlers/SetMaximizedHandler.cs b/GlazeWM.Domain/Windows/CommandHandlers/SetMaximizedHandler.cs
@@ -1,3 +1,4 @@
+using GlazeWM.Domain.Containers.Commands;
 using GlazeWM.Domain.Windows.Commands;
 using GlazeWM.Infrastructure.Bussing;
 using static GlazeWM.Infrastructure.WindowsApi.WindowsApiService;
@@ -6,11 +7,28 @@ namespace GlazeWM.Domain.Windows.CommandHandlers
 {
   internal sealed class SetMaximizedHandler : ICommandHandler<SetMaximizedCommand>
   {
+    private readonly Bus _bus;
+
+    public SetMaximizedHandler(Bus bus)
+    {
+      _bus = bus;
+    }
+
     public CommandResponse Handle(SetMaximizedCommand command)
     {
       var window = command.Window;
 
       ShowWindow(window.Handle, ShowWindowFlags.Maximize);
+      var maximizedWindow = new MaximizedWindow(
+        window.Handle,
+        window.FloatingPlacement,
+        window.BorderDelta
+      )
+      {
+        Id = window.Id
+      };
+
+      _bus.Invoke(new ReplaceContainerCommand(maximizedWindow, window.Parent, window.Index));
 
       return CommandResponse.Ok;
     }

diff --git a/GlazeWM.Domain/Windows/CommandHandlers/ToggleMaximizedHandler.cs b/GlazeWM.Domain/Windows/CommandHandlers/ToggleMaximizedHandler.cs
@@ -6,14 +6,21 @@ namespace GlazeWM.Domain.Windows.CommandHandlers
 {
   internal sealed class ToggleMaximizedHandler : ICommandHandler<ToggleMaximizedCommand>
   {
+    private readonly Bus _bus;
+
+    public ToggleMaximizedHandler(Bus bus)
+    {
+      _bus = bus;
+    }
+
     public CommandResponse Handle(ToggleMaximizedCommand command)
     {
       var window = command.Window;
 
-      if (window.HasWindowStyle(WindowStyles.Maximize))
-        ShowWindow(window.Handle, ShowWindowFlags.Restore);
+      if (window is MaximizedWindow)
+        _bus.Invoke(new SetTilingCommand(window));
       else
-        ShowWindow(window.Handle, ShowWindowFlags.Maximize);
+        _bus.Invoke(new SetMaximizedCommand(window));
 
       return CommandResponse.Ok;
     }