Make windows DPI aware to display properly on high-resolution screens. (#1983)

* Make Windows DPI aware to display properly on high-resolution screens.

* remove empty line

* Don't use app manifest, set process dpi aware programatically.

Store variables in Program.cs for use instead of re-creating them per class/ method.

* Fix for linux/osx

* Add braces

* Re-use manifest. It appears to be required on linux.

* Undo previous commit -- it appears linux was simply never affected.

* Addressed AcK's comments

* Remove unused usings

* Address comments by AcK #2

* Re-order

* Move FromHwnd call to ForceDpiAware class. Wrap in Try-Catch to prevent crashes on systems that don't support it.

* Additional code cleanup

* Remove "global::" reference.
This commit is contained in:
sharmander 2021-02-19 19:34:41 -05:00 committed by GitHub
parent 65eb9901f1
commit d5081e3f93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 65 additions and 4 deletions

View file

@ -7,6 +7,7 @@
<ItemGroup>
<PackageReference Include="MsgPack.Cli" Version="1.0.1" />
<PackageReference Include="System.Drawing.Common" Version="5.0.1" />
<PackageReference Include="System.Management" Version="5.0.0" />
</ItemGroup>

View file

@ -0,0 +1,45 @@
using Ryujinx.Common.Logging;
using System;
using System.Drawing;
using System.Runtime.InteropServices;
namespace Ryujinx.Common.System
{
public static class ForceDpiAware
{
[DllImport("user32.dll")]
private static extern bool SetProcessDPIAware();
private static readonly double _standardDpiScale = 96.0;
private static readonly double _maxScaleFactor = 1.25;
/// <summary>
/// Marks the application as DPI-Aware when running on the Windows operating system.
/// </summary>
public static void Windows()
{
// Make process DPI aware for proper window sizing on high-res screens.
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && Environment.OSVersion.Version.Major >= 6)
{
SetProcessDPIAware();
}
}
public static double GetWindowScaleFactor()
{
double userDpiScale;
try
{
userDpiScale = Graphics.FromHwnd(IntPtr.Zero).DpiX;
}
catch (Exception e)
{
Logger.Warning?.Print(LogClass.Application, $"Couldn't determine monitor DPI: {e.Message}");
userDpiScale = 96.0;
}
return Math.Min(userDpiScale / _standardDpiScale, _maxScaleFactor);
}
}
}

View file

@ -18,6 +18,8 @@ namespace Ryujinx
{
class Program
{
public static double WindowScaleFactor { get; private set; }
public static string Version { get; private set; }
public static string ConfigurationPath { get; set; }
@ -54,6 +56,10 @@ namespace Ryujinx
}
}
// Make process DPI aware for proper window sizing on high-res screens.
ForceDpiAware.Windows();
WindowScaleFactor = ForceDpiAware.GetWindowScaleFactor();
// Delete backup files after updating.
Task.Run(Updater.CleanupUpdate);

View file

@ -1113,7 +1113,10 @@ namespace Ryujinx.Ui
private void Settings_Pressed(object sender, EventArgs args)
{
new SettingsWindow(this, _virtualFileSystem, _contentManager).Show();
SettingsWindow settingsWindow = new SettingsWindow(this, _virtualFileSystem, _contentManager);
settingsWindow.SetSizeRequest((int)(settingsWindow.DefaultWidth * Program.WindowScaleFactor), (int)(settingsWindow.DefaultHeight * Program.WindowScaleFactor));
settingsWindow.Show();
}
private void Simulate_WakeUp_Message_Pressed(object sender, EventArgs args)
@ -1134,7 +1137,10 @@ namespace Ryujinx.Ui
private void About_Pressed(object sender, EventArgs args)
{
new AboutWindow().Show();
AboutWindow aboutWindow = new AboutWindow();
aboutWindow.SetSizeRequest((int)(aboutWindow.DefaultWidth * Program.WindowScaleFactor), (int)(aboutWindow.DefaultHeight * Program.WindowScaleFactor));
aboutWindow.Show();
}
private void Fav_Toggled(object sender, EventArgs args)

View file

@ -570,7 +570,10 @@ namespace Ryujinx.Ui.Windows
{
((ToggleButton)sender).SetStateFlags(StateFlags.Normal, true);
new ControllerWindow(playerIndex).Show();
ControllerWindow controllerWindow = new ControllerWindow(playerIndex);
controllerWindow.SetSizeRequest((int)(controllerWindow.DefaultWidth * Program.WindowScaleFactor), (int)(controllerWindow.DefaultHeight * Program.WindowScaleFactor));
controllerWindow.Show();
}
private void SaveToggle_Activated(object sender, EventArgs args)