[Scummvm-git-logs] scummvm master -> 1578cd662b83984a05ee45c3a596143733faae52

[eriktorbjorn]

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:
ac19f6dc54 SCUMM: Limit length of Mac editable text
1578cd662b SCUMM: Make MacButton's drawCorners() private


Commit: ac19f6dc542ad9cc0f35094b12d15129d54cae4e
    https://github.com/scummvm/scummvm/commit/ac19f6dc542ad9cc0f35094b12d15129d54cae4e
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2023-11-19T11:03:44+01:00

Commit Message:
SCUMM: Limit length of Mac editable text

We use it for save game names, so it doesn't need to be more than 31
characters. We can always make this configurable later, if needed.

Changed paths:
    engines/scumm/gfx_mac.cpp
    engines/scumm/gfx_mac.h


diff --git a/engines/scumm/gfx_mac.cpp b/engines/scumm/gfx_mac.cpp
index f5f734397ef..9c4e1a322cf 100644
--- a/engines/scumm/gfx_mac.cpp
+++ b/engines/scumm/gfx_mac.cpp
@@ -885,9 +885,11 @@ bool MacGui::MacEditText::handleKeyDown(Common::Event &event) {
 	if (c >= 32 && c <= 127) {
 		if (_selectLen != 0)
 			deleteSelection();
-		_text.insertChar(event.kbd.ascii, _caretPos);
-		_caretPos++;
-		setRedraw();
+		if (_text.size() < _maxLength) {
+			_text.insertChar(event.kbd.ascii, _caretPos);
+			_caretPos++;
+			setRedraw();
+		}
 		return true;
 	}
 
diff --git a/engines/scumm/gfx_mac.h b/engines/scumm/gfx_mac.h
index 13d10bc267c..e7b0682fc37 100644
--- a/engines/scumm/gfx_mac.h
+++ b/engines/scumm/gfx_mac.h
@@ -266,6 +266,10 @@ public:
 
 	class MacEditText : public MacWidget {
 	private:
+		// Max length of a SCUMM saved game name. We could make this
+		// configurable later, if needed.
+		uint _maxLength = 31;
+
 		int _textPos = 1;
 		int _selectLen = 0;
 		int _caretPos = 0;


Commit: 1578cd662b83984a05ee45c3a596143733faae52
    https://github.com/scummvm/scummvm/commit/1578cd662b83984a05ee45c3a596143733faae52
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2023-11-19T11:04:22+01:00

Commit Message:
SCUMM: Make MacButton's drawCorners() private

I guess this is as close as coderabbitai ever came to giving me a useful
suggestion. Except it thought the CornerLine struct should be removed,
even though it's clearly used...

Changed paths:
    engines/scumm/gfx_mac.h


diff --git a/engines/scumm/gfx_mac.h b/engines/scumm/gfx_mac.h
index e7b0682fc37..eab9a5d9394 100644
--- a/engines/scumm/gfx_mac.h
+++ b/engines/scumm/gfx_mac.h
@@ -209,11 +209,11 @@ public:
 			int length;
 		};
 
+		void drawCorners(Common::Rect r, CornerLine *corner);
 	public:
 		MacButton(MacGui::MacDialogWindow *window, Common::Rect bounds, Common::String text, bool enabled) : MacWidget(window, bounds, text, enabled) {}
 
 		void draw(bool drawFocused = false);
-		void drawCorners(Common::Rect r, CornerLine *corner);
 	};
 
 	class MacCheckbox : public MacWidget {