From 63ce735169afe7cf871d3d2a8eb6086e49fefa9a Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 5 Jun 2024 06:42:33 +0900
Subject: [PATCH] =?UTF-8?q?When=20using=20the=20=E2=80=9Cremember=20last?=
 =?UTF-8?q?=20position=E2=80=9D=20setting,=20if=20the=20resolution=20or=20?=
 =?UTF-8?q?dpi=20has=20changed,=20the=20position=20will=20be=20rescaled=20?=
 =?UTF-8?q?proportionally?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Flow.Launcher/MainWindow.xaml.cs | 33 +++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 6c0889295..87e818154 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -27,6 +27,7 @@ using DataObject = System.Windows.DataObject;
 using System.Windows.Media;
 using System.Windows.Interop;
 using System.Runtime.InteropServices;
+using System.Drawing;
 
 namespace Flow.Launcher
 {
@@ -48,6 +49,10 @@ namespace Flow.Launcher
 
         private MediaPlayer animationSoundWMP;
         private SoundPlayer animationSoundWPF;
+        private double _previousScreenWidth;
+        private double _previousScreenHeight;
+        private double _previousDpiX;
+        private double _previousDpiY;
 
         #endregion
 
@@ -288,8 +293,31 @@ namespace Flow.Launcher
             };
         }
 
+        private (double X, double Y) GetCurrentDpi(Screen screen)
+        {
+            using (Graphics g = Graphics.FromHwnd(IntPtr.Zero))
+            {
+                return (g.DpiX, g.DpiY);
+            }
+        }
         private void InitializePosition()
         {
+            var screen = SelectedScreen();
+            var currentDpi = GetCurrentDpi(screen);
+            double currentScreenWidth = screen.WorkingArea.Width;
+            double currentScreenHeight = screen.WorkingArea.Height;
+
+            if (_previousScreenWidth != 0 && _previousScreenHeight != 0 && _previousDpiX != 0 && _previousDpiY != 0)
+            {
+                double widthRatio = currentScreenWidth / _previousScreenWidth;
+                double heightRatio = currentScreenHeight / _previousScreenHeight;
+                double dpiXRatio = currentDpi.X / _previousDpiX;
+                double dpiYRatio = currentDpi.Y / _previousDpiY;
+
+                _settings.WindowLeft *= widthRatio * dpiXRatio;
+                _settings.WindowTop *= heightRatio * dpiYRatio;
+            }
+
             if (_settings.SearchWindowScreen == SearchWindowScreens.RememberLastLaunchLocation)
             {
                 Top = _settings.WindowTop;
@@ -297,7 +325,6 @@ namespace Flow.Launcher
             }
             else
             {
-                var screen = SelectedScreen();
                 switch (_settings.SearchWindowAlign)
                 {
                     case SearchWindowAligns.Center:
@@ -323,6 +350,10 @@ namespace Flow.Launcher
                 }
             }
 
+            _previousScreenWidth = currentScreenWidth;
+            _previousScreenHeight = currentScreenHeight;
+            _previousDpiX = currentDpi.X;
+            _previousDpiY = currentDpi.Y;
         }
 
         private void UpdateNotifyIconText()