From 57d3296ba4e5c1fc7ca30376c7ca8eb3041ae2f6 Mon Sep 17 00:00:00 2001 From: Mary Date: Sun, 28 Nov 2021 21:24:17 +0100 Subject: infra: Migrate to .NET 6 (#2829) * infra: Migrate to .NET 6 * Rollback version naming change * Workaround .NET 6 ZipArchive API issues * ci: Switch to VS 2022 for AppVeyor CI is now ready for .NET 6 * Suppress WebClient warning in DoUpdateWithMultipleThreads * Attempt to workaround System.Drawing.Common changes on 6.0.0 * Change keyboard rendering from System.Drawing to ImageSharp * Make the software keyboard renderer multithreaded * Bump ImageSharp version to 1.0.4 to fix a bug in Image.Load * Add fallback fonts to the keyboard renderer * Fix warnings * Address caian's comment * Clean up linux workaround as it's uneeded now * Update readme Co-authored-by: Caian Benedicto --- Ryujinx.Common/System/ForceDpiAware.cs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'Ryujinx.Common/System') diff --git a/Ryujinx.Common/System/ForceDpiAware.cs b/Ryujinx.Common/System/ForceDpiAware.cs index 81c69376..dc513307 100644 --- a/Ryujinx.Common/System/ForceDpiAware.cs +++ b/Ryujinx.Common/System/ForceDpiAware.cs @@ -2,6 +2,7 @@ using System; using System.Drawing; using System.Runtime.InteropServices; +using System.Runtime.Versioning; namespace Ryujinx.Common.System { @@ -19,7 +20,7 @@ namespace Ryujinx.Common.System 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) + if (OperatingSystem.IsWindowsVersionAtLeast(6)) { SetProcessDPIAware(); } @@ -27,16 +28,22 @@ namespace Ryujinx.Common.System public static double GetWindowScaleFactor() { - double userDpiScale; + double userDpiScale = 96.0; try { - userDpiScale = Graphics.FromHwnd(IntPtr.Zero).DpiX; + if (OperatingSystem.IsWindows()) + { + userDpiScale = Graphics.FromHwnd(IntPtr.Zero).DpiX; + } + else + { + // TODO: Linux support + } } catch (Exception e) { Logger.Warning?.Print(LogClass.Application, $"Couldn't determine monitor DPI: {e.Message}"); - userDpiScale = 96.0; } return Math.Min(userDpiScale / _standardDpiScale, _maxScaleFactor); -- cgit v1.2.3