diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp index d9061ebc9e..c68fd0fbc7 100644 --- a/apps/openmw/mwgui/inventorywindow.cpp +++ b/apps/openmw/mwgui/inventorywindow.cpp @@ -132,6 +132,14 @@ namespace MWGui if (Settings::gui().mControllerMenus) { + // Show L1 and R1 buttons next to tabs + MyGUI::Widget* image; + getWidget(image, "BtnL1Image"); + image->setUserString("Hidden", "false"); + + getWidget(image, "BtnR1Image"); + image->setUserString("Hidden", "false"); + mControllerButtons.r3 = "#{sInfo}"; } @@ -1036,6 +1044,14 @@ namespace MWGui updatePreviewSize(); } + // Show L1 and R1 buttons next to tabs + MyGUI::Widget* image; + getWidget(image, "BtnL1Image"); + image->setVisible(active); + + getWidget(image, "BtnR1Image"); + image->setVisible(active); + mItemView->setActiveControllerWindow(active); WindowBase::setActiveControllerWindow(active); } diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp index 379c18f59d..ca0924396e 100644 --- a/apps/openmw/mwgui/tradewindow.cpp +++ b/apps/openmw/mwgui/tradewindow.cpp @@ -169,11 +169,22 @@ namespace MWGui setCoord(400, 0, 400, 300); - mControllerButtons.a = "#{sBuy}"; - mControllerButtons.b = "#{sCancel}"; - mControllerButtons.x = "#{sOffer}"; - mControllerButtons.r3 = "#{sInfo}"; - mControllerButtons.l2 = "#{sInventory}"; + if (Settings::gui().mControllerMenus) + { + // Show L1 and R1 buttons next to tabs + MyGUI::Widget* image; + getWidget(image, "BtnL1Image"); + image->setUserString("Hidden", "false"); + + getWidget(image, "BtnR1Image"); + image->setUserString("Hidden", "false"); + + mControllerButtons.a = "#{sBuy}"; + mControllerButtons.b = "#{sCancel}"; + mControllerButtons.x = "#{sOffer}"; + mControllerButtons.r3 = "#{sInfo}"; + mControllerButtons.l2 = "#{sInventory}"; + } } void TradeWindow::setPtr(const MWWorld::Ptr& actor) @@ -734,6 +745,14 @@ namespace MWGui void TradeWindow::setActiveControllerWindow(bool active) { + // Show L1 and R1 buttons next to tabs + MyGUI::Widget* image; + getWidget(image, "BtnL1Image"); + image->setVisible(active); + + getWidget(image, "BtnR1Image"); + image->setVisible(active); + mItemView->setActiveControllerWindow(active); WindowBase::setActiveControllerWindow(active); } diff --git a/files/data/mygui/openmw_inventory_window.layout b/files/data/mygui/openmw_inventory_window.layout index a555c94031..c8b3a6857b 100644 --- a/files/data/mygui/openmw_inventory_window.layout +++ b/files/data/mygui/openmw_inventory_window.layout @@ -30,6 +30,12 @@ + + + + + + @@ -50,6 +56,12 @@ + + + + + + diff --git a/files/data/mygui/openmw_trade_window.layout b/files/data/mygui/openmw_trade_window.layout index 49ccf25ba2..c514155981 100644 --- a/files/data/mygui/openmw_trade_window.layout +++ b/files/data/mygui/openmw_trade_window.layout @@ -7,6 +7,12 @@ + + + + + + @@ -27,6 +33,12 @@ + + + + + +