[Scummvm-git-logs] scummvm master -> 44ed21a63280d8031252f87f7d88b5859abcb8d3

digitall noreply at scummvm.org
Sun Oct 5 21:02:59 UTC 2025


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
44ed21a632 GUI: Fix Rich Text Widget To Compile When Translation Is Disabled


Commit: 44ed21a63280d8031252f87f7d88b5859abcb8d3
    https://github.com/scummvm/scummvm/commit/44ed21a63280d8031252f87f7d88b5859abcb8d3
Author: D G Turner (digitall at scummvm.org)
Date: 2025-10-05T22:02:02+01:00

Commit Message:
GUI: Fix Rich Text Widget To Compile When Translation Is Disabled

The build was broken when --disable-translation is passed to configure

Changed paths:
    gui/widgets/richtext.cpp


diff --git a/gui/widgets/richtext.cpp b/gui/widgets/richtext.cpp
index 821fbacf77e..0e7ba50216a 100644
--- a/gui/widgets/richtext.cpp
+++ b/gui/widgets/richtext.cpp
@@ -21,7 +21,6 @@
 
 #include "common/system.h"
 #include "common/unicode-bidi.h"
-#include "common/translation.h"
 
 #include "graphics/macgui/mactext.h"
 
@@ -199,10 +198,11 @@ void RichTextWidget::createWidget() {
 	const int fontHeight = g_gui.xmlEval()->getVar("Globals.Font.Height", 25);
 
 	int newId;
-	if (TransMan.currentIsBuiltinLanguage())
-		newId = Graphics::kMacFontNewYork;
-	else // MacFONTs do not contain diacritic marks or non-English characters, so we have to use TTF instead
+	if (ConfMan.hasKey("gui_language") && !ConfMan.get("gui_language").empty())
+		// MacFONTs do not contain diacritic marks or non-English characters, so we have to use TTF instead
 		newId = wm->_fontMan->registerTTFFont(ttfFamily);
+	else
+		newId = Graphics::kMacFontNewYork;
 	Graphics::MacFont macFont(newId, fontHeight, Graphics::kMacFontRegular);
 
 	_txtWnd = new Graphics::MacText(Common::U32String(), wm, &macFont, fg, bg, _textWidth, Graphics::kTextAlignLeft);




More information about the Scummvm-git-logs mailing list