[Scummvm-git-logs] scummvm master -> 58c5c29f88befd892956629ac32a53b72532b5ee

[lephilousophe]

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:
b47e8c6291 Revert "GUI: Amiga compilation fix"
58c5c29f88 Revert "GUI: Fix int/int32 build failures"


Commit: b47e8c6291ae81e1ade27a0a26e8d04df0b57461
    https://github.com/scummvm/scummvm/commit/b47e8c6291ae81e1ade27a0a26e8d04df0b57461
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-07-07T19:10:04+02:00

Commit Message:
Revert "GUI: Amiga compilation fix"

This reverts commit 07ff61ea8d8f4ad11aa9ae519918f159884d9b81.

Changed paths:
    gui/ThemeEngine.cpp


diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index e6142f5c69..8ec8ac4b26 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -1352,7 +1352,7 @@ void ThemeEngine::drawTab(const Common::Rect &r, int tabHeight, const Common::Ar
 	if (activePos >= 0) {
 		Common::Rect tabRect(r.left + activePos, r.top, r.left + activePos + tabWidths[active], r.top + tabHeight);
 		const uint16 tabLeft = activePos;
-		const uint16 tabRight = MAX(r.right - tabRect.right, (int32)0);
+		const uint16 tabRight = MAX(r.right - tabRect.right, 0);
 		drawDD(kDDTabActive, tabRect, (tabLeft << 16) | (tabRight & 0xFFFF));
 		drawDDText(getTextData(kDDTabActive), getTextColor(kDDTabActive), tabRect, tabs[active], false, false,
 		           convertTextAlignH(_widgets[kDDTabActive]->_textAlignH, rtl), _widgets[kDDTabActive]->_textAlignV);


Commit: 58c5c29f88befd892956629ac32a53b72532b5ee
    https://github.com/scummvm/scummvm/commit/58c5c29f88befd892956629ac32a53b72532b5ee
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-07-07T19:10:32+02:00

Commit Message:
Revert "GUI: Fix int/int32 build failures"

This reverts commit c2bd0cfb90ab7a852d27515bd59b48969c12d9d1.

Changed paths:
    gui/widgets/editable.cpp


diff --git a/gui/widgets/editable.cpp b/gui/widgets/editable.cpp
index e002afb091..ea85a08a3d 100644
--- a/gui/widgets/editable.cpp
+++ b/gui/widgets/editable.cpp
@@ -315,7 +315,7 @@ void EditableWidget::drawCaret(bool erase) {
 
 	if (erase) {
 		GUI::EditableWidget::String character;
-		int32 width;
+		int width;
 
 		if ((uint)_caretPos < _editString.size()) {
 			const byte chr = _editString[_caretPos];