Support snap layouts on Windows 11 (Kinnara#467)

* Support snap layouts on Windows 11

* Don't trigger build when pushing to non-master branches

.github/workflows/build.yml

@@ -1,6 +1,10 @@
 name: Build
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ '**' ]
 
 jobs:
   build:

Directory.Build.props

@@ -3,6 +3,6 @@
     <Version>0.9.5</Version>
     <Authors>Yimeng Wu</Authors>
     <Product>ModernWPF UI Library</Product>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>10.0</LangVersion>
   </PropertyGroup>
 </Project>

ModernWpf.SampleApp/app.manifest

@@ -52,7 +52,7 @@
 
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
       <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
     </windowsSettings>
   </application>

ModernWpf/Common/DpiScale2.cs

@@ -0,0 +1,23 @@
+using System.Windows;
+
+namespace ModernWpf
+{
+    internal readonly record struct DpiScale2
+    {
+        public DpiScale2(double dpiScaleX, double dpiScaleY)
+        {
+            DpiScaleX = dpiScaleX;
+            DpiScaleY = dpiScaleY;
+        }
+
+#if NET462_OR_NEWER
+        public DpiScale2(DpiScale dpiScale)
+            : this(dpiScale.DpiScaleX, dpiScale.DpiScaleY)
+        {
+        }
+#endif
+
+        public double DpiScaleX { get; }
+        public double DpiScaleY { get; }
+    }
+}

ModernWpf/Controls/Primitives/MaximizedWindowFixer.cs

@@ -1,12 +1,10 @@
-using MS.Win32;
-using Standard;
-using System;
-using System.Diagnostics;
+using System;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Interop;
-using System.Windows.Media;
+using MS.Win32;
+using Standard;
 using NativeMethods = Standard.NativeMethods;
 
 namespace ModernWpf.Controls.Primitives
@@ -216,22 +214,12 @@ private Thickness GetMaximizedWindowBorder()
                 return new Thickness();
             }
 
-            double dpiScaleX, dpiScaleY;
-#if NET462_OR_NEWER
-            DpiScale dpi = VisualTreeHelper.GetDpi(_window);
-            dpiScaleX = dpi.DpiScaleX;
-            dpiScaleY = dpi.DpiScaleY;
-#else
-            Matrix transformToDevice = _hwndSource.CompositionTarget.TransformToDevice;
-            dpiScaleX = transformToDevice.M11;
-            dpiScaleY = transformToDevice.M22;
-#endif
-
+            var dpi = _window.GetDpi();
             int frameWidth = NativeMethods.GetSystemMetrics(SM.CXSIZEFRAME);
             int frameHeight = NativeMethods.GetSystemMetrics(SM.CYSIZEFRAME);
             int borderPadding = NativeMethods.GetSystemMetrics(SM.CXPADDEDBORDER);
             Size borderSize = new Size(frameWidth + borderPadding, frameHeight + borderPadding);
-            Size borderSizeInDips = DpiHelper.DeviceSizeToLogical(borderSize, dpiScaleX, dpiScaleY);
+            Size borderSizeInDips = DpiHelper.DeviceSizeToLogical(borderSize, dpi.DpiScaleX, dpi.DpiScaleY);
 
             return new Thickness(borderSizeInDips.Width, borderSizeInDips.Height, borderSizeInDips.Width, borderSizeInDips.Height);
         }

ModernWpf/Helpers/Helper.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Diagnostics;
 using System.Windows;
+using System.Windows.Interop;
 using System.Windows.Media;
 
 namespace ModernWpf
@@ -80,6 +82,31 @@ public static bool HasLocalValue(this DependencyObject d, DependencyProperty dp)
         {
             return d.ReadLocalValue(dp) != DependencyProperty.UnsetValue;
         }
+
+        public static DpiScale2 GetDpi(this Window window)
+        {
+            if (window is null)
+            {
+                throw new ArgumentNullException(nameof(window));
+            }
+
+#if NET462_OR_NEWER
+            return new DpiScale2(VisualTreeHelper.GetDpi(window));
+#else
+            var hwnd = new WindowInteropHelper(window).Handle;
+            var hwndSource = HwndSource.FromHwnd(hwnd);
+            if (hwndSource != null)
+            {
+                Matrix transformToDevice = hwndSource.CompositionTarget.TransformToDevice;
+                return new DpiScale2(transformToDevice.M11, transformToDevice.M22);
+            }
+            else
+            {
+                Debug.Fail("Should not reach here");
+                return new DpiScale2(1, 1);
+            }
+#endif
+        }
     }
 
     internal enum InterestPoint

ModernWpf/Helpers/OSVersionHelper.cs

@@ -14,6 +14,8 @@ internal static class OSVersionHelper
 
         internal static bool IsWindows10OrGreater { get; } = IsWindowsNT && _osVersion >= new Version(10, 0);
 
+        internal static bool IsWindows11OrGreater { get; } = IsWindowsNT && _osVersion >= new Version(10, 0, 22000);
+
         private static Version GetOSVersion()
         {
             var osv = new RTL_OSVERSIONINFOEX();

ModernWpf/ModernWpf.csproj

@@ -59,6 +59,12 @@
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.2.1-beta">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
   <ItemGroup>
     <Page Remove="Properties\DesignTimeResources.xaml" />
   </ItemGroup>

ModernWpf/NativeMethods.txt

@@ -0,0 +1,7 @@
+WM_NCHITTEST
+WM_NCMOUSEMOVE
+WM_NCLBUTTONDOWN
+WM_NCLBUTTONUP
+WM_NCMOUSELEAVE
+HTCLIENT
+HTMAXBUTTON

ModernWpf/Standard/Utilities.cs

@@ -12,10 +12,29 @@
 
 namespace Standard
 {
+    using System;
     using System.Diagnostics.CodeAnalysis;
 
     internal static partial class Utility
     {
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static int GET_X_LPARAM(IntPtr lParam)
+        {
+            return LOWORD(lParam.ToInt32());
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static int GET_Y_LPARAM(IntPtr lParam)
+        {
+            return HIWORD(lParam.ToInt32());
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static int HIWORD(int i)
+        {
+            return (short)(i >> 16);
+        }
+
         [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         public static int LOWORD(int i)
         {

ModernWpf/Styles/Window.xaml

@@ -29,7 +29,7 @@
         x:Shared="False"
         CaptionHeight="{DynamicResource {x:Static local:TitleBar.HeightKey}}"
         CornerRadius="0"
-        GlassFrameThickness="0,1,0,0"
+        GlassFrameThickness="{x:Static WindowChrome.GlassFrameCompleteThickness}"
         UseAeroCaptionButtons="False" />
 
     <Style x:Key="BaseWindowStyle" TargetType="Window">