[MouseJump]Reduce winforms dependency, thumbnail size settings, short…

…cut keys(microsoft#25487) * [Mouse Jump] - reorganise existing NativeMethods (microsoft#25482) * Mouse Jump] - reorganise Helper classes / main form code (microsoft#25482) * Mouse Jump] - replace use of System.Windows.Forms.Screen with Native Methods (microsoft#25482) * Mouse Jump] - replace use of System.Windows.Forms.SystemInformation with Native Methods (microsoft#25482) * [Mouse Jump] - replace use of System.Windows.Forms.Cursor with Native Methods (microsoft#25482) * [Mouse Jump] - improve popup responsiveness (microsoft#25484) * [Mouse Jump] - fixed spellchecker errors (microsoft#25484) * [Mouse Jump] - add settings card for thumbnail size (microsoft#24564) * [Mouse Jump] - shortcut keys to jump to centres of screens (microsoft#25069) * [Mouse Jump] - fix spelling (microsoft#25069) * [Mouse Jump] - fix spelling - numpad (microsoft#25069) * [Mouse Jump] - updated "thumbnail size" settings text (microsoft#24564)
BLM16 · Jun 22, 2023 · 5418715 · 5418715
1 parent cf53a43
commit 5418715
Show file tree

Hide file tree

Showing 75 changed files with 2,332 additions and 584 deletions.
diff --git a/.github/actions/spell-check/excludes.txt b/.github/actions/spell-check/excludes.txt
@@ -99,6 +99,7 @@
 ^src/modules/fancyzones/lib/FancyZonesWinHookEventIDs\.h$
 ^src/modules/imageresizer/dll/ContextMenuHandler\.rgs$
 ^src/modules/imageresizer/dll/ImageResizerExt\.rgs$
+^src/modules/MouseUtils/MouseJumpUI/NativeMethods/User32/UI/WindowsAndMessaging/User32.SYSTEM_METRICS_INDEX.cs$
 ^src/modules/powerrename/testapp/PowerRenameTest\.vcxproj\.filters$
 ^src/modules/previewpane/PreviewPaneUnitTests/HelperFiles/MarkdownWithHTMLImageTag\.txt$
 ^src/modules/previewpane/UnitTests-MarkdownPreviewHandler/HelperFiles/MarkdownWithHTMLImageTag.txt$

diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
@@ -358,6 +358,7 @@ createdump
 CREATESCHEDULEDTASK
 CREATESTRUCT
 CREATEWINDOWFAILED
+CRECT
 critsec
 Crossdevice
 CRSEL
@@ -512,6 +513,7 @@ dreamsofameaningfullife
 drivedetectionwarning
 dshow
 DSTINVERT
+DUMMYUNIONNAME
 dutil
 DVASPECT
 DVASPECTINFO
@@ -1064,14 +1066,18 @@ LPBYTE
 LPCITEMIDLIST
 LPCMINVOKECOMMANDINFO
 LPCREATESTRUCT
+LPCRECT
 LPCTSTR
 LPCWSTR
 lpdw
 lpfn
+lpmi
 LPINPUT
 LPMINMAXINFO
+LPMONITORINFO
 LPOSVERSIONINFOEXW
 lprc
+LPPOINT
 LPRECT
 LPSAFEARRAY
 LPSTR
@@ -1181,6 +1187,7 @@ mockapi
 MODECHANGE
 modernwpf
 MODESPRUNED
+MONITORENUMPROC
 MONITORINFO
 MONITORINFOEX
 MONITORINFOEXW
@@ -1334,7 +1341,7 @@ nugets
 nullonfailure
 numberbox
 NUMLOCK
-NUMPAD
+numpad
 nwc
 Objbase
 OBJID
@@ -1971,6 +1978,7 @@ TRAYMOUSEMESSAGE
 triaging
 TRK
 trl
+Tsd
 TServer
 TStr
 TValue
@@ -2174,6 +2182,7 @@ winternl
 WINTHRESHOLD
 winui
 winuiex
+WINVER
 winxamlmanager
 wistd
 withinrafael

diff --git a/src/modules/MouseUtils/MouseJumpUI.UnitTests/Helpers/DrawingHelperTests.cs b/src/modules/MouseUtils/MouseJumpUI.UnitTests/Helpers/DrawingHelperTests.cs
@@ -3,20 +3,22 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
-using System.Drawing;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using MouseJumpUI.Drawing.Models;
 using MouseJumpUI.Helpers;
+using MouseJumpUI.Models.Drawing;
+using MouseJumpUI.Models.Layout;
+using MouseJumpUI.Models.Screen;
+using static MouseJumpUI.NativeMethods.Core;
 
 namespace MouseJumpUI.UnitTests.Helpers;
 
 [TestClass]
 public static class DrawingHelperTests
 {
     [TestClass]
-    public class CalculateLayoutInfoTests
+    public sealed class CalculateLayoutInfoTests
     {
-        public class TestCase
+        public sealed class TestCase
         {
             public TestCase(LayoutConfig layoutConfig, LayoutInfo expectedResult)
             {
@@ -40,13 +42,14 @@ public static IEnumerable<object[]> GetTestCases()
             // |                |
             // +----------------+
             var layoutConfig = new LayoutConfig(
-                virtualScreen: new(0, 0, 5120, 1440),
-                screenBounds: new List<Rectangle>
+                virtualScreenBounds: new(0, 0, 5120, 1440),
+                screens: new List<ScreenInfo>
                 {
-                    new(0, 0, 5120, 1440),
+                    new ScreenInfo(HMONITOR.Null, false, new(0, 0, 5120, 1440), new(0, 0, 5120, 1440)),
                 },
                 activatedLocation: new(5120 / 2, 1440 / 2),
-                activatedScreen: 0,
+                activatedScreenIndex: 0,
+                activatedScreenNumber: 1,
                 maximumFormSize: new(1600, 1200),
                 formPadding: new(5, 5, 5, 5),
                 previewPadding: new(0, 0, 0, 0));
@@ -58,7 +61,7 @@ public static IEnumerable<object[]> GetTestCases()
                 {
                     new(0, 0, 1590, 447.1875M),
                 },
-                activatedScreen: new(0, 0, 5120, 1440));
+                activatedScreenBounds: new(0, 0, 5120, 1440));
             yield return new[] { new TestCase(layoutConfig, layoutInfo) };
 
             // primary monitor not topmost / leftmost - if there are screens
@@ -74,14 +77,15 @@ public static IEnumerable<object[]> GetTestCases()
             //         |                |
             //         +----------------+
             layoutConfig = new LayoutConfig(
-                virtualScreen: new(-1920, -472, 7040, 1912),
-                screenBounds: new List<Rectangle>
+                virtualScreenBounds: new(-1920, -472, 7040, 1912),
+                screens: new List<ScreenInfo>
                 {
-                    new(-1920, -472, 1920, 1080),
-                    new(0, 0, 5120, 1440),
+                    new ScreenInfo(HMONITOR.Null, false, new(-1920, -472, 1920, 1080), new(-1920, -472, 1920, 1080)),
+                    new ScreenInfo(HMONITOR.Null, false, new(0, 0, 5120, 1440), new(0, 0, 5120, 1440)),
                 },
                 activatedLocation: new(-960, -236),
-                activatedScreen: 0,
+                activatedScreenIndex: 0,
+                activatedScreenNumber: 1,
                 maximumFormSize: new(1600, 1200),
                 formPadding: new(5, 5, 5, 5),
                 previewPadding: new(0, 0, 0, 0));
@@ -99,7 +103,7 @@ public static IEnumerable<object[]> GetTestCases()
                     new(0, 0, 433.63636M, 243.92045M),
                     new(433.63636M, 106.602270M, 1156.36363M, 325.22727M),
                 },
-                activatedScreen: new(-1920, -472, 1920, 1080));
+                activatedScreenBounds: new(-1920, -472, 1920, 1080));
             yield return new[] { new TestCase(layoutConfig, layoutInfo) };
 
             // check we handle rounding errors in scaling the preview form
