Fix display on monitor with mouse and move all NaticeMethods to NativeMethods.cs

Author: noraa-junker

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/DpiHelper.cs

@@ -2,9 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Runtime.InteropServices;
-
 namespace ShortcutGuide
 {
     // This class is rewritten from C++ to C# from the measure tool project
@@ -25,7 +22,7 @@ public static float GetDPIScaleForWindow(int hwnd)
 
         public static long GetScreenDPIForWindow(int hwnd, ref int dpi)
         {
-            var targetMonitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
+            var targetMonitor = NativeMethods.MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
             return GetScreenDPIForMonitor(targetMonitor.ToInt32(), ref dpi);
         }
 
@@ -34,19 +31,13 @@ public static long GetScreenDPIForMonitor(int targetMonitor, ref int dpi)
             if (targetMonitor != 0)
             {
                 int dummy = 0;
-                return GetDpiForMonitor(targetMonitor, MDT_EFFECTIVE_DPI, ref dpi, ref dummy);
+                return NativeMethods.GetDpiForMonitor(targetMonitor, MDT_EFFECTIVE_DPI, ref dpi, ref dummy);
             }
             else
             {
                 dpi = DEFAULT_DPI;
                 return 0x80004005L;
             }
         }
-
-        [LibraryImport("User32.dll")]
-        private static partial IntPtr MonitorFromWindow(int hwnd, int dwFlags);
-
-        [LibraryImport("Shcore.dll")]
-        private static partial long GetDpiForMonitor(int hmonitor, int dpiType, ref int dpiX, ref int dpiY);
     }
 }

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/NativeMethods.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Runtime.InteropServices;
+using Windows.Graphics;
 
 internal static partial class NativeMethods
 {
@@ -29,6 +30,27 @@ internal static partial class NativeMethods
     [LibraryImport("user32.dll", StringMarshalling = StringMarshalling.Utf16)]
     internal static partial int FindWindowExA(int hwndParent, int hwndChildAfter, in string lpClassName, in string? lpWindowName);
 
+    [LibraryImport("User32.dll")]
+    internal static partial IntPtr MonitorFromWindow(int hwnd, int dwFlags);
+
+    [LibraryImport("Shcore.dll")]
+    internal static partial long GetDpiForMonitor(int hmonitor, int dpiType, ref int dpiX, ref int dpiY);
+
+    [LibraryImport("user32.dll")]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static partial bool GetCursorPos(out POINT lpPoint);
+
+    public struct POINT
+    {
+        public int X;
+        public int Y;
+
+        public static implicit operator PointInt32(POINT point)
+        {
+            return new PointInt32(point.X, point.Y);
+        }
+    }
+
     internal const int GWL_STYLE = -16;
     internal const int WS_CAPTION = 0x00C00000;
 }

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/ShortcutGuideXAML/MainWindow.xaml.cs

@@ -6,7 +6,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using System.Runtime.InteropServices;
 using System.Text.Json;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.UI;
@@ -78,7 +77,7 @@ private void OnLauched(object sender, WindowActivatedEventArgs e)
                 _appWindow = AppWindow.GetFromWindowId(windowId);
 
                 GetCursorPos(out POINT lpPoint);
-                _appWindow.Move(lpPoint);
+                _appWindow.Move(lpPoint with { Y = lpPoint.Y - ((int)Height / 2), X = lpPoint.X - ((int)Width / 2) });
 
                 float dpiScale = DpiHelper.GetDPIScaleForWindow((int)hwnd);
 
@@ -108,21 +107,6 @@ public void WindowSelectionChanged(object sender, SelectorBarSelectionChangedEve
 
         private bool _setPosition;
 
-        [LibraryImport("user32.dll")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static partial bool GetCursorPos(out POINT lpPoint);
-
-        public struct POINT
-        {
-            public int X;
-            public int Y;
-
-            public static implicit operator PointInt32(POINT point)
-            {
-                return new PointInt32(point.X, point.Y);
-            }
-        }
-
         public void CloseButton_Clicked(object sender, RoutedEventArgs e)
         {
             Environment.Exit(0);