[Scummvm-git-logs] scummvm master -> 457b09cb4eabab4516230ec4a46d9340bd040bf4

[sev-]

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

Summary:
457b09cb4e GRAPHICS: MACGUI: Properly process pseudotransparency for MacText rendering


Commit: 457b09cb4eabab4516230ec4a46d9340bd040bf4
    https://github.com/scummvm/scummvm/commit/457b09cb4eabab4516230ec4a46d9340bd040bf4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-28T19:06:15+02:00

Commit Message:
GRAPHICS: MACGUI: Properly process pseudotransparency for MacText rendering

This fixes rendering in WAGE (8-bit texts) while keeping the Richtext images
intact.

The regression was introduced in 004eba9d250071a717d8640a5eba392b97001041

Changed paths:
    graphics/macgui/mactext.cpp


diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 0cc6a3a64b8..e6867fe5028 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -1542,7 +1542,8 @@ void MacText::draw(ManagedSurface *g, int x, int y, int w, int h, int xoff, int
 	if (_textShadow)
 		g->blitFrom(*_shadowSurface, Common::Rect(MIN<int>(_surface->w, x), MIN<int>(_surface->h, y), MIN<int>(_surface->w, x + w), MIN<int>(_surface->h, y + h)), Common::Point(xoff + _textShadow, yoff + _textShadow));
 
-	g->transBlitFrom(*_surface, Common::Rect(MIN<int>(_surface->w, x), MIN<int>(_surface->h, y), MIN<int>(_surface->w, x + w), MIN<int>(_surface->h, y + h)), Common::Point(xoff, yoff));
+	uint32 bgcolor = _bgcolor < 0xff ? _bgcolor : 0;
+	g->transBlitFrom(*_surface, Common::Rect(MIN<int>(_surface->w, x), MIN<int>(_surface->h, y), MIN<int>(_surface->w, x + w), MIN<int>(_surface->h, y + h)), Common::Point(xoff, yoff), bgcolor);
 
 	_contentIsDirty = false;
 	_cursorDirty = false;