From df8225224c3e9b5a1781d9fced939865580878b9 Mon Sep 17 00:00:00 2001 From: pdone <617941447@qq.com> Date: Fri, 19 Jul 2024 12:47:02 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=BC=82=E5=B8=B8=E5=9D=90=E6=A0=87?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=AA=97=E5=8F=A3=E6=97=A0=E6=B3=95=E7=9C=8B?= =?UTF-8?q?=E5=88=B0=20#78?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FreeControl/Main.cs | 10 +++++++--- FreeControl/Properties/AssemblyInfo.cs | 4 ++-- FreeControl/Update.en.md | 3 +++ FreeControl/Update.md | 3 +++ 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/FreeControl/Main.cs b/FreeControl/Main.cs index fb0c016..d9b8a04 100644 --- 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 index cf11830..e0094ac 100644 --- 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 index db5de52..a74e92a 100644 --- 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 index 5cc77ca..d34a018 100644 --- a/FreeControl/Update.md +++ b/FreeControl/Update.md @@ -1,5 +1,8 @@ # Free Control 更新记录 +## v1.7.2 +- 修复了一些bug + ## v1.7.1 - 增加 `Workflows` - 修复 `PowerOffOnClose` 参数未生效的问题