fixup! fix: maximized windows stay maximized when new windows are cre…

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

Hide file tree

Showing 2 changed files with 44 additions and 11 deletions.
diff --git a/GlazeWM.Domain/Windows/CommandHandlers/SetMaximizedHandler.cs b/GlazeWM.Domain/Windows/CommandHandlers/SetMaximizedHandler.cs
@@ -19,17 +19,6 @@ 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/EventHandlers/WindowLocationChangedHandler.cs b/GlazeWM.Domain/Windows/EventHandlers/WindowLocationChangedHandler.cs
@@ -1,7 +1,9 @@
+using System;
 using GlazeWM.Domain.Containers.Commands;
 using GlazeWM.Domain.Monitors.Commands;
 using GlazeWM.Infrastructure.Bussing;
 using GlazeWM.Infrastructure.Common.Events;
+using static GlazeWM.Infrastructure.WindowsApi.WindowsApiService;
 
 namespace GlazeWM.Domain.Windows.EventHandlers
 {
@@ -20,11 +22,53 @@ public void Handle(WindowLocationChangedEvent @event)
     {
       var windowHandle = @event.WindowHandle;
 
+      HandleMaximizedWindow(windowHandle);
+
       if (!_windowService.AppBarHandles.Contains(windowHandle))
         return;
 
       _bus.Invoke(new RefreshMonitorStateCommand());
       _bus.Invoke(new RedrawContainersCommand());
     }
+
+    private void HandleMaximizedWindow(IntPtr windowHandle)
+    {
+      var window = _windowService.GetWindowByHandle(windowHandle);
+      if (window is null)
+        return;
+
+      var windowPlacement = WindowService.GetPlacementOfHandle(windowHandle);
+      var isMaximized = windowPlacement.ShowCommand == ShowWindowFlags.Maximize;
+
+      if (isMaximized && window is not MaximizedWindow)
+      {
+        var maximizedWindow = new MaximizedWindow(
+          window.Handle,
+          window.FloatingPlacement,
+          window.BorderDelta
+        )
+        {
+          Id = window.Id
+        };
+
+        _bus.Invoke(new ReplaceContainerCommand(maximizedWindow, window.Parent, window.Index));
+      }
+
+      if (!isMaximized && window is MaximizedWindow)
+      {
+        // C# isn't my mothertongue, I couldn't find a way to factorize the content of these two if blocks
+        // because of the type difference. Anyone's welcome to refactor this!
+        var tilingWindow = new TilingWindow(
+          window.Handle,
+          window.FloatingPlacement,
+          window.BorderDelta
+        )
+        {
+          Id = window.Id
+        };
+
+        _bus.Invoke(new ReplaceContainerCommand(tilingWindow, window.Parent, window.Index));
+      }
+    }
   }
 }