upgrade WicNet to v1.7.1

d2phap · Nov 8, 2023 · 426d8b7 · 426d8b7
1 parent 5bf3bb5
commit 426d8b7
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 248 deletions.
diff --git a/Source/DXControl/D2Phap.DXControl.csproj b/Source/DXControl/D2Phap.DXControl.csproj
@@ -12,7 +12,7 @@
     <Product>D2Phap.$(AssemblyName)</Product>
     <Description>A WinForms hybrid control that supports both Direct2D and GDI+ drawing thanks to WicNet. This control has being used in https://github.com/d2phap/ImageGlass since version 9.0.
     </Description>
-    <Copyright>Copyright (C) 2022 - 2023 Duong Dieu Phap. All rights reserved.</Copyright>
+    <Copyright>Copyright (C) 2022 - 2024 Duong Dieu Phap. All rights reserved.</Copyright>
     <PackageProjectUrl>https://github.com/d2phap/DXControl</PackageProjectUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <RepositoryUrl>https://github.com/d2phap/DXControl</RepositoryUrl>
@@ -21,7 +21,7 @@
     <IncludeSymbols>True</IncludeSymbols>
     <PackageReleaseNotes>See release notes here: https://github.com/d2phap/DXControl/releases</PackageReleaseNotes>
     <Authors>Duong Dieu Phap</Authors>
-    <VersionPrefix>2.7.0</VersionPrefix>
+    <VersionPrefix>3.0.0</VersionPrefix>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
       <PublishRepositoryUrl>true</PublishRepositoryUrl>
       <EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -51,11 +51,12 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="DirectNStandard" Version="1.15.0.2" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="WicNet" Version="1.6.5" />
+    <PackageReference Include="WicNet" Version="1.7.1" />
   </ItemGroup>
 
 </Project>
diff --git a/Source/DXControl/DXControl.cs b/Source/DXControl/DXControl.cs
@@ -5,6 +5,7 @@ MIT License
 */
 using DirectN;
 using System.ComponentModel;
+using WicNet.Utilities;
 
 namespace D2Phap;
 
@@ -289,7 +290,7 @@ protected override void WndProc(ref Message m)
                     else
                     {
                         _device?.BeginDraw();
-                        _device?.Clear(_D3DCOLORVALUE.FromColor(BackColor));
+                        _device?.Clear(BackColor.ToD3DCOLORVALUE());
                         _device?.EndDraw();
                     }
                 }
@@ -386,7 +387,7 @@ protected override void OnPaint(PaintEventArgs e)
             _graphicsD2d ??= new D2DGraphics(_device, _d2DFactory, _dWriteFactory);
 
             _device.BeginDraw();
-            _device.Clear(_D3DCOLORVALUE.FromColor(BackColor));
+            _device.Clear(BackColor.ToD3DCOLORVALUE());
             OnRender(_graphicsD2d);
             _device.EndDraw();
         }

diff --git a/Source/DXControl/DirectN/DirectWrite/Extensions/VerticalBlankTicker.cs b/Source/DXControl/DirectN/DirectWrite/Extensions/VerticalBlankTicker.cs
diff --git a/Source/DXControl/DirectN/DirectWrite/Extensions/VerticalBlankTickerErrorEventArgs.cs b/Source/DXControl/DirectN/DirectWrite/Extensions/VerticalBlankTickerErrorEventArgs.cs
diff --git a/Source/DXControl/DirectN/DirectWrite/Extensions/VerticalBlankTickerEventArgs.cs b/Source/DXControl/DirectN/DirectWrite/Extensions/VerticalBlankTickerEventArgs.cs
diff --git a/Source/DXControl/DirectN/DirectWrite/Generated/D2D1_BITMAP_BRUSH_PROPERTIES.cs b/Source/DXControl/DirectN/DirectWrite/Generated/D2D1_BITMAP_BRUSH_PROPERTIES.cs
diff --git a/Source/DXControl/DirectN/DirectWrite/Generated/D2D1_BITMAP_BRUSH_PROPERTIES1.cs b/Source/DXControl/DirectN/DirectWrite/Generated/D2D1_BITMAP_BRUSH_PROPERTIES1.cs
diff --git a/Source/Demo/Demo.csproj b/Source/Demo/Demo.csproj
@@ -8,6 +8,8 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <ApplicationManifest>app.manifest</ApplicationManifest>
+
+      <ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Source/Demo/app.manifest b/Source/Demo/app.manifest
@@ -52,13 +52,6 @@
        
        Makes the application long-path aware. See https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
 
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-        <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
-        <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
-      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
-    </windowsSettings>
-  </application>
 
 
   <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->