pjandro/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-08-04 14:22:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: 在窗口初始化前设置保存的尺寸，消除启动时偏右下偏移 (#9498)"

Browse Source 
This reverts commit 8147b39723.
https://github.com/2dust/v2rayN/issues/9740
This commit is contained in:
2dust
2026-07-14 17:27:30 +08:00
parent 50ab02e8a9
commit 1ab9757498
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
v2rayN/v2rayN.Desktop/Base/WindowBase.cs
View File

@@ -4,7 +4,6 @@ public class WindowBase<TViewModel> : ReactiveWindow<TViewModel> where TViewMode
{
public WindowBase()
{
Initialized += OnWindowInitialized;
Loaded += OnLoaded;
Loaded += (s, e) =>
{
@@ -20,7 +19,7 @@ public class WindowBase<TViewModel> : ReactiveWindow<TViewModel> where TViewMode
throw new NotImplementedException();
}
private void OnWindowInitialized(object? sender, EventArgs e)
protected virtual void OnLoaded(object? sender, RoutedEventArgs e)
{
try
{
@@ -30,23 +29,22 @@ public class WindowBase<TViewModel> : ReactiveWindow<TViewModel> where TViewMode
return;
}
if (sizeItem.Width > 0 && !Width.Equals(sizeItem.Width))
{
Width = sizeItem.Width;
}
var screen = Screens.ScreenFromWindow(this) ?? Screens.Primary;
var scaling = screen.Scaling > 0 ? screen.Scaling : 1.0;
var workingArea = screen.WorkingArea;
if (sizeItem.Height > 0 && !Height.Equals(sizeItem.Height))
{
Height = sizeItem.Height;
}
var width = Math.Min(sizeItem.Width, workingArea.Width / scaling);
var height = Math.Min(sizeItem.Height, workingArea.Height / scaling);
var x = workingArea.X + ((workingArea.Width - (width * scaling)) / 2);
var y = workingArea.Y + ((workingArea.Height - (height * scaling)) / 2);
Width = width;
Height = height;
Position = new PixelPoint((int)x, (int)y);
}
catch { }
}
protected virtual void OnLoaded(object? sender, RoutedEventArgs e)
{
}
protected override void OnClosed(EventArgs e)
{
base.OnClosed(e);