fix 异常坐标导致窗口无法看到 #78

pdone · Jul 19, 2024 · df82252 · df82252
1 parent 9367b41
commit df82252
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/FreeControl/Main.cs b/FreeControl/Main.cs
@@ -204,9 +204,13 @@ public void InitPdone()
             ExtractResource(reload);
             if (_Setting.MainWindowX != 0 || _Setting.MainWindowY != 0)
             {
-                // 主窗口位置
-                StartPosition = FormStartPosition.Manual;
-                Location = new Point(_Setting.MainWindowX, _Setting.MainWindowY);
+                // 避免异常坐标导致窗口无法看到 同时需要考虑双屏时的负坐标 三屏或以上暂时无法测试与兼容
+                if (_Setting.MainWindowX.InRange(-1980, 1980) && _Setting.MainWindowY.InRange(-1080, 1080))
+                {
+                    // 主窗口位置
+                    StartPosition = FormStartPosition.Manual;
+                    Location = new Point(_Setting.MainWindowX, _Setting.MainWindowY);
+                }
             }
 
             #region 控件状态

diff --git a/FreeControl/Properties/AssemblyInfo.cs b/FreeControl/Properties/AssemblyInfo.cs
@@ -33,5 +33,5 @@
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("1.7.1")]
-[assembly: AssemblyVersion("1.7.1")]
+[assembly: AssemblyFileVersion("1.7.2")]
+[assembly: AssemblyVersion("1.7.2")]
diff --git a/FreeControl/Update.en.md b/FreeControl/Update.en.md
@@ -1,5 +1,8 @@
 # Free Control Update Record
 
+## v1.7.2
+- Fix bug
+
 ## v1.7.1
 - Add `Workflows`
 - Fix `PowerOffOnClose` parameter not taking effect

diff --git a/FreeControl/Update.md b/FreeControl/Update.md
@@ -1,5 +1,8 @@
 # Free Control 更新记录
 
+## v1.7.2
+- 修复了一些bug
+
 ## v1.7.1
 - 增加 `Workflows`
 - 修复 `PowerOffOnClose` 参数未生效的问题