maxmustermann/PowerToys
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Settings] Fix default settings window size with zoom (#14199)

Browse source
This commit is contained in:
Davide Giacometti 2021-11-02 11:16:03 +01:00 committed by GitHub
parent fa3a5f80a1
commit fe85ee5307
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/settings-ui/PowerToys.Settings/MainWindow.xaml.cs
View file

@ -32,6 +32,8 @@ namespace PowerToys.Settings
this.InitializeComponent();
Utils.FitToScreen(this);
ResourceLoader loader = ResourceLoader.GetForViewIndependentUse();
Title = loader.GetString("SettingsWindow_Title");
@ -61,8 +63,6 @@ namespace PowerToys.Settings
{
base.OnSourceInitialized(e);
Utils.FitToScreen(this);
var handle = new WindowInteropHelper(this).Handle;
NativeMethods.GetWindowPlacement(handle, out var startupPlacement);
var placement = Utils.DeserializePlacementOrDefault(handle);
@ -72,8 +72,8 @@ namespace PowerToys.Settings
var screenRect = new Rectangle((int)SystemParameters.VirtualScreenLeft, (int)SystemParameters.VirtualScreenTop, (int)SystemParameters.VirtualScreenWidth, (int)SystemParameters.VirtualScreenHeight);
var intersection = Rectangle.Intersect(windowRect, screenRect);
// Restore default position if 1/4 of width or height of the window is offscreen
if (intersection.Width < (Width * 0.75) || intersection.Height < (Height * 0.75))
// Restore default position if 5% of width or height of the window is offscreen
if (intersection.Width < (Width * 0.95) || intersection.Height < (Height * 0.95))
{
NativeMethods.SetWindowPlacement(handle, ref startupPlacement);
}