[Scummvm-git-logs] scummvm master -> a569dc18ede21c3a3aa58bf13ecd594cc6174636

[dreammaster]

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

Summary:
a569dc18ed M4: RIDDLE: Don't show inventory scrollbars by default


Commit: a569dc18ede21c3a3aa58bf13ecd594cc6174636
    https://github.com/scummvm/scummvm/commit/a569dc18ede21c3a3aa58bf13ecd594cc6174636
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-10-06T17:29:11-07:00

Commit Message:
M4: RIDDLE: Don't show inventory scrollbars by default

Changed paths:
    engines/m4/riddle/gui/interface.cpp
    engines/m4/riddle/gui/inventory.cpp


diff --git a/engines/m4/riddle/gui/interface.cpp b/engines/m4/riddle/gui/interface.cpp
index c3f8c5afe4a..04d6ca2be56 100644
--- a/engines/m4/riddle/gui/interface.cpp
+++ b/engines/m4/riddle/gui/interface.cpp
@@ -85,7 +85,6 @@ void Interface::setup() {
 	_interfaceBox = new InterfaceBox(RectClass(10, 10, SCREEN_WIDTH - 11, 101));
 	_inventory = new GUI::Inventory(RectClass(207, 2, 557, 74),
 		_sprite, 4, 2, 35, 35, 3);
-	_inventory->addToInterfaceBox(_interfaceBox);
 	_textField = new TextField(13, 2, 189, 20);
 
 	_btnTake = new ButtonClass(RectClass(2, 10, 40, 50), "take", 4,3, 5, 4, INTERFACE_SPRITES);
@@ -99,6 +98,8 @@ void Interface::setup() {
 	_btnBinky = new ButtonClass(RectClass(582, 10, 629, 50), "binky", 8, 11, 13, 12, INTERFACE_SPRITES);
 	_interfaceBox->add(_btnBackpack);
 	_interfaceBox->add(_btnBinky);
+
+	_inventory->addToInterfaceBox(_interfaceBox);
 }
 
 void Interface::cancel_sentence() {
diff --git a/engines/m4/riddle/gui/inventory.cpp b/engines/m4/riddle/gui/inventory.cpp
index 8ee30434fc2..f1aedc11f98 100644
--- a/engines/m4/riddle/gui/inventory.cpp
+++ b/engines/m4/riddle/gui/inventory.cpp
@@ -61,7 +61,9 @@ Inventory::Inventory(const RectClass &r, int32 sprite, int16 cells_h, int16 cell
 	_right_arrow_visible = false;
 
 	_btnScrollLeft = new ButtonClass(RectClass(178, -8, 198, 101), "scroll left", 9, 129, 130, 131, INTERFACE_SPRITES);
-	_btnScrollRight = new ButtonClass(RectClass(551, -8, 571, 10), "scroll right", 9, 133, 134, 135, INTERFACE_SPRITES);
+	_btnScrollRight = new ButtonClass(RectClass(551, -8, 571, 101), "scroll right", 9, 133, 134, 135, INTERFACE_SPRITES);
+	refresh_left_arrow();
+	refresh_right_arrow();
 }
 
 Inventory::~Inventory() {