@@ -115,14 +119,15 @@ public static IEnumerable<object[]> GetTestCases()
             // |                |   0   |
             // +----------------+-------+
             layoutConfig = new LayoutConfig(
-                virtualScreen: new(0, 0, 7168, 1440),
-                screenBounds: new List<Rectangle>
+                virtualScreenBounds: new(0, 0, 7168, 1440),
+                screens: new List<ScreenInfo>
                 {
-                    new(6144, 0, 1024, 768),
-                    new(0, 0, 6144, 1440),
+                    new ScreenInfo(HMONITOR.Null, false, new(6144, 0, 1024, 768), new(6144, 0, 1024, 768)),
+                    new ScreenInfo(HMONITOR.Null, false, new(0, 0, 6144, 1440), new(0, 0, 6144, 1440)),
                 },
                 activatedLocation: new(6656, 384),
-                activatedScreen: 0,
+                activatedScreenIndex: 0,
+                activatedScreenNumber: 1,
                 maximumFormSize: new(1600, 1200),
                 formPadding: new(5, 5, 5, 5),
                 previewPadding: new(0, 0, 0, 0));
@@ -135,7 +140,7 @@ public static IEnumerable<object[]> GetTestCases()
                     new(869.14285M, 0, 144.85714M, 108.642857M),
                     new(0, 0, 869.142857M, 203.705357M),
                 },
