Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-06 03:07:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use effective pixels for unsupported previewer (#26345)

Browse Source
This commit is contained in:
Samuel Chapleau
2023-05-26 12:46:43 -07:00
committed by GitHub
parent 6d676329ce
commit 95a9a8a2b0
12 changed files with 72 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/peek/Peek.UI/Extensions/HWNDExtensions.cs
View File

@@ -58,5 +58,12 @@ namespace Peek.UI.Extensions
PInvoke.GetMonitorInfo(monitor, ref info);
return new Size(info.rcMonitor.Size.Width, info.rcMonitor.Size.Height);
}
internal static double GetMonitorScale(this HWND hwnd)
{
var dpi = PInvoke.GetDpiForWindow(hwnd);
var scalingFactor = dpi / 96d;
return scalingFactor;
}
}
}

5
src/modules/peek/Peek.UI/Extensions/WindowExtensions.cs
View File

@@ -17,10 +17,7 @@ namespace Peek.UI.Extensions
public static double GetMonitorScale(this Window window)
{
var hwnd = new HWND(window.GetWindowHandle());
var dpi = PInvoke.GetDpiForWindow(new HWND(hwnd));
double scalingFactor = dpi / 96d;
return scalingFactor;
return hwnd.GetMonitorScale();
}
public static void BringToForeground(this Window window)

49
src/modules/peek/Peek.UI/MainWindow.xaml.cs
View File

@@ -2,6 +2,7 @@
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using interop;
using Microsoft.PowerToys.Telemetry;
using Microsoft.UI.Windowing;
@@ -104,42 +105,48 @@ namespace Peek.UI
private void FilePreviewer_PreviewSizeChanged(object sender, PreviewSizeChangedArgs e)
{
var foregroundWindowHandle = Windows.Win32.PInvoke.GetForegroundWindow();
var monitorSize = foregroundWindowHandle.GetMonitorSize();
var monitorScale = foregroundWindowHandle.GetMonitorScale();
// If no size is requested, try to fit to the monitor size.
Size requestedSize = e.WindowSizeRequested ?? monitorSize;
Size requestedSize = e.PreviewSize.MonitorSize ?? monitorSize;
var contentScale = e.PreviewSize.UseEffectivePixels ? 1 : monitorScale;
Size scaledRequestedSize = new Size(requestedSize.Width / contentScale, requestedSize.Height / contentScale);
double titleBarHeight = TitleBarControl.ActualHeight;
double maxContentWidth = monitorSize.Width * WindowConstants.MaxWindowToMonitorRatio;
double maxContentHeight = (monitorSize.Height - titleBarHeight) * WindowConstants.MaxWindowToMonitorRatio;
Size maxContentSize = new(maxContentWidth, maxContentHeight);
double minContentWidth = WindowConstants.MinWindowWidth;
double minContentHeight = WindowConstants.MinWindowHeight - titleBarHeight;
Size minContentSize = new(minContentWidth, minContentHeight);
Size adjustedContentSize = requestedSize.Fit(maxContentSize, minContentSize);
// TODO: Only re-center if window has not been resized by user (or use design-defined logic).
// TODO: Investigate why portrait images do not perfectly fit edge-to-edge
double monitorScale = this.GetMonitorScale();
double scaledWindowWidth = adjustedContentSize.Width / monitorScale;
double scaledWindowHeight = adjustedContentSize.Height / monitorScale;
Size monitorMinContentSize = GetMonitorMinContentSize(monitorScale);
Size monitorMaxContentSize = GetMonitorMaxContentSize(monitorSize, monitorScale);
Size adjustedContentSize = scaledRequestedSize.Fit(monitorMaxContentSize, monitorMinContentSize);
double desiredScaledHeight = scaledWindowHeight + titleBarHeight + WindowConstants.WindowWidthContentPadding;
double desiredScaledWidth = scaledWindowWidth + WindowConstants.WindowHeightContentPadding;
var titleBarHeight = TitleBarControl.ActualHeight;
var desiredWindowHeight = adjustedContentSize.Height + titleBarHeight + WindowConstants.WindowWidthContentPadding;
var desiredWindowWidth = adjustedContentSize.Width + WindowConstants.WindowHeightContentPadding;
if (!TitleBarControl.Pinned)
{
this.CenterOnMonitor(foregroundWindowHandle, desiredScaledWidth, desiredScaledHeight); // re-center if not pinned
this.CenterOnMonitor(foregroundWindowHandle, desiredWindowWidth, desiredWindowHeight);
}
this.Show();
this.BringToForeground();
}
private Size GetMonitorMaxContentSize(Size monitorSize, double scaling)
{
var titleBarHeight = TitleBarControl.ActualHeight;
var maxContentWidth = monitorSize.Width * WindowConstants.MaxWindowToMonitorRatio;
var maxContentHeight = (monitorSize.Height - titleBarHeight) * WindowConstants.MaxWindowToMonitorRatio;
return new Size(maxContentWidth / scaling, maxContentHeight / scaling);
}
private Size GetMonitorMinContentSize(double scaling)
{
var titleBarHeight = TitleBarControl.ActualHeight;
var minContentWidth = WindowConstants.MinWindowWidth;
var minContentHeight = WindowConstants.MinWindowHeight - titleBarHeight;
return new Size(minContentWidth / scaling, minContentHeight / scaling);
}
/// <summary>
/// Handle AppWindow closing to prevent app termination on close.
/// </summary>