[Scummvm-git-logs] scummvm master -> 92b03145a2376443bbf7f3405fd4d7ea90f31f91

[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:
92b03145a2 GRAPHICS: MACGUI: Disable MacText with tables resizing


Commit: 92b03145a2376443bbf7f3405fd4d7ea90f31f91
    https://github.com/scummvm/scummvm/commit/92b03145a2376443bbf7f3405fd4d7ea90f31f91
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-11-24T19:48:24+01:00

Commit Message:
GRAPHICS: MACGUI: Disable MacText with tables resizing

The problem is more complex than it appears, so, disabling this
before the release, because the current code is removing
tables on resize

Changed paths:
    graphics/macgui/mactext-canvas.cpp
    graphics/macgui/mactext.cpp


diff --git a/graphics/macgui/mactext-canvas.cpp b/graphics/macgui/mactext-canvas.cpp
index 1756c7946d1..4411ababbbe 100644
--- a/graphics/macgui/mactext-canvas.cpp
+++ b/graphics/macgui/mactext-canvas.cpp
@@ -1204,6 +1204,12 @@ void MacTextCanvas::setMaxWidth(int maxWidth, MacFontRun &defaultFormatting) {
 
 	for (uint i = 0; i < _text.size(); i++) {
 		row = i;
+
+		if (_text[i].table) {
+			processTable(i, maxWidth);
+			continue;
+		}
+
 		reshuffleParagraph(&row, &col, _defaultFormatting);
 
 		while (i < _text.size() - 1 && !_text[i].paragraphEnd)
diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index b5d8afaf881..0b6b169a8dc 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -303,6 +303,14 @@ void MacText::setMaxWidth(int maxWidth) {
 		return;
 	}
 
+	for (uint i = 0; i < _canvas._text.size(); i++) {
+		if (_canvas._text[i].table) {
+			// TODO
+			debug(0, "MacText::setMaxWidth(): Skipping resize for MacText with tables");
+			return;
+		}
+	}
+
 	// keep the cursor pos
 	int ppos = 0;
 	for (int i = 0; i < _cursorRow; i++)