[Scummvm-git-logs] scummvm master -> 98f614269fb757ac4b8e827ee89693aa4e096ab7

[sev-]

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

Summary:
8bb261abba MACGUI: Temporary fix for Geneva font duality
0bbfe624be MACGUI: Do not recalc empty text
98f614269f DIRECTOR: Sanity check for button drawing


Commit: 8bb261abbae782edcb5f9ff10fbadd62a97fe7bc
    https://github.com/scummvm/scummvm/commit/8bb261abbae782edcb5f9ff10fbadd62a97fe7bc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-11-24T15:57:08+01:00

Commit Message:
MACGUI: Temporary fix for Geneva font duality

Changed paths:
    graphics/macgui/macfontmanager.cpp


diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp
index ac58b80..92cb63b 100644
--- a/graphics/macgui/macfontmanager.cpp
+++ b/graphics/macgui/macfontmanager.cpp
@@ -38,7 +38,7 @@ static const char *const fontNames[] = {
 	"Chicago",	// system font
 	"Geneva",	// application font
 	"New York",
-	"Geneva",
+	NULL, // FIXME: "Geneva",
 
 	"Monaco",
 	"Venice",


Commit: 0bbfe624be0b7fb01a1e94f37e00b9a448651f7f
    https://github.com/scummvm/scummvm/commit/0bbfe624be0b7fb01a1e94f37e00b9a448651f7f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-11-24T15:57:08+01:00

Commit Message:
MACGUI: Do not recalc empty text

Changed paths:
    graphics/macgui/mactext.cpp


diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 9a5de39..1c80e55 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -295,6 +295,9 @@ void MacText::render() {
 }
 
 void MacText::render(int from, int to) {
+	if (_textLines.empty())
+		return;
+
 	reallocSurface();
 
 	from = MAX<int>(0, from);
@@ -373,6 +376,9 @@ void MacText::setInterLinear(int interLinear) {
 }
 
 void MacText::recalcDims() {
+	if (_textLines.empty())
+		return;
+
 	int y = 0;
 	_textMaxWidth = 0;
 


Commit: 98f614269fb757ac4b8e827ee89693aa4e096ab7
    https://github.com/scummvm/scummvm/commit/98f614269fb757ac4b8e827ee89693aa4e096ab7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-11-24T15:57:08+01:00

Commit Message:
DIRECTOR: Sanity check for button drawing

Changed paths:
    engines/director/frame.cpp


diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 6ea3930..1054b08 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -792,6 +792,9 @@ void Frame::renderText(Graphics::ManagedSurface &surface, uint16 spriteId, Commo
 	textCast->cachedMacText->setWm(_vm->_wm); // TODO this is not a good place to do it
 	const Graphics::ManagedSurface *textSurface = textCast->cachedMacText->getSurface();
 
+	if (!textSurface)
+		return;
+
 	height = textSurface->h;
 	if (textSize != NULL) {
 		// TODO: this offset could be due to incorrect fonts loaded!