From db8454a0ff1ae29c90d7eec17c4419e2e630e926 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Wed, 3 Jul 2024 22:20:14 +1000 Subject: [PATCH] Fix testroms project compilation fixes e8c957a7a --- src/BizHawk.Client.Common/DisplayManager/DisplayManagerBase.cs | 2 ++ src/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs | 3 ++- src/BizHawk.Tests.Testroms.GB/DummyFrontend.cs | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/BizHawk.Client.Common/DisplayManager/DisplayManagerBase.cs b/src/BizHawk.Client.Common/DisplayManager/DisplayManagerBase.cs index b559c489ad..3212aa1ec5 100644 --- a/src/BizHawk.Client.Common/DisplayManager/DisplayManagerBase.cs +++ b/src/BizHawk.Client.Common/DisplayManager/DisplayManagerBase.cs @@ -42,6 +42,8 @@ namespace BizHawk.Client.Common } } + public const int DEFAULT_DPI = 96; + public OSDManager OSD { get; } protected Config GlobalConfig; diff --git a/src/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs b/src/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs index 4804dba3a0..f4ef67fe68 100644 --- a/src/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs +++ b/src/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs @@ -52,7 +52,8 @@ namespace BizHawk.Client.EmuHawk public override Size GetPanelNativeSize() => _presentationPanel.NativeSize; - protected override int GetGraphicsControlDpi() => OSTailoredCode.IsUnixHost ? 96 : GraphicsControlDpi; + protected override int GetGraphicsControlDpi() + => OSTailoredCode.IsUnixHost ? DisplayManagerBase.DEFAULT_DPI : GraphicsControlDpi; // DeviceDpi is not available under mono, so we need to have this access wrapped in a separate function private int GraphicsControlDpi => _graphicsControl.DeviceDpi; diff --git a/src/BizHawk.Tests.Testroms.GB/DummyFrontend.cs b/src/BizHawk.Tests.Testroms.GB/DummyFrontend.cs index 195a04be37..6b3182b68b 100644 --- a/src/BizHawk.Tests.Testroms.GB/DummyFrontend.cs +++ b/src/BizHawk.Tests.Testroms.GB/DummyFrontend.cs @@ -98,6 +98,9 @@ namespace BizHawk.Tests.Testroms.GB public override void ActivateOpenGLContext() {} + protected override int GetGraphicsControlDpi() + => DisplayManagerBase.DEFAULT_DPI; + protected override Size GetGraphicsControlSize() => throw new NotImplementedException();