-                activatedScreen: new(6144, 0, 1024, 768));
+                activatedScreenBounds: new(6144, 0, 1024, 768));
             yield return new[] { new TestCase(layoutConfig, layoutInfo) };
 
             // check we handle rounding errors in scaling the preview form
@@ -151,14 +156,15 @@ public static IEnumerable<object[]> GetTestCases()
             // |                |   0   |
             // +----------------+-------+
             layoutConfig = new LayoutConfig(
-                virtualScreen: new(0, 0, 7424, 1440),
-                screenBounds: new List<Rectangle>
+                virtualScreenBounds: new(0, 0, 7424, 1440),
+                screens: new List<ScreenInfo>
                 {
-                    new(6144, 0, 1280, 768),
-                    new(0, 0, 6144, 1440),
+                    new ScreenInfo(HMONITOR.Null, false, new(6144, 0, 1280, 768), new(6144, 0, 1280, 768)),
+                    new ScreenInfo(HMONITOR.Null, false, new(0, 0, 6144, 1440), new(0, 0, 6144, 1440)),
                 },
                 activatedLocation: new(6784, 384),
-                activatedScreen: 0,
+                activatedScreenIndex: 0,
+                activatedScreenNumber: 1,
                 maximumFormSize: new(1600, 1200),
                 formPadding: new(5, 5, 5, 5),
                 previewPadding: new(0, 0, 0, 0));
@@ -176,7 +182,7 @@ public static IEnumerable<object[]> GetTestCases()
                     new(1051.03448M, 0, 218.96551M, 131.37931M),
                     new(0, 0M, 1051.03448M, 246.33620M),
                 },
-                activatedScreen: new(6144, 0, 1280, 768));
+                activatedScreenBounds: new(6144, 0, 1280, 768));
             yield return new[] { new TestCase(layoutConfig, layoutInfo) };
         }
 
@@ -191,7 +197,7 @@ public void RunTestCases(TestCase data)
             // (int)1280.000000000000 -> 1280
             // so we'll compare the raw values, *and* convert to an int-based
             // Rectangle to compare rounded values
-            var actual = DrawingHelper.CalculateLayoutInfo(data.LayoutConfig);
+            var actual = LayoutHelper.CalculateLayoutInfo(data.LayoutConfig);
             var expected = data.ExpectedResult;
             Assert.AreEqual(expected.FormBounds.X, actual.FormBounds.X, 0.00001M, "FormBounds.X");
             Assert.AreEqual(expected.FormBounds.Y, actual.FormBounds.Y, 0.00001M, "FormBounds.Y");
@@ -213,11 +219,11 @@ public void RunTestCases(TestCase data)
                 Assert.AreEqual(expected.ScreenBounds[i].ToRectangle(), actual.ScreenBounds[i].ToRectangle(), "ActivatedScreen.ToRectangle");
             }
 
