Remove Changes

Author: wherewhere

Directory.Build.targets

@@ -1,10 +1,4 @@
 <Project>
-  <PropertyGroup>
-    <Version>0.10.0</Version>
-    <Authors>Yimeng Wu</Authors>
-    <Product>ModernWPF UI Library</Product>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(PackageId)' != ''">
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/Kinnara/ModernWpf</PackageProjectUrl>
@@ -75,4 +69,4 @@
       </Choose>
     </When>
   </Choose>
-</Project>
+</Project>

ModernWpf.Controls/AutoSuggestBox/AutoSuggestBoxTextChangedEventArgs.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Windows;
 
 namespace ModernWpf.Controls
 {

ModernWpf.Controls/ModernWpf.Controls.csproj

@@ -7,6 +7,7 @@
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);GetDocumentationFile</TargetsForTfmSpecificBuildOutput>
     <NuspecFile>$(MSBuildThisFileDirectory)ModernWpfUI.nuspec</NuspecFile>
     <PackageId>ModernWpfUI</PackageId>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

ModernWpf.SampleApp/ModernWpf.SampleApp.csproj

@@ -5,6 +5,7 @@
     <TargetFrameworks>net4.6.2</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>Assets\AppIcon.ico</ApplicationIcon>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -279,4 +280,4 @@
     </Resource>
   </ItemGroup>
 
-</Project>
+</Project>

ModernWpf/Common/DpiScale2.cs

@@ -214,12 +214,22 @@ private Thickness GetMaximizedWindowBorder()
                 return new Thickness();
             }
 
-            var dpi = _window.GetDpi();
+            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
+
             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, dpi.DpiScaleX, dpi.DpiScaleY);
+            Size borderSizeInDips = DpiHelper.DeviceSizeToLogical(borderSize, dpiScaleX, dpiScaleY);
 
             return new Thickness(borderSizeInDips.Width, borderSizeInDips.Height, borderSizeInDips.Width, borderSizeInDips.Height);
         }

ModernWpf/Controls/Primitives/MaximizedWindowFixer.cs

@@ -82,33 +82,8 @@ 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
     {
         TopLeft = 0,

ModernWpf/Helpers/Helper.cs

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

ModernWpf/Helpers/OSVersionHelper.cs

@@ -195,8 +195,6 @@
                             Grid.Row="1"
                             Grid.ColumnSpan="3"
                             Margin="{TemplateBinding BorderThickness}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             Padding="{TemplateBinding Padding}"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -302,4 +300,4 @@
         </Style.Triggers>
     </Style>
 
-</ResourceDictionary>
+</ResourceDictionary>