diff --git a/Source/NETworkManager/StatusWindow.xaml.cs b/Source/NETworkManager/StatusWindow.xaml.cs index a4184ca53b..794c48ae3f 100644 --- a/Source/NETworkManager/StatusWindow.xaml.cs +++ b/Source/NETworkManager/StatusWindow.xaml.cs @@ -1,13 +1,12 @@ -using System; +using NETworkManager.Settings; +using NETworkManager.Utilities; +using NETworkManager.Views; +using System; using System.ComponentModel; using System.Runtime.CompilerServices; using System.Windows.Forms; using System.Windows.Input; using System.Windows.Threading; -using log4net; -using NETworkManager.Settings; -using NETworkManager.Utilities; -using NETworkManager.Views; namespace NETworkManager; @@ -43,7 +42,7 @@ private void OnPropertyChanged([CallerMemberName] string propertyName = null) #endregion #region Variables - + // Set priority to make the ui smoother private readonly DispatcherTimer _dispatcherTimerClose = new(DispatcherPriority.Normal); @@ -142,16 +141,18 @@ public void ShowWindow(bool enableCloseTimer = false) // ToDo: User setting... if (Screen.PrimaryScreen != null) { - Left = Screen.PrimaryScreen.WorkingArea.Right - Width - 10; - Top = Screen.PrimaryScreen.WorkingArea.Bottom - Height - 10; + var scaleFactor = System.Windows.Media.VisualTreeHelper.GetDpi(this).DpiScaleX; + + Left = Screen.PrimaryScreen.WorkingArea.Right / scaleFactor - Width - 10; + Top = Screen.PrimaryScreen.WorkingArea.Bottom / scaleFactor - Height - 10; } // Show the window Show(); - + // Check the network connection Check(); - + // Close the window after a certain time if (enableCloseTimer) { diff --git a/Website/docs/changelog/next-release.md b/Website/docs/changelog/next-release.md index 61df56f460..b89128b314 100644 --- a/Website/docs/changelog/next-release.md +++ b/Website/docs/changelog/next-release.md @@ -34,6 +34,8 @@ Release date: **xx.xx.2025** ## Bug Fixes +- Fixed an issue where the status window was out of screen when a display scale other than 100% was set. [#3185](https://github.com/BornToBeRoot/NETworkManager/pull/3185) + **Web Console** - Fixed a crash that occurred when clearing the browser cache. [#3169](https://github.com/BornToBeRoot/NETworkManager/pull/3169) diff --git a/Website/docusaurus.config.js b/Website/docusaurus.config.js index cddee31c62..268a67668c 100644 --- a/Website/docusaurus.config.js +++ b/Website/docusaurus.config.js @@ -154,18 +154,22 @@ const config = { "@docusaurus/plugin-client-redirects", { redirects: [ - { + { from: ["/docs/changelog/latest"], - to: "/docs/changelog/2025-1-18-0", + to: "/docs/changelog/2025-8-10-0", }, { from: ["/docs/changelog/2025-6-13-0"], - to: "/docs/changelog/next-release", + to: "/docs/changelog/2025-8-10-0", }, { from: ["/docs/changelog/2025-7-9-0"], + to: "/docs/changelog/2025-8-10-0", + }, + { + from: ["/docs/changelog/2025-10-4-0"], to: "/docs/changelog/next-release", - } + }, ], }, ], diff --git a/Website/package.json b/Website/package.json index 72b03271c8..7c51279f31 100644 --- a/Website/package.json +++ b/Website/package.json @@ -21,7 +21,7 @@ "clsx": "^2.0.0", "prism-react-renderer": "^2.4.1", "react": "^19.2.0", - "react-dom": "^19.1.1", + "react-dom": "^19.2.0", "react-image-gallery": "^1.4.0" }, "devDependencies": { diff --git a/Website/yarn.lock b/Website/yarn.lock index a682fae5d2..29abae4430 100644 --- a/Website/yarn.lock +++ b/Website/yarn.lock @@ -7363,12 +7363,12 @@ rc@1.2.8: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-dom@^19.1.1: - version "19.1.1" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.1.1.tgz#2daa9ff7f3ae384aeb30e76d5ee38c046dc89893" - integrity sha512-Dlq/5LAZgF0Gaz6yiqZCf6VCcZs1ghAJyrsu84Q/GT0gV+mCxbfmKNoGRKBYMJ8IEdGPqu49YWXD02GCknEDkw== +react-dom@^19.2.0: + version "19.2.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.2.0.tgz#00ed1e959c365e9a9d48f8918377465466ec3af8" + integrity sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ== dependencies: - scheduler "^0.26.0" + scheduler "^0.27.0" react-fast-compare@^3.2.0: version "3.2.2" @@ -7792,10 +7792,10 @@ sax@^1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.1.tgz#44cc8988377f126304d3b3fc1010c733b929ef0f" integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg== -scheduler@^0.26.0: - version "0.26.0" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.26.0.tgz#4ce8a8c2a2095f13ea11bf9a445be50c555d6337" - integrity sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA== +scheduler@^0.27.0: + version "0.27.0" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.27.0.tgz#0c4ef82d67d1e5c1e359e8fc76d3a87f045fe5bd" + integrity sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q== schema-dts@^1.1.2: version "1.1.5"