[Scummvm-git-logs] scummvm master -> 70b1a4432a8f82c8dd0901d3bfedf3bb10643153

[sev-]

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

Summary:
e683f9e8d3 DIRECTOR: Fix text rendering test colors
70b1a4432a GRAPHICS: MACGUI: Use proper check symbol in MacMenu


Commit: e683f9e8d3bf7f1959e4ac47d2d192f6a18959a3
    https://github.com/scummvm/scummvm/commit/e683f9e8d3bf7f1959e4ac47d2d192f6a18959a3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-05-28T12:54:06+02:00

Commit Message:
DIRECTOR: Fix text rendering test colors

Changed paths:
    engines/director/tests.cpp


diff --git a/engines/director/tests.cpp b/engines/director/tests.cpp
index b5cdbe4952a..86afe336610 100644
--- a/engines/director/tests.cpp
+++ b/engines/director/tests.cpp
@@ -63,13 +63,13 @@ void Window::testFontScaling() {
 
 	const Graphics::MacFONTFont *font1 = (const Graphics::MacFONTFont *)_wm->_fontMan->getFont(origFont);
 
-	Graphics::MacFONTFont::testBlit(font1, &surface, 0, x, y + 200, 500);
+	Graphics::MacFONTFont::testBlit(font1, &surface, 0xff, x, y + 200, 500);
 
-	Graphics::MacFont bigFont(Graphics::kMacFontNewYork, 15);
+	Graphics::MacFont bigFont(Graphics::kMacFontChicago, 12);
 
 	font1 = (const Graphics::MacFONTFont *)_wm->_fontMan->getFont(bigFont);
 
-	Graphics::MacFONTFont::testBlit(font1, &surface, 0, x, y + 50 + 200, 500);
+	Graphics::MacFONTFont::testBlit(font1, &surface, 0xff, x, y + 50 + 170, w - 10);
 
 	const char *text = "d";
 


Commit: 70b1a4432a8f82c8dd0901d3bfedf3bb10643153
    https://github.com/scummvm/scummvm/commit/70b1a4432a8f82c8dd0901d3bfedf3bb10643153
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-05-28T12:54:06+02:00

Commit Message:
GRAPHICS: MACGUI: Use proper check symbol in MacMenu

Changed paths:
    graphics/macgui/macmenu.cpp


diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 3920efb6857..5d3ce3c9b63 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -1170,12 +1170,13 @@ void MacMenu::renderSubmenu(MacMenuSubMenu *menu, bool recursive) {
 
 			if (menu->items[i]->checked) {
 				const Font *font = getMenuFont(menu->items[i]->style);
+				int checkSymbol = _wm->_fontMan->hasBuiltInFonts() ? 0xD7 : 18;
 
 				int padding = _align == kTextAlignRight ? -_menuRightDropdownPadding: _menuLeftDropdownPadding;
-				int offset = padding - font->getCharWidth(195);
+				int offset = padding - font->getCharWidth(checkSymbol);
 
 				// calculating the padding and offset, we draw the √ at the center
-				font->drawChar(s, 195, tx - padding + offset, ty, color);
+				font->drawChar(s, checkSymbol, tx - padding + offset, ty, color);
 			}
 
 			if (!acceleratorText.empty() && shortcutPos == -1)