From 5276d7bab2aae7ffeeed2932d77bd6a531fb65c1 Mon Sep 17 00:00:00 2001
From: Andrew Lanzone <andy@enoznal.com>
Date: Sat, 31 May 2025 16:02:13 -0700
Subject: [PATCH] Several tweaks to the inventory menu

---
 apps/openmw/mwgui/inventorytabsoverlay.cpp | 6 ++++--
 apps/openmw/mwgui/statswindow.cpp          | 2 +-
 apps/openmw/mwgui/windowmanagerimp.cpp     | 8 ++------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwgui/inventorytabsoverlay.cpp b/apps/openmw/mwgui/inventorytabsoverlay.cpp
index 21254c7840..14fd110830 100644
--- a/apps/openmw/mwgui/inventorytabsoverlay.cpp
+++ b/apps/openmw/mwgui/inventorytabsoverlay.cpp
@@ -29,13 +29,15 @@ namespace MWGui
 
     void InventoryTabsOverlay::onTabClicked(MyGUI::Widget* sender)
     {
+        if (!MWBase::Environment::get().getWindowManager()->getJournalAllowed())
+            return;
+
         for (int i = 0; i < mTabs.size(); i++)
         {
             if (mTabs[i] == sender)
             {
-                Log(Debug::Verbose) << "InventoryTabsOverlay::onTabClicked " << i;
                 MWBase::Environment::get().getWindowManager()->setActiveControllerWindow(GM_Inventory, i);
-                //setTab(i);
+                setTab(i);
                 break;
             }
         }
diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp
index e71b35e364..430101f069 100644
--- a/apps/openmw/mwgui/statswindow.cpp
+++ b/apps/openmw/mwgui/statswindow.cpp
@@ -84,7 +84,7 @@ namespace MWGui
         if (Settings::gui().mControllerMenus)
         {
             setPinButtonVisible(false);
-            mControllerButtons.lStick = "#{sInfo}";
+            mControllerButtons.lStick = "#{sMouse}";
             mControllerButtons.rStick = "#{sScrolldown}";
             mControllerButtons.b = "#{sBack}";
         }
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 77224790dd..00a35df774 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -514,6 +514,7 @@ namespace MWGui
         auto inventoryTabsOverlay = std::make_unique<InventoryTabsOverlay>();
         mInventoryTabsOverlay = inventoryTabsOverlay.get();
         mWindows.push_back(std::move(inventoryTabsOverlay));
+        mActiveControllerWindows[GM_Inventory] = 1; // Start on Inventory page
 
         mInputBlocker = MyGUI::Gui::getInstance().createWidget<MyGUI::Widget>(
             {}, 0, 0, w, h, MyGUI::Align::Stretch, "InputBlocker");
@@ -927,12 +928,7 @@ namespace MWGui
 
             for (int i = 0; i < winCount; i++)
             {
-                activeIndex += delta;
-                if (activeIndex < 0)
-                    activeIndex = winCount - 1;
-                else if (activeIndex >= winCount)
-                    activeIndex = 0;
-
+                activeIndex = wrap(activeIndex + delta, winCount);
                 if (mGuiModeStates[mode].mWindows[activeIndex]->isVisible())
                     break;
             }