mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2026-02-07 10:58:27 +00:00
Code Issues Releases Wiki Activity

Show L1 and R1 buttons next to tabs

Browse source
This commit is contained in:
Andrew Lanzone 2025-06-03 21:23:21 -07:00
parent ae676e1d70
commit 2dfe1ef7b1
4 changed files with 64 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/openmw/mwgui/inventorywindow.cpp
View file

@ -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);
}

29
apps/openmw/mwgui/tradewindow.cpp
View file

@ -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);
}

12
files/data/mygui/openmw_inventory_window.layout
View file

@ -30,6 +30,12 @@
<!-- Categories -->
<Widget type="HBox" position="0 6 350 28" align="Left Top HStretch" name="Categories">
<Widget type="ImageBox" skin="ImageBox" position="0 0 24 24" name="BtnL1Image">
<Property key="ImageTexture" value="textures\omw_steam_button_l1.dds"/>
<Property key="Colour" value="#ccb589"/>
<Property key="Alpha" value="0.7"/>
<UserString key="Hidden" value="true"/>
</Widget>
<Widget type="AutoSizedButton" skin="MW_Button" position="0 0 60 24" name="AllButton">
<Property key="Caption" value="#{sAllTab}"/>
<Property key="NeedKey" value="false"/>
@ -50,6 +56,12 @@
<Property key="Caption" value="#{sMiscTab}"/>
<Property key="NeedKey" value="false"/>
</Widget>
<Widget type="ImageBox" skin="ImageBox" position="0 0 24 24" name="BtnR1Image">
<Property key="ImageTexture" value="textures\omw_steam_button_r1.dds"/>
<Property key="Colour" value="#ccb589"/>
<Property key="Alpha" value="0.7"/>
<UserString key="Hidden" value="true"/>
</Widget>
<!-- Search box-->
<Widget type="EditBox" skin="MW_TextBoxEditWithBorder" position="0 0 0 23" name="FilterEdit">
<UserString key="HStretch" value="true"/>

12
files/data/mygui/openmw_trade_window.layout
View file

@ -7,6 +7,12 @@
<!-- Categories -->
<Widget type="HBox" position="8 8 566 24" align="Left Top HStretch" name="Categories">
<Widget type="ImageBox" skin="ImageBox" position="0 0 24 24" name="BtnL1Image">
<Property key="ImageTexture" value="textures\omw_steam_button_l1.dds"/>
<Property key="Colour" value="#ccb589"/>
<Property key="Alpha" value="0.7"/>
<UserString key="Hidden" value="true"/>
</Widget>
<Widget type="AutoSizedButton" skin="MW_Button" name="AllButton">
<Property key="Caption" value="#{sAllTab}"/>
<Property key="NeedKey" value="false"/>
@ -27,6 +33,12 @@
<Property key="Caption" value="#{sMiscTab}"/>
<Property key="NeedKey" value="false"/>
</Widget>
<Widget type="ImageBox" skin="ImageBox" position="0 0 24 24" name="BtnR1Image">
<Property key="ImageTexture" value="textures\omw_steam_button_r1.dds"/>
<Property key="Colour" value="#ccb589"/>
<Property key="Alpha" value="0.7"/>
<UserString key="Hidden" value="true"/>
</Widget>
<!-- Search box-->
<Widget type="EditBox" skin="MW_TextBoxEditWithBorder" position="0 0 0 23" name="FilterEdit">
<UserString key="HStretch" value="true"/>