From 07263f0ecc2c6c1ae5b4a719a55f03933c007836 Mon Sep 17 00:00:00 2001
From: Jade Macho <ade@0x0a.de>
Date: Sat, 16 Mar 2024 21:37:50 +0100
Subject: [PATCH] Fix clientedge

---
 CustomResolution/Configuration.cs     | 8 ++++----
 CustomResolution/Hooks/WndProcHook.cs | 1 +
 CustomResolution/Plugin.cs            | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CustomResolution/Configuration.cs b/CustomResolution/Configuration.cs
index e7a14fb..9073f9a 100644
--- a/CustomResolution/Configuration.cs
+++ b/CustomResolution/Configuration.cs
@@ -44,15 +44,15 @@ public static class DXVKDWMHackModeExt
     public static string ToHumanNameString(this DXVKDWMHackMode mode) => mode switch
     {
         DXVKDWMHackMode.Off => "Off",
-        DXVKDWMHackMode.UnsetPopup => "Best case: Disable WS_POPUP",
-        DXVKDWMHackMode.SetClientEdge => "Worst case: Enable WS_EX_CLIENTEDGE",
+        DXVKDWMHackMode.UnsetPopup => "Best: -WS_POPUP",
+        DXVKDWMHackMode.SetClientEdge => "Worst: +WS_EX_CLIENTEDGE",
         _ => mode.ToString(),
     };
 
     public static string? ToHumanInfoString(this DXVKDWMHackMode mode) => mode switch
     {
-        DXVKDWMHackMode.UnsetPopup => "Works best with NVIDIA GPUs.",
-        DXVKDWMHackMode.SetClientEdge => "Adds a 2 pixel border around the game.",
+        DXVKDWMHackMode.UnsetPopup => "Least intrusive option, doesn't work everywhere.\nWorks best with NVIDIA GPUs.",
+        DXVKDWMHackMode.SetClientEdge => "Extends the game window 1 pixel to the bottom.\nCauses problems in proper \"Full Screen\" mode!",
         _ => null
     };
 }
diff --git a/CustomResolution/Hooks/WndProcHook.cs b/CustomResolution/Hooks/WndProcHook.cs
index b987144..2275b38 100644
--- a/CustomResolution/Hooks/WndProcHook.cs
+++ b/CustomResolution/Hooks/WndProcHook.cs
@@ -108,6 +108,7 @@ public sealed unsafe class WndProcHook : IDisposable
                 GetMonitorInfo(monitor, &monitorInfo))
             {
                 ncsize->rgrc[0] = monitorInfo.rcMonitor;
+                ncsize->rgrc[0].bottom += 1;
 
                 args.SuppressCall = true;
             }
diff --git a/CustomResolution/Plugin.cs b/CustomResolution/Plugin.cs
index 7bc7a9d..6d6e398 100644
--- a/CustomResolution/Plugin.cs
+++ b/CustomResolution/Plugin.cs
@@ -260,7 +260,7 @@ public sealed unsafe class Plugin : IDalamudPlugin
 
         if (fullscreen)
         {
-            if (mode >= DXVKDWMHackMode.UnsetPopup)
+            if (mode == DXVKDWMHackMode.UnsetPopup)
             {
                 style &= ~WS.WS_POPUP;
             }
@@ -287,7 +287,7 @@ public sealed unsafe class Plugin : IDalamudPlugin
             Service.PluginLog.Info($"NEWEXSTYLE: 0x{exstyle:X8}");
         }
 
-        if (style != styleOrig || exstyle != exstyleOrig)
+        if (style != styleOrig || exstyle != exstyleOrig || _currentDXVKDWMHackMode != mode)
         {
             if (IsDebug)
             {