I promise this is the last time I touch the dark title bar code

lay295 · Oct 15, 2023 · 193b0ca · 193b0ca
1 parent 3f7b79e
commit 193b0ca
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/TwitchDownloaderWPF/Services/NativeFunctions.cs b/TwitchDownloaderWPF/Services/NativeFunctions.cs
@@ -5,9 +5,9 @@
 namespace TwitchDownloaderWPF.Services
 {
     [SupportedOSPlatform("windows")]
-    public static class NativeFunctions
+    public static unsafe class NativeFunctions
     {
         [DllImport("dwmapi.dll", EntryPoint = "DwmSetWindowAttribute", PreserveSig = true)]
-        public static extern int SetWindowAttribute(IntPtr handle, int attribute, [In] ref int attributeValue, int attributeSize);
+        public static extern int SetWindowAttribute(IntPtr handle, int attribute, void* attributeValue, uint attributeSize);
     }
 }
diff --git a/TwitchDownloaderWPF/Services/ThemeService.cs b/TwitchDownloaderWPF/Services/ThemeService.cs
@@ -103,7 +103,13 @@ public void SetTitleBarTheme(WindowCollection windows)
             foreach (Window window in windows)
             {
                 var windowHandle = new WindowInteropHelper(window).Handle;
-                NativeFunctions.SetWindowAttribute(windowHandle, darkTitleBarAttribute, ref shouldUseDarkTitleBar, sizeof(int));
+                if (windowHandle == IntPtr.Zero)
+                    continue;
+
+                unsafe
+                {
+                    _ = NativeFunctions.SetWindowAttribute(windowHandle, darkTitleBarAttribute, &shouldUseDarkTitleBar, sizeof(int));
+                }
             }
 
             Window wnd = new()

diff --git a/TwitchDownloaderWPF/TwitchDownloaderWPF.csproj b/TwitchDownloaderWPF/TwitchDownloaderWPF.csproj
@@ -21,6 +21,7 @@
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <EnableNETAnalyzers>false</EnableNETAnalyzers>
     <Platforms>AnyCPU;x64</Platforms>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <!--TODO: <Nullable>enable</Nullable> once we have required keyword-->
   </PropertyGroup>
   <PropertyGroup>