[OMPT-svn-commit] OpenMPT r22061 - in branches/OpenMPT-1.31: . mptrack

[<sv...@op...>]

Author: sagamusix
Date: Sat Nov  2 01:26:34 2024
New Revision: 22061
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22061

Log:
Merged revision(s) 22060 from trunk/OpenMPT:
[Imp] Add the possibility to disable enhanced GDI upscaling via hidden setting Display.UseGDIUpcaling. This may fix issues that in particular some older VST plugins may be having when this mode is enabled (https://bugs.openmpt.org/view.php?id=1524).
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/mptrack/Mptrack.cpp
   branches/OpenMPT-1.31/mptrack/TrackerSettings.cpp
   branches/OpenMPT-1.31/mptrack/TrackerSettings.h

Modified: branches/OpenMPT-1.31/mptrack/Mptrack.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/Mptrack.cpp	Sat Nov  2 01:23:53 2024	(r22060)
+++ branches/OpenMPT-1.31/mptrack/Mptrack.cpp	Sat Nov  2 01:26:34 2024	(r22061)
@@ -1279,7 +1279,7 @@
 	// For Windows 10, Creators Update (1703) and newer
 	{
 		mpt::Library user32(mpt::LibraryPath::System(P_("user32")));
-		if (user32.IsValid())
+		if(user32.IsValid())
 		{
 			enum MPT_DPI_AWARENESS_CONTEXT
 			{
@@ -1293,12 +1293,12 @@
 			PSETPROCESSDPIAWARENESSCONTEXT SetProcessDpiAwarenessContext = nullptr;
 			if(user32.Bind(SetProcessDpiAwarenessContext, "SetProcessDpiAwarenessContext"))
 			{
-				if (TrackerSettings::Instance().highResUI)
+				if(TrackerSettings::Instance().highResUI)
 				{
 					setDPI = (SetProcessDpiAwarenessContext(HANDLE(MPT_DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2)) == TRUE);
 				} else
 				{
-					if (SetProcessDpiAwarenessContext(HANDLE(MPT_DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED)) == TRUE)
+					if(TrackerSettings::Instance().useGDIUpcaling && SetProcessDpiAwarenessContext(HANDLE(MPT_DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED)) == TRUE)
 						setDPI = true;
 					else
 						setDPI = (SetProcessDpiAwarenessContext(HANDLE(MPT_DPI_AWARENESS_CONTEXT_UNAWARE)) == TRUE);

Modified: branches/OpenMPT-1.31/mptrack/TrackerSettings.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/TrackerSettings.cpp	Sat Nov  2 01:23:53 2024	(r22060)
+++ branches/OpenMPT-1.31/mptrack/TrackerSettings.cpp	Sat Nov  2 01:26:34 2024	(r22061)
@@ -175,6 +175,7 @@
 	, m_ShowSplashScreen(conf, U_("Display"), U_("ShowSplashScreen"), true)
 	, gbMdiMaximize(conf, U_("Display"), U_("MDIMaximize"), true)
 	, highResUI(conf, U_("Display"), U_("HighResUI"), false)
+	, useGDIUpcaling(conf, UL_("Display"), UL_("UseGDIUpscaling"), true)
 	, glTreeSplitRatio(conf, U_("Display"), U_("MDITreeRatio"), 128)
 	, glTreeWindowWidth(conf, U_("Display"), U_("MDITreeWidth"), 160)
 	, glGeneralWindowHeight(conf, U_("Display"), U_("MDIGeneralHeight"), 222)

Modified: branches/OpenMPT-1.31/mptrack/TrackerSettings.h
==============================================================================
--- branches/OpenMPT-1.31/mptrack/TrackerSettings.h	Sat Nov  2 01:23:53 2024	(r22060)
+++ branches/OpenMPT-1.31/mptrack/TrackerSettings.h	Sat Nov  2 01:26:34 2024	(r22061)
@@ -660,6 +660,7 @@
 	Setting<bool> m_ShowSplashScreen;
 	Setting<bool> gbMdiMaximize;
 	Setting<bool> highResUI;
+	Setting<bool> useGDIUpcaling;
 	Setting<LONG> glTreeSplitRatio;
 	Setting<LONG> glTreeWindowWidth;
 	Setting<LONG> glGeneralWindowHeight;