[Scummvm-git-logs] scummvm master -> 867ec92bde9fe40c20840ffb533c12576b4b3bce

[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:
1b99e013a7 GRAPHICS: MACGUI: Hid debug messages deeper
2180be6b71 GRAPHICS: MACGUI: Restore paragraph mark after reshuffling
867ec92bde GRAPHICS: MACGUI: Removed superfluous warning


Commit: 1b99e013a7f35c7d4f8382a19c3450d867648514
    https://github.com/scummvm/scummvm/commit/1b99e013a7f35c7d4f8382a19c3450d867648514
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-10-27T01:11:59+02:00

Commit Message:
GRAPHICS: MACGUI: Hid debug messages deeper

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


diff --git a/graphics/macgui/mactext-canvas.cpp b/graphics/macgui/mactext-canvas.cpp
index 3bda2a4f019..5e217d4a608 100644
--- a/graphics/macgui/mactext-canvas.cpp
+++ b/graphics/macgui/mactext-canvas.cpp
@@ -1145,8 +1145,8 @@ void MacFontRun::debugPrint() {
 void MacTextCanvas::debugPrint(const char *prefix) {
 	for (uint i = 0; i < _text.size(); i++) {
 		if (prefix)
-			debugN("%s: ", prefix);
-		debugN("%2d, %c fi: %d, i: %d ", i, _text[i].paragraphEnd ? '$' : '.', _text[i].firstLineIndent, _text[i].indent);
+			debugN(8, "%s: ", prefix);
+		debugN(8, "%2d, %c fi: %d, i: %d ", i, _text[i].paragraphEnd ? '$' : '.', _text[i].firstLineIndent, _text[i].indent);
 
 		for (uint j = 0; j < _text[i].chunks.size(); j++)
 			_text[i].chunks[j].debugPrint();
@@ -1155,8 +1155,8 @@ void MacTextCanvas::debugPrint(const char *prefix) {
 	}
 
 	if (prefix)
-		debugN("%s: ", prefix);
-	debug("[done]");
+		debugN(8, "%s: ", prefix);
+	debug(8, "[done]");
 }
 
 } // End of namespace Graphics


Commit: 2180be6b71d7aded430d620583d05c9fdb1ddc71
    https://github.com/scummvm/scummvm/commit/2180be6b71d7aded430d620583d05c9fdb1ddc71
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-10-27T01:14:25+02:00

Commit Message:
GRAPHICS: MACGUI: Restore paragraph mark after reshuffling

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


diff --git a/graphics/macgui/mactext-canvas.cpp b/graphics/macgui/mactext-canvas.cpp
index 5e217d4a608..f75b008bfa1 100644
--- a/graphics/macgui/mactext-canvas.cpp
+++ b/graphics/macgui/mactext-canvas.cpp
@@ -908,6 +908,8 @@ void MacTextCanvas::reshuffleParagraph(int *row, int *col, MacFontRun &defaultFo
 
 	ppos += *col;
 
+	bool paragraphEnd = _text[end].paragraphEnd;
+
 #if DEBUG
 	D(9, "MacTextCanvas::reshuffleParagraph: ppos: %d", ppos);
 	debugPrint("MacTextCanvas::reshuffleParagraph(1)");
@@ -970,6 +972,9 @@ void MacTextCanvas::reshuffleParagraph(int *row, int *col, MacFontRun &defaultFo
 	debugPrint("MacTextCanvas::reshuffleParagraph(3)");
 #endif
 
+	// Restore the paragraph marker
+	_text[curLine].paragraphEnd = paragraphEnd;
+
 	// Find new pos within paragraph after reshuffling
 	*row = start;
 


Commit: 867ec92bde9fe40c20840ffb533c12576b4b3bce
    https://github.com/scummvm/scummvm/commit/867ec92bde9fe40c20840ffb533c12576b4b3bce
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-10-27T01:14:52+02:00

Commit Message:
GRAPHICS: MACGUI: Removed superfluous warning

Changed paths:
    graphics/macgui/mactext.cpp


diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index b04a1ab15db..1999e106fe4 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -318,7 +318,6 @@ void MacText::setMaxWidth(int maxWidth) {
 
 	// restore the cursor pos
 	_cursorRow = 0;
-	warning("FIXME, bad design");
 	while (ppos > _canvas.getLineCharWidth(_cursorRow, true)) {
 		ppos -= _canvas.getLineCharWidth(_cursorRow, true);
 		_cursorRow++;
@@ -1721,7 +1720,6 @@ void MacText::insertTextFromClipboard() {
 		_cursorRow = start;
 	}
 
-	warning("FIXME, bad design");
 	while (ppos > _canvas.getLineCharWidth(_cursorRow, true)) {
 		ppos -= _canvas.getLineCharWidth(_cursorRow, true);
 		_cursorRow++;