AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-18 08:56:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Several tweaks to the inventory menu

Browse Source
This commit is contained in:
Andrew Lanzone 2025-05-31 16:02:13 -07:00
parent 6185683ca3
commit 5276d7bab2
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/openmw/mwgui/inventorytabsoverlay.cpp
View File

@ -29,13 +29,15 @@ namespace MWGui
void InventoryTabsOverlay::onTabClicked(MyGUI::Widget* sender) void InventoryTabsOverlay::onTabClicked(MyGUI::Widget* sender)
{ {
if (!MWBase::Environment::get().getWindowManager()->getJournalAllowed())
return;
for (int i = 0; i < mTabs.size(); i++) for (int i = 0; i < mTabs.size(); i++)
{ {
if (mTabs[i] == sender) if (mTabs[i] == sender)
{ {
Log(Debug::Verbose) << "InventoryTabsOverlay::onTabClicked " << i;
MWBase::Environment::get().getWindowManager()->setActiveControllerWindow(GM_Inventory, i); MWBase::Environment::get().getWindowManager()->setActiveControllerWindow(GM_Inventory, i);
//setTab(i); setTab(i);
break; break;
} }
} }

2
apps/openmw/mwgui/statswindow.cpp
View File

@ -84,7 +84,7 @@ namespace MWGui
if (Settings::gui().mControllerMenus) if (Settings::gui().mControllerMenus)
{ {
setPinButtonVisible(false); setPinButtonVisible(false);
mControllerButtons.lStick = "#{sInfo}"; mControllerButtons.lStick = "#{sMouse}";
mControllerButtons.rStick = "#{sScrolldown}"; mControllerButtons.rStick = "#{sScrolldown}";
mControllerButtons.b = "#{sBack}"; mControllerButtons.b = "#{sBack}";
} }

8
apps/openmw/mwgui/windowmanagerimp.cpp
View File

@ -514,6 +514,7 @@ namespace MWGui
auto inventoryTabsOverlay = std::make_unique<InventoryTabsOverlay>(); auto inventoryTabsOverlay = std::make_unique<InventoryTabsOverlay>();
mInventoryTabsOverlay = inventoryTabsOverlay.get(); mInventoryTabsOverlay = inventoryTabsOverlay.get();
mWindows.push_back(std::move(inventoryTabsOverlay)); mWindows.push_back(std::move(inventoryTabsOverlay));
mActiveControllerWindows[GM_Inventory] = 1; // Start on Inventory page
mInputBlocker = MyGUI::Gui::getInstance().createWidget<MyGUI::Widget>( mInputBlocker = MyGUI::Gui::getInstance().createWidget<MyGUI::Widget>(
{}, 0, 0, w, h, MyGUI::Align::Stretch, "InputBlocker"); {}, 0, 0, w, h, MyGUI::Align::Stretch, "InputBlocker");
@ -927,12 +928,7 @@ namespace MWGui
for (int i = 0; i < winCount; i++) for (int i = 0; i < winCount; i++)
{ {
activeIndex += delta; activeIndex = wrap(activeIndex + delta, winCount);
if (activeIndex < 0)
activeIndex = winCount - 1;
else if (activeIndex >= winCount)
activeIndex = 0;
if (mGuiModeStates[mode].mWindows[activeIndex]->isVisible()) if (mGuiModeStates[mode].mWindows[activeIndex]->isVisible())
break; break;
} }