[Scummvm-git-logs] scummvm master -> 66d1f6d56a4824cf1698076fe3fcaa0edebd7fad

[sluicebox]

This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
19165baa6b AGI: Fix view decoding regression
02cd64b9c7 SCI: Remove unused SavegameDesc::virtualId
d4c41f6214 GUI: Fix ListWidget drawing caret on disabled items
66d1f6d56a GUI: Make EditableWidget::caretVisualPos const


Commit: 19165baa6baae94c911daf741112893b003e956f
    https://github.com/scummvm/scummvm/commit/19165baa6baae94c911daf741112893b003e956f
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-05-13T09:04:07-07:00

Commit Message:
AGI: Fix view decoding regression

Another of my blunders from f4201eeda8c289db99ef80b3f0a3f71fec6402d7

Thanks to m-kiewitz for spotting this

Changed paths:
    engines/agi/view.cpp


diff --git a/engines/agi/view.cpp b/engines/agi/view.cpp
index a3b6a7ebac9..40f9100888b 100644
--- a/engines/agi/view.cpp
+++ b/engines/agi/view.cpp
@@ -165,7 +165,7 @@ int AgiEngine::decodeView(byte *resourceData, uint16 resourceSize, int16 viewNr)
 		//  relativeCelOffset[0]:WORD
 		//  relativeCelOffset[1]:WORD
 		//  etc.
-		int16 loopHeaderCelCount = resourceData[loopOffset];
+		byte loopHeaderCelCount = resourceData[loopOffset];
 
 		loopData->celCount = loopHeaderCelCount;
 		loopData->cel = nullptr;
@@ -192,8 +192,8 @@ int AgiEngine::decodeView(byte *resourceData, uint16 resourceSize, int16 viewNr)
 				//  height:BYTE
 				//  Transparency + Mirroring:BYTE
 				//  celData follows
-				int16 celHeaderWidth = resourceData[celOffset + 0];
-				int16 celHeaderHeight = resourceData[celOffset + 1];
+				byte celHeaderWidth = resourceData[celOffset + 0];
+				byte celHeaderHeight = resourceData[celOffset + 1];
 				byte celHeaderTransparencyMirror = resourceData[celOffset + 2];
 
 				byte celHeaderClearKey;


Commit: 02cd64b9c728df1672d2d5d53e19f232c2025295
    https://github.com/scummvm/scummvm/commit/02cd64b9c728df1672d2d5d53e19f232c2025295
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-05-13T09:04:07-07:00

Commit Message:
SCI: Remove unused SavegameDesc::virtualId

Changed paths:
    engines/sci/engine/file.h


diff --git a/engines/sci/engine/file.h b/engines/sci/engine/file.h
index 2ed73962a52..bab606e77db 100644
--- a/engines/sci/engine/file.h
+++ b/engines/sci/engine/file.h
@@ -61,7 +61,6 @@ enum {
 
 struct SavegameDesc {
 	int16 id;
-	int virtualId; // straight numbered, according to id but w/o gaps
 	int date;
 	int time;
 	int version;


Commit: d4c41f6214428506d879bdf0d1f811ad5bacad53
    https://github.com/scummvm/scummvm/commit/d4c41f6214428506d879bdf0d1f811ad5bacad53
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-05-13T09:04:07-07:00

Commit Message:
GUI: Fix ListWidget drawing caret on disabled items

When in edit mode on the save dialog, clicking on a disabled item, such
as the Autosave slot 0, would draw the stale caret on the disabled item
at the x position of the previous item.

Changed paths:
    gui/widgets/list.cpp


diff --git a/gui/widgets/list.cpp b/gui/widgets/list.cpp
index 0bbec31b6a7..f739ba1f39c 100644
--- a/gui/widgets/list.cpp
+++ b/gui/widgets/list.cpp
@@ -611,7 +611,9 @@ void ListWidget::drawWidget() {
 		}
 	}
 
-	EditableWidget::drawWidget();
+	if (_editMode) {
+		EditableWidget::drawWidget();
+	}
 }
 
 Common::Rect ListWidget::getEditRect() const {
@@ -704,8 +706,6 @@ void ListWidget::abortEditMode() {
 	// undo any changes made
 	assert(_selectedItem >= 0);
 	_editMode = false;
-	//drawCaret(true);
-	//markAsDirty();
 	g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
 }
 


Commit: 66d1f6d56a4824cf1698076fe3fcaa0edebd7fad
    https://github.com/scummvm/scummvm/commit/66d1f6d56a4824cf1698076fe3fcaa0edebd7fad
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-05-13T09:04:07-07:00

Commit Message:
GUI: Make EditableWidget::caretVisualPos const

Changed paths:
    gui/widgets/editable.cpp
    gui/widgets/editable.h


diff --git a/gui/widgets/editable.cpp b/gui/widgets/editable.cpp
index 0a0251861f3..da8149f78f1 100644
--- a/gui/widgets/editable.cpp
+++ b/gui/widgets/editable.cpp
@@ -107,7 +107,7 @@ bool EditableWidget::tryInsertChar(Common::u32char_type_t c, int pos) {
 	return true;
 }
 
-int EditableWidget::caretVisualPos(int logicalPos) {
+int EditableWidget::caretVisualPos(int logicalPos) const {
 	return Common::convertBiDiU32String(_editString + " ").getVisualPosition(logicalPos);
 }
 
diff --git a/gui/widgets/editable.h b/gui/widgets/editable.h
index 0375f5d9b6e..15f30ef6d4c 100644
--- a/gui/widgets/editable.h
+++ b/gui/widgets/editable.h
@@ -115,7 +115,7 @@ protected:
 	virtual bool isCharAllowed(Common::u32char_type_t c) const;
 	bool tryInsertChar(Common::u32char_type_t c, int pos);
 
-	int caretVisualPos(int logicalPos);
+	int caretVisualPos(int logicalPos) const;
 	int caretLogicalPos() const;
 
 	void clearSelection();