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

Mauller · Mauller · commit 35e01c75df2b · 2025-08-25T10:04:15.000+01:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp b/Generals/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp
@@ -187,10 +187,10 @@ void GlobalLanguage::parseFontFileName( INI *ini, void * instance, void *store,
 
 Int GlobalLanguage::adjustFontSize(Int theFontSize)
 {
-	Real adjustFactor = TheGlobalData->m_xResolution / (Real)DEFAULT_DISPLAY_WIDTH;
-	adjustFactor = 1.0f + (adjustFactor-1.0f) * m_resolutionFontSizeAdjustment;
+	// 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 / (Real)DEFAULT_DISPLAY_WIDTH, TheGlobalData->m_yResolution/600.0f);
+	adjustFactor = 1.0f + (adjustFactor-1.0f) * ( 0.25f + m_resolutionFontSizeAdjustment );
 	if (adjustFactor<1.0f) adjustFactor = 1.0f;
-	if (adjustFactor>2.0f) adjustFactor = 2.0f;
 	Int pointSize = REAL_TO_INT_FLOOR(theFontSize*adjustFactor);
 	return pointSize;
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp
@@ -191,10 +191,10 @@ void GlobalLanguage::parseFontFileName( INI *ini, void * instance, void *store,
 
 Int GlobalLanguage::adjustFontSize(Int theFontSize)
 {
-	Real adjustFactor = TheGlobalData->m_xResolution / (Real)DEFAULT_DISPLAY_WIDTH;
-	adjustFactor = 1.0f + (adjustFactor-1.0f) * m_resolutionFontSizeAdjustment;
+	// 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 / (Real)DEFAULT_DISPLAY_WIDTH, TheGlobalData->m_yResolution/600.0f);
+	adjustFactor = 1.0f + (adjustFactor-1.0f) * ( 0.25f + m_resolutionFontSizeAdjustment );
 	if (adjustFactor<1.0f) adjustFactor = 1.0f;
-	if (adjustFactor>2.0f) adjustFactor = 2.0f;
 	Int pointSize = REAL_TO_INT_FLOOR(theFontSize*adjustFactor);
 	return pointSize;
 }

Original file line number	Diff line number	Diff line change
`@@ -187,10 +187,10 @@ 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 / (Real)DEFAULT_DISPLAY_WIDTH;`
`191`		`- adjustFactor = 1.0f + (adjustFactor-1.0f) * m_resolutionFontSizeAdjustment;`
	`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 / (Real)DEFAULT_DISPLAY_WIDTH, TheGlobalData->m_yResolution/600.0f);`
	`192`	`+ adjustFactor = 1.0f + (adjustFactor-1.0f) * ( 0.25f + m_resolutionFontSizeAdjustment );`
`192`	`193`	`if (adjustFactor<1.0f) adjustFactor = 1.0f;`
`193`		`- if (adjustFactor>2.0f) adjustFactor = 2.0f;`
`194`	`194`	`Int pointSize = REAL_TO_INT_FLOOR(theFontSize*adjustFactor);`
`195`	`195`	`return pointSize;`
`196`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -191,10 +191,10 @@ 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 / (Real)DEFAULT_DISPLAY_WIDTH;`
`195`		`- adjustFactor = 1.0f + (adjustFactor-1.0f) * m_resolutionFontSizeAdjustment;`
	`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 / (Real)DEFAULT_DISPLAY_WIDTH, TheGlobalData->m_yResolution/600.0f);`
	`196`	`+ adjustFactor = 1.0f + (adjustFactor-1.0f) * ( 0.25f + m_resolutionFontSizeAdjustment );`
`196`	`197`	`if (adjustFactor<1.0f) adjustFactor = 1.0f;`
`197`		`- if (adjustFactor>2.0f) adjustFactor = 2.0f;`
`198`	`198`	`Int pointSize = REAL_TO_INT_FLOOR(theFontSize*adjustFactor);`
`199`	`199`	`return pointSize;`
`200`	`200`	`}`