[Scummvm-git-logs] scummvm master -> 4afcad492a2bf2261e6d0f356284ac89abf31ea3

[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:
2dbfef826d GRAPHICS: MACGUI: Added more debug output to MacTextCanvas
4afcad492a GRAPHICS: MACGUI: Fixed numbered list indentation in MacTextCanvas


Commit: 2dbfef826d4b00e0bc52dc0755cc65bd52fe9ca0
    https://github.com/scummvm/scummvm/commit/2dbfef826d4b00e0bc52dc0755cc65bd52fe9ca0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-10-31T01:01:38+01:00

Commit Message:
GRAPHICS: MACGUI: Added more debug output to MacTextCanvas

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


diff --git a/graphics/macgui/mactext-canvas.cpp b/graphics/macgui/mactext-canvas.cpp
index 461403f1e3e..377b7e179b2 100644
--- a/graphics/macgui/mactext-canvas.cpp
+++ b/graphics/macgui/mactext-canvas.cpp
@@ -187,7 +187,7 @@ const Common::U32String::value_type *MacTextCanvas::splitString(const Common::U3
 					continue;
 			}
 
-			D(9, "** splitString, chunk: \"%s\"", Common::toPrintable(tmp.encode()).c_str());
+			D(9, "\n** splitString, chunk: \"%s\"", Common::toPrintable(tmp.encode()).c_str());
 
 			// Okay, now we are either at the end of the line, or in the next
 			// chunk definition. That means, that we have to store the previous chunk
@@ -436,6 +436,7 @@ const Common::U32String::value_type *MacTextCanvas::splitString(const Common::U3
 				}
 			}
 
+			D(9, "*** splitString: text[%d] indent: %d, fi: %d", curLine, indentSize, firstLineIndent);
 
 			curTextLine->indent = indentSize;
 			curTextLine->firstLineIndent = firstLineIndent;
@@ -453,9 +454,6 @@ const Common::U32String::value_type *MacTextCanvas::splitString(const Common::U3
 		if (inTable)
 			continue;
 
-		// Add new line
-		D(9, "** splitString: new line");
-
 		curTextLine->paragraphEnd = true;
 		// if the chunks is empty, which means the line will not be rendered properly
 		// so we add a empty string here
@@ -464,6 +462,9 @@ const Common::U32String::value_type *MacTextCanvas::splitString(const Common::U3
 		}
 
 		if (*s) {
+			// Add new line
+			D(9, "** splitString: new line");
+
 			curLine++;
 			_text.insert_at(curLine, MacTextLine());
 			_text[curLine].chunks.push_back(chunk);


Commit: 4afcad492a2bf2261e6d0f356284ac89abf31ea3
    https://github.com/scummvm/scummvm/commit/4afcad492a2bf2261e6d0f356284ac89abf31ea3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-10-31T01:02:19+01:00

Commit Message:
GRAPHICS: MACGUI: Fixed numbered list indentation in MacTextCanvas

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


diff --git a/graphics/macgui/mactext-canvas.cpp b/graphics/macgui/mactext-canvas.cpp
index 377b7e179b2..2c464c06d0c 100644
--- a/graphics/macgui/mactext-canvas.cpp
+++ b/graphics/macgui/mactext-canvas.cpp
@@ -470,6 +470,9 @@ const Common::U32String::value_type *MacTextCanvas::splitString(const Common::U3
 			_text[curLine].chunks.push_back(chunk);
 
 			curTextLine = &_text[curLine];
+
+			curTextLine->indent = indentSize;
+			curTextLine->firstLineIndent = firstLineIndent;
 		}
 	}