-            Assert.AreEqual(expected.ActivatedScreen.X, actual.ActivatedScreen.X, "ActivatedScreen.X");
-            Assert.AreEqual(expected.ActivatedScreen.Y, actual.ActivatedScreen.Y, "ActivatedScreen.Y");
-            Assert.AreEqual(expected.ActivatedScreen.Width, actual.ActivatedScreen.Width, "ActivatedScreen.Width");
-            Assert.AreEqual(expected.ActivatedScreen.Height, actual.ActivatedScreen.Height, "ActivatedScreen.Height");
-            Assert.AreEqual(expected.ActivatedScreen.ToRectangle(), actual.ActivatedScreen.ToRectangle(), "ActivatedScreen.ToRectangle");
+            Assert.AreEqual(expected.ActivatedScreenBounds.X, actual.ActivatedScreenBounds.X, "ActivatedScreen.X");
+            Assert.AreEqual(expected.ActivatedScreenBounds.Y, actual.ActivatedScreenBounds.Y, "ActivatedScreen.Y");
+            Assert.AreEqual(expected.ActivatedScreenBounds.Width, actual.ActivatedScreenBounds.Width, "ActivatedScreen.Width");
+            Assert.AreEqual(expected.ActivatedScreenBounds.Height, actual.ActivatedScreenBounds.Height, "ActivatedScreen.Height");
+            Assert.AreEqual(expected.ActivatedScreenBounds.ToRectangle(), actual.ActivatedScreenBounds.ToRectangle(), "ActivatedScreen.ToRectangle");
         }
     }
 }
diff --git a/src/modules/MouseUtils/MouseJumpUI.UnitTests/Helpers/MouseHelperTests.cs b/src/modules/MouseUtils/MouseJumpUI.UnitTests/Helpers/MouseHelperTests.cs
@@ -4,18 +4,18 @@
 
 using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using MouseJumpUI.Drawing.Models;
 using MouseJumpUI.Helpers;
+using MouseJumpUI.Models.Drawing;
 
 namespace MouseJumpUI.UnitTests.Helpers;
 
 [TestClass]
 public static class MouseHelperTests
 {
     [TestClass]
-    public class GetJumpLocationTests
+    public sealed class GetJumpLocationTests
     {
-        public class TestCase
+        public sealed class TestCase
         {
             public TestCase(PointInfo previewLocation, SizeInfo previewSize,  RectangleInfo desktopBounds, PointInfo expectedResult)
             {

diff --git a/...I.UnitTests/Drawing/RectangleInfoTests.cs → ...ests/Models/Drawing/RectangleInfoTests.cs b/...I.UnitTests/Drawing/RectangleInfoTests.cs → ...ests/Models/Drawing/RectangleInfoTests.cs
@@ -4,17 +4,17 @@
 
 using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using MouseJumpUI.Drawing.Models;
+using MouseJumpUI.Models.Drawing;
 
-namespace MouseJumpUI.UnitTests.Drawing;
+namespace MouseJumpUI.UnitTests.Models.Drawing;
 
 [TestClass]
 public static class RectangleInfoTests
 {
     [TestClass]
-    public class CenterTests
+    public sealed class CenterTests
     {
-        public class TestCase
+        public sealed class TestCase
         {
             public TestCase(RectangleInfo rectangle, PointInfo point, RectangleInfo expectedResult)
             {
@@ -63,9 +63,9 @@ public void RunTestCases(TestCase data)
     }
 
     [TestClass]
-    public class ClampTests
+    public sealed class ClampTests
     {
-        public class TestCase
+        public sealed class TestCase
         {
             public TestCase(RectangleInfo inner, RectangleInfo outer, RectangleInfo expectedResult)
             {

diff --git a/...JumpUI.UnitTests/Drawing/SizeInfoTests.cs → ...UnitTests/Models/Drawing/SizeInfoTests.cs b/...JumpUI.UnitTests/Drawing/SizeInfoTests.cs → ...UnitTests/Models/Drawing/SizeInfoTests.cs
@@ -4,16 +4,17 @@
 
 using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using MouseJumpUI.Drawing.Models;
+using MouseJumpUI.Models.Drawing;
 
 namespace MouseJumpUI.UnitTests.Drawing;
 
-public sealed class SizeInfoTests
+[TestClass]
+public static class SizeInfoTests
 {
     [TestClass]
-    public class ScaleToFitTests
+    public sealed class ScaleToFitTests
     {
-        public class TestCase
+        public sealed class TestCase
         {
             public TestCase(SizeInfo obj, SizeInfo bounds, SizeInfo expectedResult)
             {
@@ -58,9 +59,9 @@ public void RunTestCases(TestCase data)
     }
 
     [TestClass]
-    public class ScaleToFitRatioTests
+    public sealed class ScaleToFitRatioTests
     {
-        public class TestCase
+        public sealed class TestCase
         {
             public TestCase(SizeInfo obj, SizeInfo bounds, decimal expectedResult)
             {