Fixed pos error when fetching exit button under high DPI

Author: emako

build/nsis/setup.nsi

@@ -1,5 +1,5 @@
 !define PRODUCT_NAME                     "GenshinWoodmen"
-!define PRODUCT_VERSION                  "1.3.0.0"
+!define PRODUCT_VERSION                  "1.3.1.0"
 !define PRODUCT_PUBLISHER                "ema"
 !define PRODUCT_WEB_SITE                 "https://github.com/emako"
 !define PRODUCT_LEGAL                    "Licensed under MIT"

src/GenshinWoodmen/Core/LaunchCtrl.cs

@@ -4,7 +4,6 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Windows.Forms;
 
 namespace GenshinWoodmen.Core
 {
@@ -88,21 +87,24 @@ public static async Task<bool> Logout()
                 UserSimulator.Input.Keyboard.KeyPress(VirtualKeyCode.ESCAPE);
                 await JiggingProcessor.Delay(950);
                 RECT rect = NativeMethods.GetWindowRECT(hwnd);
-                NativeMethods.SetCursorPos(rect.Left + 20, rect.Bottom - SystemInformation.CaptionHeight - 10);
+                NativeMethods.SetCursorPos(rect.Left + 20, rect.Bottom - 30);
                 await JiggingProcessor.Delay(100);
-                UserSimulator.Input.Mouse.LeftButtonClick(); // ExitButton
+                UserSimulator.Input.Mouse.LeftButtonClick(); // Exit
                 await JiggingProcessor.Delay(800);
                 (double cx, double cy) = ((rect.Right - rect.Left) / 2d, (rect.Bottom - rect.Top) / 2d);
                 double ratio = (rect.Right - rect.Left) / (double)(rect.Bottom - rect.Top);
                 (double xfactor, double yfactor) = (1.1d, new Func<double>(() =>
                 {
+                    // Inspected from ratio (such as 1.33, 1.5, 1.6, 1.78), calced without `SystemInformation.CaptionHeight` actually.
+                    // TODO: Calc with `SystemInformation.CaptionHeight`.
                     if (ratio >= 1.6d) return 1.4d;
                     else if (ratio >= 1.5d) return 1.35d;
+                    else if (ratio >= 1.4d) return 1.33d;
                     else return 1.3d;
                 }).Invoke());
                 NativeMethods.SetCursorPos(rect.Left + (int)(cx * xfactor), rect.Top + (int)(cy * yfactor));
                 await JiggingProcessor.Delay(100);
-                UserSimulator.Input.Mouse.LeftButtonClick(); // OKButton
+                UserSimulator.Input.Mouse.LeftButtonClick(); // OK
             });
         }
 

src/GenshinWoodmen/GenshinWoodmen.csproj

@@ -11,9 +11,9 @@
     <Platforms>x64</Platforms>
     <AssemblyName>genshin-woodmen</AssemblyName>
     <UseWindowsForms>True</UseWindowsForms>
-    <AssemblyVersion>1.3.0</AssemblyVersion>
-    <FileVersion>1.3.0</FileVersion>
-    <Version>$(VersionPrefix)1.3.0</Version>
+    <AssemblyVersion>1.3.1</AssemblyVersion>
+    <FileVersion>1.3.1</FileVersion>
+    <Version>$(VersionPrefix)1.3.1</Version>
     <Authors>ema</Authors>
     <Company>Lemutec</Company>
     <RestoreSources>$(RestoreSources);..\packages\vccli.net\;https://api.nuget.org/v3/index.json</RestoreSources>

src/GenshinWoodmenSetup/Package.appxmanifest

@@ -9,7 +9,7 @@
   <Identity
     Name="c17bc862-e10e-4618-b717-e47dd2bf65c8"
     Publisher="CN=ema"
-    Version="1.3.0.0" />
+    Version="1.3.1.0" />
 
   <Properties>
     <DisplayName>GenshinWoodmen</DisplayName>