[Scummvm-git-logs] scummvm master -> 6be05cf929fcb89b13ed53b07ac18016bd86bded

[aquadran]

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

Summary:
6be05cf929 WINTERMUTE: Sync with original on ad_response_box


Commit: 6be05cf929fcb89b13ed53b07ac18016bd86bded
    https://github.com/scummvm/scummvm/commit/6be05cf929fcb89b13ed53b07ac18016bd86bded
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-07-23T06:41:59+02:00

Commit Message:
WINTERMUTE: Sync with original on ad_response_box

Changed paths:
    engines/wintermute/ad/ad_response_box.cpp


diff --git a/engines/wintermute/ad/ad_response_box.cpp b/engines/wintermute/ad/ad_response_box.cpp
index 0e52e9f49d2..b1de0f094f4 100644
--- a/engines/wintermute/ad/ad_response_box.cpp
+++ b/engines/wintermute/ad/ad_response_box.cpp
@@ -122,11 +122,11 @@ void AdResponseBox::clearButtons() {
 bool AdResponseBox::invalidateButtons() {
 	for (uint32 i = 0; i < _respButtons.getSize(); i++) {
 		_respButtons[i]->setImage(nullptr);
-		_respButtons[i]->setFont(nullptr);
-		_respButtons[i]->setText("");
 		_respButtons[i]->_cursor = nullptr;
+		_respButtons[i]->setFont(nullptr);
 		_respButtons[i]->setFontHover(nullptr);
 		_respButtons[i]->setFontPress(nullptr);
+		_respButtons[i]->setText("");
 	}
 	return STATUS_OK;
 }
@@ -173,11 +173,6 @@ bool AdResponseBox::createButtons() {
 				btn->setFontPress(btn->getFontHover());
 				btn->setTextAlign(_align);
 
-				if (_gameRef->_touchInterface) {
-					btn->setFontHover(btn->getFont());
-				}
-
-
 				if (_responses[i]->getFont()) {
 					btn->setFont(_responses[i]->getFont());
 				}
@@ -204,12 +199,6 @@ bool AdResponseBox::createButtons() {
 
 			btn->setName("response");
 			btn->correctSize();
-
-			// make the responses touchable
-			if (_gameRef->_touchInterface) {
-				btn->setHeight(MAX<int32>(btn->getHeight(), 50));
-			}
-
 			//btn->SetListener(this, btn, _responses[i]->_iD);
 			btn->setListener(this, btn, i);
 			btn->setVisible(false);
@@ -483,7 +472,7 @@ bool AdResponseBox::display() {
 
 	// shift down if needed
 	if (!_horizontal) {
-		int totalHeight = 0;
+		int32 totalHeight = 0;
 		for (i = 0; i < (int32) _respButtons.getSize(); i++) {
 			totalHeight += (_respButtons[i]->getHeight() + _spacing);
 		}
@@ -511,7 +500,7 @@ bool AdResponseBox::display() {
 
 	// prepare response buttons
 	bool scrollNeeded = false;
-	for (i = _scrollOffset; i < (int32) _respButtons.getSize(); i++) {
+	for (i = _scrollOffset; i < (int32)_respButtons.getSize(); i++) {
 
 #ifdef ENABLE_FOXTAIL
 		// FoxTail's "HORIZONTAL=TRUE" display boxes are actual 2x3 display boxes
@@ -569,7 +558,7 @@ bool AdResponseBox::display() {
 
 
 	// display response buttons
-	for (i = _scrollOffset; i < (int32) _respButtons.getSize(); i++) {
+	for (i = _scrollOffset; i < (int32)_respButtons.getSize(); i++) {
 		_respButtons[i]->display();
 	}