feat: add intermediary display states

glzr-io · Sep 7, 2023 · 559b256 · 559b256
1 parent 099f614
commit 559b256
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 16 deletions.
diff --git a/GlazeWM.Domain/Common/Enums/DisplayState.cs b/GlazeWM.Domain/Common/Enums/DisplayState.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace GlazeWM.Domain.Common.Enums
+{
+  public enum DisplayState
+  {
+    Shown,
+    Showing,
+    Hidden,
+    Hiding,
+  }
+}
diff --git a/GlazeWM.Domain/Containers/CommandHandlers/RedrawContainersHandler.cs b/GlazeWM.Domain/Containers/CommandHandlers/RedrawContainersHandler.cs
@@ -70,11 +70,19 @@ private void SetWindowPosition(Window window)
         SetWindowPosFlags.NoCopyBits |
         SetWindowPosFlags.NoSendChanging;
 
+      var workspace = window.Ancestors.OfType<Workspace>().First();
+
       // Show or hide the window depending on whether the workspace is displayed.
-      if (window.IsDisplayed)
+      if (workspace.IsDisplayed)
+      {
         defaultFlags |= SetWindowPosFlags.ShowWindow;
+        window.DisplayState = DisplayState.Showing;
+      }
       else
+      {
         defaultFlags |= SetWindowPosFlags.HideWindow;
+        window.DisplayState = DisplayState.Hiding;
+      }
 
       if (window is TilingWindow)
       {

diff --git a/GlazeWM.Domain/Windows/EventHandlers/WindowFocusedHandler.cs b/GlazeWM.Domain/Windows/EventHandlers/WindowFocusedHandler.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using GlazeWM.Domain.Common.Enums;
 using GlazeWM.Domain.Common.Utils;
 using GlazeWM.Domain.Containers;
 using GlazeWM.Domain.Containers.Commands;
@@ -8,7 +9,6 @@
 using GlazeWM.Infrastructure.Bussing;
 using GlazeWM.Infrastructure.Common.Events;
 using Microsoft.Extensions.Logging;
-using static GlazeWM.Infrastructure.WindowsApi.WindowsApiService;
 
 namespace GlazeWM.Domain.Windows.EventHandlers
 {
@@ -68,9 +68,19 @@ public void Handle(WindowFocusedEvent @event)
       var window = _windowService.GetWindows()
         .FirstOrDefault(window => window.Handle == @event.WindowHandle);
 
-      if (window is null || window?.IsDisplayed == false)
+      if (window is null)
         return;
 
+      // TODO: Need to return early for other display states.
+      // TODO: Should this be moved to `WindowShownHandler`. Is show event
+      // emitted first, or foreground?
+      if (window.DisplayState is DisplayState.Hidden)
+      {
+        _logger.LogWindowEvent("Focusing off-screen window", window);
+        var workspace = WorkspaceService.GetWorkspaceFromChildContainer(window);
+        _bus.Invoke(new FocusWorkspaceCommand(workspace.Name));
+      }
+
       _logger.LogWindowEvent("Window focused", window);
 
       _bus.Invoke(new SetFocusedDescendantCommand(window));

diff --git a/GlazeWM.Domain/Windows/EventHandlers/WindowHiddenHandler.cs b/GlazeWM.Domain/Windows/EventHandlers/WindowHiddenHandler.cs
@@ -38,16 +38,22 @@ public void Handle(WindowHiddenEvent @event)
       var window = _windowService.GetWindows()
         .FirstOrDefault(window => window.Handle == windowHandle);
 
-      // Ignore events where the window isn't managed or is actually supposed to be hidden. Since
-      // window events are processed in a sequence, also handle case where the window is not
-      // actually hidden anymore when the event is processed.
-      if (window?.IsDisplayed != true || WindowService.IsHandleVisible(window.Handle))
+      // Ignore event if window is unmanaged.
+      if (window is null)
         return;
 
       _logger.LogWindowEvent("Window hidden", window);
 
+      // Update display state.
+      if (window.DisplayState is DisplayState.Hiding)
+      {
+        window.DisplayState = DisplayState.Hidden;
+        return;
+      }
+
       // Detach the hidden window from its parent.
-      _bus.Invoke(new UnmanageWindowCommand(window));
+      if (window.DisplayState is DisplayState.Shown)
+        _bus.Invoke(new UnmanageWindowCommand(window));
     }
   }
 }
diff --git a/GlazeWM.Domain/Windows/EventHandlers/WindowShownHandler.cs b/GlazeWM.Domain/Windows/EventHandlers/WindowShownHandler.cs
@@ -31,11 +31,16 @@ public void Handle(WindowShownEvent @event)
       var window = _windowService.GetWindows()
         .FirstOrDefault(window => window.Handle == windowHandle);
 
-      // Ignore cases where window is already managed.
-      if (window is not null || !WindowService.IsHandleManageable(windowHandle))
+      // Manage the window if it's manageable.
+      if (window is null && WindowService.IsHandleManageable(windowHandle))
+      {
+        _bus.Invoke(new ManageWindowCommand(@event.WindowHandle));
         return;
+      }
 
-      _bus.Invoke(new ManageWindowCommand(@event.WindowHandle));
+      // Update display state if window is already managed.
+      if (window?.DisplayState == DisplayState.Showing)
+        window.DisplayState = DisplayState.Shown;
     }
   }
 }
diff --git a/GlazeWM.Domain/Windows/Window.cs b/GlazeWM.Domain/Windows/Window.cs
@@ -14,6 +14,11 @@ public abstract class Window : Container
 
     public IntPtr Handle { get; }
 
+    /// <summary>
+    /// Whether window is shown, hidden, or in an intermediary state.
+    /// </summary>
+    public DisplayState DisplayState { get; set; } = DisplayState.Displayed;
+
     /// <summary>
     /// The placement of the window when floating. Initialized with window's placement on launch
     /// and updated on resize/move whilst floating.
@@ -39,11 +44,6 @@ protected Window(IntPtr handle, Rect floatingPlacement, RectDelta borderDelta)
       BorderDelta = borderDelta;
     }
 
-    /// <summary>
-    /// Windows are displayed if their parent workspace is displayed.
-    /// </summary>
-    public bool IsDisplayed => WorkspaceService.GetWorkspaceFromChildContainer(this).IsDisplayed;
-
     public string ProcessName =>
       WindowService.GetProcessOfHandle(Handle)?.ProcessName ?? string.Empty;