From 44051b70641455a64ef7b5ab35f30097fb5f6615 Mon Sep 17 00:00:00 2001
From: Charles Milette <charles.milette@gmail.com>
Date: Sat, 21 Dec 2019 15:32:01 -0500
Subject: [PATCH] Fix dark titlebar for Windows 10 20H1

---
 ShareX.HelpersLib/Native/NativeEnums.cs           |  4 +++-
 ShareX.HelpersLib/Native/NativeMethods_Helpers.cs | 14 ++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ShareX.HelpersLib/Native/NativeEnums.cs b/ShareX.HelpersLib/Native/NativeEnums.cs
index 8c5e353d2..eebc91ac7 100644
--- a/ShareX.HelpersLib/Native/NativeEnums.cs
+++ b/ShareX.HelpersLib/Native/NativeEnums.cs
@@ -2084,7 +2084,9 @@ public enum DwmWindowAttribute : uint
         /// </summary>
         DWMWA_LAST,
         // Undocumented, available since October 2018 update (build 17763)
-        DWMWA_USE_IMMERSIVE_DARK_MODE = 19
+        DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1 = 19,
+        // Windows 10 20H1 changed the value of the constant
+        DWMWA_USE_IMMERSIVE_DARK_MODE = 20
     }
 
     public enum InputType : int
diff --git a/ShareX.HelpersLib/Native/NativeMethods_Helpers.cs b/ShareX.HelpersLib/Native/NativeMethods_Helpers.cs
index 2b3fcbe6e..bc69ffb53 100644
--- a/ShareX.HelpersLib/Native/NativeMethods_Helpers.cs
+++ b/ShareX.HelpersLib/Native/NativeMethods_Helpers.cs
@@ -235,16 +235,14 @@ public static bool UseImmersiveDarkMode(IntPtr handle, bool enabled)
         {
             if (Helpers.IsWindows10OrGreater(17763))
             {
-                try
+                var attribute = DwmWindowAttribute.DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1;
+                if (Helpers.IsWindows10OrGreater(18985))
                 {
-                    int useImmersiveDarkMode = enabled ? 1 : 0;
-                    int result = DwmSetWindowAttribute(handle, (int)DwmWindowAttribute.DWMWA_USE_IMMERSIVE_DARK_MODE, ref useImmersiveDarkMode, sizeof(int));
-                    return result == 0;
-                }
-                catch (Exception e)
-                {
-                    DebugHelper.WriteException(e);
+                    attribute = DwmWindowAttribute.DWMWA_USE_IMMERSIVE_DARK_MODE;
                 }
+
+                int useImmersiveDarkMode = enabled ? 1 : 0;
+                return DwmSetWindowAttribute(handle, (int)attribute, ref useImmersiveDarkMode, sizeof(int)) == 0;
             }
 
             return false;