[Scummvm-git-logs] scummvm master -> 75fbb4bafbf8bf64a86d404e7a165093fbe5da90

moralrecordings noreply at scummvm.org
Thu Dec 4 19:03:14 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:
75fbb4bafb DIRECTOR: Fix regression for TextCastMembers that use dynamic text


Commit: 75fbb4bafbf8bf64a86d404e7a165093fbe5da90
    https://github.com/scummvm/scummvm/commit/75fbb4bafbf8bf64a86d404e7a165093fbe5da90
Author: Scott Percival (code at moral.net.au)
Date: 2025-12-05T03:02:27+08:00

Commit Message:
DIRECTOR: Fix regression for TextCastMembers that use dynamic text

This reverts commit c548cede6f68d1c63f620966d90b3e47811174b5.

Fixes inventory screen in Derrat Sorcerum.

Changed paths:
    engines/director/castmember/text.cpp


diff --git a/engines/director/castmember/text.cpp b/engines/director/castmember/text.cpp
index 7319f18b863..c110fc71cdb 100644
--- a/engines/director/castmember/text.cpp
+++ b/engines/director/castmember/text.cpp
@@ -323,8 +323,8 @@ Graphics::MacWidget *TextCastMember::createWidget(Common::Rect &bbox, Channel *c
 			dims.bottom = MIN<int>(dims.bottom, dims.top + _initialRect.height());
 		} else if (_textType == kTextTypeFixed || _textType == kTextTypeScrolling) {
 			// use initialRect to create widget for fixed style text, this maybe related to version.
-			dims.right = MIN<int>(dims.right, dims.left + _initialRect.width());
-			dims.bottom = MIN<int>(dims.bottom, dims.top + MAX<int>(_initialRect.height(), _maxHeight));
+			dims.right = MAX<int>(dims.right, dims.left + _initialRect.width());
+			dims.bottom = MAX<int>(dims.bottom, dims.top + MAX<int>(_initialRect.height(), _maxHeight));
 		}
 		widget = createWindowOrWidget(bbox, dims, macFont);
 		if (_textType != kTextTypeScrolling) {




More information about the Scummvm-git-logs mailing list