Skip to content

[pull] main from BornToBeRoot:main #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 4 commits into from
Oct 11, 2025
Merged

[pull] main from BornToBeRoot:main #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72a91c3
Docs: Update to 2025.10.4.0
BornToBeRoot Oct 10, 2025
e832246
Fix: react-dom version
BornToBeRoot Oct 11, 2025
d30f56a
Dependency (dependabot/npm): Bump react-dom in /Website (#3184)
dependabot[bot] Oct 11, 2025
cf9df38
Fix: Status window with display scaling (#3185)
BornToBeRoot Oct 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions Source/NETworkManager/StatusWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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)
{
Expand Down
2 changes: 2 additions & 0 deletions Website/docs/changelog/next-release.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 8 additions & 4 deletions Website/docusaurus.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
},
],
},
],
Expand Down
2 changes: 1 addition & 1 deletion Website/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
18 changes: 9 additions & 9 deletions Website/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7363,12 +7363,12 @@ [email protected]:
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"
Expand Down Expand Up @@ -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"
Expand Down