From 74256c12b2be5291f1fa5b3d3e1cfe012a7dcd47 Mon Sep 17 00:00:00 2001
From: FrzMtrsprt <alex20020703@163.com>
Date: Sat, 29 Oct 2022 10:43:25 +0800
Subject: [PATCH] Enable dark window border

Import DwmSetWindowAttribute() from Win32 API, and set dark window border according to the theme.
---
 clashN/clashN/Tool/Utils.cs                   | 25 +++++++++++++++++++
 .../clashN/ViewModels/MainWindowViewModel.cs  |  2 ++
 2 files changed, 27 insertions(+)

diff --git a/clashN/clashN/Tool/Utils.cs b/clashN/clashN/Tool/Utils.cs
index 8c47bb5..f8256be 100644
--- a/clashN/clashN/Tool/Utils.cs
+++ b/clashN/clashN/Tool/Utils.cs
@@ -14,6 +14,7 @@ using System.Net.NetworkInformation;
 using System.Net.Sockets;
 using System.Reflection;
 using System.Runtime.Serialization.Formatters.Binary;
+using System.Runtime.InteropServices;
 using System.Security.Principal;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -1023,6 +1024,17 @@ namespace clashN
                 SaveLog(ex.Message, ex);
             }
         }
+
+        public static void SetDarkBorder(System.Windows.Window window, bool dark)
+        {
+            // Make sure the handle is created before the window is shown
+            IntPtr hWnd = new System.Windows.Interop.WindowInteropHelper(window).EnsureHandle();
+            int attribute = dark ? 1 : 0;
+            uint attributeSize = (uint)Marshal.SizeOf(attribute);
+            DwmSetWindowAttribute(hWnd, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1, ref attribute, attributeSize);
+            DwmSetWindowAttribute(hWnd, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, ref attribute, attributeSize);
+        }
+
         #endregion
 
         #region TempPath
@@ -1229,5 +1241,18 @@ namespace clashN
         }
         #endregion
 
+        #region Interop
+
+        [Flags]
+        public enum DWMWINDOWATTRIBUTE : uint
+        {
+            DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1 = 19,
+            DWMWA_USE_IMMERSIVE_DARK_MODE = 20,
+        }
+
+        [DllImport("dwmapi.dll")]
+        public static extern int DwmSetWindowAttribute(IntPtr hwnd, DWMWINDOWATTRIBUTE attribute, ref int attributeValue, uint attributeSize);
+
+        #endregion
     }
 }
diff --git a/clashN/clashN/ViewModels/MainWindowViewModel.cs b/clashN/clashN/ViewModels/MainWindowViewModel.cs
index f764c94..f79ad07 100644
--- a/clashN/clashN/ViewModels/MainWindowViewModel.cs
+++ b/clashN/clashN/ViewModels/MainWindowViewModel.cs
@@ -482,6 +482,8 @@ namespace clashN.ViewModels
 
             theme.SetBaseTheme(isDarkTheme ? Theme.Dark : Theme.Light);
             _paletteHelper.SetTheme(theme);
+
+            Utils.SetDarkBorder(Application.Current.MainWindow, isDarkTheme);
         }
         public void ChangePrimaryColor(System.Windows.Media.Color color)
         {