epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support OPENRA_DISPLAY_SCALE environment variable on Windows.

Browse Source
This commit is contained in:
Paul Chote
2020-05-31 15:57:33 +01:00
committed by reaperrr
parent 57a3ad8ae2
commit e5dc0309f1
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Platforms.Default/Sdl2PlatformWindow.cs
View File

@@ -176,15 +176,19 @@ namespace OpenRA.Platforms.Default
// This is not necessary on macOS, which defines window sizes in effective units ("points"). // This is not necessary on macOS, which defines window sizes in effective units ("points").
if (Platform.CurrentPlatform == PlatformType.Windows) if (Platform.CurrentPlatform == PlatformType.Windows)
{ {
if (SDL.SDL_GetDisplayDPI(videoDisplay, out var ddpi, out _, out _) == 0) // Launch the game with OPENRA_DISPLAY_SCALE to force a specific scaling factor
windowScale = ddpi / 96; // Otherwise fall back to Windows's DPI configuration
var scaleVariable = Environment.GetEnvironmentVariable("OPENRA_DISPLAY_SCALE");
if (scaleVariable == null || !float.TryParse(scaleVariable, NumberStyles.Float, NumberFormatInfo.InvariantInfo, out windowScale) || windowScale <= 0)
if (SDL.SDL_GetDisplayDPI(videoDisplay, out var ddpi, out _, out _) == 0)
windowScale = ddpi / 96;
} }
else if (Platform.CurrentPlatform != PlatformType.OSX) else if (Platform.CurrentPlatform == PlatformType.Linux)
{ {
// Launch the game with OPENRA_DISPLAY_SCALE to force a specific scaling factor // Launch the game with OPENRA_DISPLAY_SCALE to force a specific scaling factor
// Otherwise fall back to GDK_SCALE or parsing the x11 DPI configuration // Otherwise fall back to GDK_SCALE or parsing the x11 DPI configuration
var scaleVariable = Environment.GetEnvironmentVariable("OPENRA_DISPLAY_SCALE") ?? Environment.GetEnvironmentVariable("GDK_SCALE"); var scaleVariable = Environment.GetEnvironmentVariable("OPENRA_DISPLAY_SCALE") ?? Environment.GetEnvironmentVariable("GDK_SCALE");
if (scaleVariable == null || !float.TryParse(scaleVariable, NumberStyles.Float, NumberFormatInfo.InvariantInfo, out windowScale)) if (scaleVariable == null || !float.TryParse(scaleVariable, NumberStyles.Float, NumberFormatInfo.InvariantInfo, out windowScale) || windowScale <= 0)
{ {
// Attempt to automatically detect DPI // Attempt to automatically detect DPI
try try