bugfix(gui): Scale fonts based on the smallest screen dimension so they scale independent of aspect ratio

Mauller · Mauller · commit a4caabb3895c · 2025-08-14T18:03:12.000+01:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp b/Generals/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp
@@ -187,7 +187,8 @@ void GlobalLanguage::parseFontFileName( INI *ini, void * instance, void *store,
 
 Int GlobalLanguage::adjustFontSize(Int theFontSize)
 {
-	Real adjustFactor = TheGlobalData->m_xResolution/800.0f;
+	// TheSuperHackers @bugfix Mauller 10/08/2025 Scale fonts based on the smallest screen dimension so they are independent of aspect ratio
+	Real adjustFactor = min(TheGlobalData->m_xResolution/800.0f, TheGlobalData->m_yResolution/600.0f);
 	adjustFactor = 1.0f + (adjustFactor-1.0f) * m_resolutionFontSizeAdjustment;
 	if (adjustFactor<1.0f) adjustFactor = 1.0f;
 	if (adjustFactor>2.0f) adjustFactor = 2.0f;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp
@@ -191,7 +191,8 @@ void GlobalLanguage::parseFontFileName( INI *ini, void * instance, void *store,
 
 Int GlobalLanguage::adjustFontSize(Int theFontSize)
 {
-	Real adjustFactor = TheGlobalData->m_xResolution/800.0f;
+	// TheSuperHackers @bugfix Mauller 10/08/2025 Scale fonts based on the smallest screen dimension so they are independent of aspect ratio
+	Real adjustFactor = min(TheGlobalData->m_xResolution/800.0f, TheGlobalData->m_yResolution/600.0f);
 	adjustFactor = 1.0f + (adjustFactor-1.0f) * m_resolutionFontSizeAdjustment;
 	if (adjustFactor<1.0f) adjustFactor = 1.0f;
 	if (adjustFactor>2.0f) adjustFactor = 2.0f;

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,8 @@ void GlobalLanguage::parseFontFileName( INI ini, void instance, void *store,`
`187`	`187`
`188`	`188`	`Int GlobalLanguage::adjustFontSize(Int theFontSize)`
`189`	`189`	`{`
`190`		`- Real adjustFactor = TheGlobalData->m_xResolution/800.0f;`
	`190`	`+ // TheSuperHackers @bugfix Mauller 10/08/2025 Scale fonts based on the smallest screen dimension so they are independent of aspect ratio`
	`191`	`+ Real adjustFactor = min(TheGlobalData->m_xResolution/800.0f, TheGlobalData->m_yResolution/600.0f);`
`191`	`192`	`adjustFactor = 1.0f + (adjustFactor-1.0f) * m_resolutionFontSizeAdjustment;`
`192`	`193`	`if (adjustFactor<1.0f) adjustFactor = 1.0f;`
`193`	`194`	`if (adjustFactor>2.0f) adjustFactor = 2.0f;`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,8 @@ void GlobalLanguage::parseFontFileName( INI ini, void instance, void *store,`
`191`	`191`
`192`	`192`	`Int GlobalLanguage::adjustFontSize(Int theFontSize)`
`193`	`193`	`{`
`194`		`- Real adjustFactor = TheGlobalData->m_xResolution/800.0f;`
	`194`	`+ // TheSuperHackers @bugfix Mauller 10/08/2025 Scale fonts based on the smallest screen dimension so they are independent of aspect ratio`
	`195`	`+ Real adjustFactor = min(TheGlobalData->m_xResolution/800.0f, TheGlobalData->m_yResolution/600.0f);`
`195`	`196`	`adjustFactor = 1.0f + (adjustFactor-1.0f) * m_resolutionFontSizeAdjustment;`
`196`	`197`	`if (adjustFactor<1.0f) adjustFactor = 1.0f;`
`197`	`198`	`if (adjustFactor>2.0f) adjustFactor = 2.0f;`