Added DpiUtil tests.

Author: KN4CK3R

ReClass.NET/Program.cs

@@ -44,6 +44,7 @@ static void Main(string[] args)
 			try
 			{
 				DpiUtil.ConfigureProcess();
+				DpiUtil.TrySetDpiFromCurrentDesktop();
 			}
 			catch
 			{

ReClass.NET/UI/DpiUtil.cs

@@ -9,77 +9,55 @@ namespace ReClassNET.UI
 {
 	public static class DpiUtil
 	{
-		private const int StdDpi = 96;
+		public const int DefalutDpi = 96;
 
-		private static bool initialized;
-
-		private static int dpiX = StdDpi;
-		private static int dpiY = StdDpi;
+		private static int dpiX = DefalutDpi;
+		private static int dpiY = DefalutDpi;
 
 		private static double scaleX = 1.0;
 		private static double scaleY = 1.0;
 
-		public static bool ScalingRequired
+		public static void ConfigureProcess()
 		{
-			get
-			{
-				if (Program.DesignMode)
-				{
-					return false;
-				}
-
-				EnsureInitialized();
-
-				return dpiX != StdDpi || dpiY != StdDpi;
-			}
+			NativeMethods.SetProcessDpiAwareness();
 		}
 
-		private static void EnsureInitialized()
+		public static void SetDpi(int x, int y)
 		{
-			if (initialized)
+			dpiX = x;
+			dpiY = y;
+
+			if (dpiX <= 0 || dpiY <= 0)
 			{
-				return;
+				dpiX = DefalutDpi;
+				dpiY = DefalutDpi;
 			}
 
+			scaleX = dpiX / (double)DefalutDpi;
+			scaleY = dpiY / (double)DefalutDpi;
+		}
+
+		public static void TrySetDpiFromCurrentDesktop()
+		{
 			try
 			{
 				using var g = Graphics.FromHwnd(IntPtr.Zero);
-				dpiX = (int)g.DpiX;
-				dpiY = (int)g.DpiY;
 
-				if (dpiX <= 0 || dpiY <= 0)
-				{
-					dpiX = StdDpi;
-					dpiY = StdDpi;
-				}
+				SetDpi((int)g.DpiX, (int)g.DpiY);
 			}
 			catch
 			{
 				// ignored
 			}
-
-			scaleX = dpiX / (double)StdDpi;
-			scaleY = dpiY / (double)StdDpi;
-
-			initialized = true;
-		}
-
-		public static void ConfigureProcess()
-		{
-			NativeMethods.SetProcessDpiAwareness();
 		}
 
 		public static int ScaleIntX(int i)
 		{
-			EnsureInitialized();
-
 			return (int)Math.Round(i * scaleX);
 		}
 
 		public static int ScaleIntY(int i)
 		{
-			EnsureInitialized();
-
 			return (int)Math.Round(i * scaleY);
 		}
 

ReClass.NET_Tests/ReClass.NET_Tests.csproj

@@ -87,6 +87,7 @@
     <Compile Include="MemoryScanner\Comparer\IntegerMemoryComparerTest.cs" />
     <Compile Include="Memory\MemoryBufferTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UI\DpiUtilTest.cs" />
     <Compile Include="Util\BitStringTest.cs" />
     <Compile Include="Util\CircularBufferTest.cs" />
     <Compile Include="Util\CommandLineArgsTest.cs" />
@@ -121,5 +122,6 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

ReClass.NET_Tests/UI/DpiUtilTest.cs

@@ -0,0 +1,43 @@
+using System.Drawing;
+using NFluent;
+using ReClassNET.UI;
+using Xunit;
+
+namespace ReClass.NET_Tests.UI
+{
+	public class DpiUtilTest
+	{
+		[Fact]
+		public void ScaleImageReturnsNullOnNull()
+		{
+			Check.That(DpiUtil.ScaleImage(null)).IsNull();
+		}
+
+		[Fact]
+		public void ScaleImageReturnsOriginalInstanceOnSameSize()
+		{
+			DpiUtil.SetDpi(DpiUtil.DefalutDpi, DpiUtil.DefalutDpi);
+
+			using var sourceImage = new Bitmap(10, 10);
+			var scaledImage = DpiUtil.ScaleImage(sourceImage);
+
+			Check.That(sourceImage).IsSameReferenceAs(scaledImage);
+		}
+
+		[Fact]
+		public void ScaleImageReturnsScaledImage()
+		{
+			const int SourceSize = 10;
+			const int ScaleFactor = 2;
+
+			DpiUtil.SetDpi(DpiUtil.DefalutDpi * ScaleFactor, DpiUtil.DefalutDpi * ScaleFactor);
+
+			using var sourceImage = new Bitmap(SourceSize, SourceSize);
+			using var scaledImage = DpiUtil.ScaleImage(sourceImage);
+
+			Check.That(sourceImage).Not.IsSameReferenceAs(scaledImage);
+			Check.That(scaledImage.Width).IsEqualTo(sourceImage.Width * ScaleFactor);
+			Check.That(scaledImage.Height).IsEqualTo(sourceImage.Height * ScaleFactor);
+		}
+	}
+}