More cleanup

pchaurasia14 · Dec 20, 2023 · dffc205 · dffc205
1 parent 94f1c10
commit dffc205
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 189 deletions.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj
@@ -420,7 +420,6 @@
     <Compile Include="System\Windows\WindowBackdropType.cs" />
     <Compile Include="System\Windows\Interop\Dwapi.cs" />
     <Compile Include="System\Windows\Interop\Libraries.cs" />
-    <Compile Include="System\Windows\Interop\UxTheme.cs" />
     <Compile Include="System\Windows\Interop\UnsafeNativeMethodsWindow.cs" />
     <Compile Include="System\Windows\Interop\UnsafeReflection.cs" />
     <Compile Include="System\Windows\Annotations\AnchorInfo.cs" />

diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Interop/Dwapi.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Interop/Dwapi.cs
@@ -548,7 +548,7 @@ internal enum DWM_SIT
     [DllImport(Libraries.Dwmapi, PreserveSig = false)]
     public static extern void DwmExtendFrameIntoClientArea(
         [In] IntPtr hWnd,
-        [In] ref UxTheme.MARGINS pMarInset
+        [In] ref Standard.MARGINS pMarInset
     );
 
     /// <summary>

diff --git a/....DotNet.Wpf/src/PresentationFramework/System/Windows/Interop/UnsafeNativeMethodsWindow.cs b/....DotNet.Wpf/src/PresentationFramework/System/Windows/Interop/UnsafeNativeMethodsWindow.cs
@@ -368,17 +368,17 @@ public static bool RemoveWindowCaption(IntPtr hWnd)
             return false;
         }
 
-        var wtaOptions = new UxTheme.WTA_OPTIONS()
+        var wtaOptions = new WTA_OPTIONS()
         {
-            dwFlags = UxTheme.WTNCA.NODRAWCAPTION,
-            dwMask = UxTheme.WTNCA.VALIDBITS
+            dwFlags = WTNCA.NODRAWCAPTION,
+            dwMask = WTNCA.VALIDBITS
         };
 
-        UxTheme.SetWindowThemeAttribute(
+        NativeMethods.SetWindowThemeAttribute(
             hWnd,
-            UxTheme.WINDOWTHEMEATTRIBUTETYPE.WTA_NONCLIENT,
+            WINDOWTHEMEATTRIBUTETYPE.WTA_NONCLIENT,
             ref wtaOptions,
-            (uint)Marshal.SizeOf(typeof(UxTheme.WTA_OPTIONS))
+            (uint)Marshal.SizeOf(typeof(WTA_OPTIONS))
         );
 
         return true;
@@ -414,19 +414,18 @@ public static bool ExtendClientAreaIntoTitleBar(IntPtr hWnd)
         }
 
         // #1 Remove titlebar elements
-        var wtaOptions = new UxTheme.WTA_OPTIONS()
+        var wtaOptions = new WTA_OPTIONS()
         {
-            dwFlags = (UxTheme.WTNCA.NODRAWCAPTION | UxTheme.WTNCA.NODRAWICON | UxTheme.WTNCA.NOSYSMENU),
-            dwMask = UxTheme.WTNCA.VALIDBITS
+            dwFlags = (WTNCA.NODRAWCAPTION | WTNCA.NODRAWICON | WTNCA.NOSYSMENU),
+            dwMask = WTNCA.VALIDBITS
         };
 
-        Interop
-            .UxTheme
-            .SetWindowThemeAttribute(
+
+        NativeMethods.SetWindowThemeAttribute(
                 hWnd,
-                UxTheme.WINDOWTHEMEATTRIBUTETYPE.WTA_NONCLIENT,
+                WINDOWTHEMEATTRIBUTETYPE.WTA_NONCLIENT,
                 ref wtaOptions,
-                (uint)Marshal.SizeOf(typeof(UxTheme.WTA_OPTIONS))
+                (uint)Marshal.SizeOf(typeof(WTA_OPTIONS))
             );
 
         DisplayDpi windowDpi = DpiHelper.GetWindowDpi(hWnd);
@@ -438,7 +437,7 @@ public static bool ExtendClientAreaIntoTitleBar(IntPtr hWnd)
             windowDpi.DpiScaleY
         );
 
-        var dwmMargin = new UxTheme.MARGINS
+        var dwmMargin = new MARGINS
         {
             // err on the side of pushing in glass an extra pixel.
             cxLeftWidth = (int)Math.Ceiling(deviceGlassThickness.Left),

diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Interop/UxTheme.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Interop/UxTheme.cs