mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-08 23:04:30 +00:00
Code Issues Releases Wiki Activity

Rename ControllerButtonStr struct and its internal fields

Browse source
This commit is contained in:
Andrew Lanzone 2025-07-27 13:14:31 -07:00
parent 9870605aab
commit dc2ff4bfa2
44 changed files with 211 additions and 211 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/mwgui/alchemywindow.cpp
View file

@ -94,11 +94,11 @@ namespace MWGui
if (Settings::gui().mControllerMenus) if (Settings::gui().mControllerMenus)
{ {
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
mControllerButtons.x = "#{sCreate}"; mControllerButtons.mX = "#{sCreate}";
mControllerButtons.y = "#{sMagicEffects}"; mControllerButtons.mY = "#{sMagicEffects}";
mControllerButtons.r3 = "#{sInfo}"; mControllerButtons.mR3 = "#{sInfo}";
} }
center(); center();

10
apps/openmw/mwgui/birth.cpp
View file

@ -60,9 +60,9 @@ namespace MWGui
if (Settings::gui().mControllerMenus) if (Settings::gui().mControllerMenus)
{ {
mControllerButtons.lStick = "#{sMouse}"; mControllerButtons.mLStick = "#{sMouse}";
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
mControllerButtons.b = "#{sBack}"; mControllerButtons.mB = "#{sBack}";
} }
updateBirths(); updateBirths();
@ -78,13 +78,13 @@ namespace MWGui
{ {
okButton->setCaption( okButton->setCaption(
MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {}))); MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
mControllerButtons.x = "#{sNext}"; mControllerButtons.mX = "#{sNext}";
} }
else if (Settings::gui().mControllerMenus) else if (Settings::gui().mControllerMenus)
{ {
okButton->setCaption( okButton->setCaption(
MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sDone", {}))); MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sDone", {})));
mControllerButtons.x = "#{sDone}"; mControllerButtons.mX = "#{sDone}";
} }
else else
okButton->setCaption( okButton->setCaption(

10
apps/openmw/mwgui/bookwindow.cpp
View file

@ -66,9 +66,9 @@ namespace MWGui
MyGUI::IntCoord(0, 0, (64 - 7) * scale, mNextPageButton->getSize().height * scale)); MyGUI::IntCoord(0, 0, (64 - 7) * scale, mNextPageButton->getSize().height * scale));
} }
mControllerButtons.l1 = "#{sPrev}"; mControllerButtons.mL1 = "#{sPrev}";
mControllerButtons.r1 = "#{sNext}"; mControllerButtons.mR1 = "#{sNext}";
mControllerButtons.b = "#{Interface:Close}"; mControllerButtons.mB = "#{Interface:Close}";
center(); center();
} }
@ -222,9 +222,9 @@ namespace MWGui
} }
} }
ControllerButtonStr* BookWindow::getControllerButtons() ControllerButtons* BookWindow::getControllerButtons()
{ {
mControllerButtons.a = mTakeButton->getVisible() ? "#{sTake}" : ""; mControllerButtons.mA = mTakeButton->getVisible() ? "#{sTake}" : "";
return &mControllerButtons; return &mControllerButtons;
} }

2
apps/openmw/mwgui/bookwindow.hpp
View file

@ -21,7 +21,7 @@ namespace MWGui
bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override; bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
std::string_view getWindowIdForLua() const override { return "Book"; } std::string_view getWindowIdForLua() const override { return "Book"; }
ControllerButtonStr* getControllerButtons() override; ControllerButtons* getControllerButtons() override;
protected: protected:
void onNextPageButtonClicked(MyGUI::Widget* sender); void onNextPageButtonClicked(MyGUI::Widget* sender);

40
apps/openmw/mwgui/class.cpp
View file

@ -59,8 +59,8 @@ namespace MWGui
{ {
mOkButton->setStateSelected(true); mOkButton->setStateSelected(true);
mDisableGamepadCursor = true; mDisableGamepadCursor = true;
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
mControllerButtons.b = "#{sBack}"; mControllerButtons.mB = "#{sBack}";
} }
center(); center();
@ -149,9 +149,9 @@ namespace MWGui
if (Settings::gui().mControllerMenus) if (Settings::gui().mControllerMenus)
{ {
mControllerButtons.lStick = "#{sMouse}"; mControllerButtons.mLStick = "#{sMouse}";
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
mControllerButtons.b = "#{sBack}"; mControllerButtons.mB = "#{sBack}";
} }
updateClasses(); updateClasses();
@ -167,13 +167,13 @@ namespace MWGui
{ {
okButton->setCaption( okButton->setCaption(
MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {}))); MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
mControllerButtons.x = "#{sNext}"; mControllerButtons.mX = "#{sNext}";
} }
else if (Settings::gui().mControllerMenus) else if (Settings::gui().mControllerMenus)
{ {
okButton->setCaption( okButton->setCaption(
MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sDone", {}))); MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sDone", {})));
mControllerButtons.x = "#{sDone}"; mControllerButtons.mX = "#{sDone}";
} }
else else
okButton->setCaption( okButton->setCaption(
@ -393,7 +393,7 @@ namespace MWGui
center(); center();
mDisableGamepadCursor = Settings::gui().mControllerMenus; mDisableGamepadCursor = Settings::gui().mControllerMenus;
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
} }
void InfoBoxDialog::setText(const std::string& str) void InfoBoxDialog::setText(const std::string& str)
@ -586,9 +586,9 @@ namespace MWGui
if (Settings::gui().mControllerMenus) if (Settings::gui().mControllerMenus)
{ {
okButton->setStateSelected(true); okButton->setStateSelected(true);
mControllerButtons.lStick = "#{sMouse}"; mControllerButtons.mLStick = "#{sMouse}";
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
mControllerButtons.b = "#{sBack}"; mControllerButtons.mB = "#{sBack}";
} }
// Set default skills, attributes // Set default skills, attributes
@ -680,13 +680,13 @@ namespace MWGui
{ {
okButton->setCaption( okButton->setCaption(
MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {}))); MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
mControllerButtons.x = "#{sNext}"; mControllerButtons.mX = "#{sNext}";
} }
else if (Settings::gui().mControllerMenus) else if (Settings::gui().mControllerMenus)
{ {
okButton->setCaption( okButton->setCaption(
MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sDone", {}))); MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sDone", {})));
mControllerButtons.x = "#{sDone}"; mControllerButtons.mX = "#{sDone}";
} }
else else
okButton->setCaption( okButton->setCaption(
@ -884,8 +884,8 @@ namespace MWGui
getWidget(cancelButton, "CancelButton"); getWidget(cancelButton, "CancelButton");
cancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SelectSpecializationDialog::onCancelClicked); cancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SelectSpecializationDialog::onCancelClicked);
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
} }
SelectSpecializationDialog::~SelectSpecializationDialog() {} SelectSpecializationDialog::~SelectSpecializationDialog() {}
@ -966,8 +966,8 @@ namespace MWGui
if (mAttributeButtons.size() > 0) if (mAttributeButtons.size() > 0)
mAttributeButtons[0]->setStateSelected(true); mAttributeButtons[0]->setStateSelected(true);
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
} }
} }
@ -1066,8 +1066,8 @@ namespace MWGui
if (mSkillButtons.size() > 0) if (mSkillButtons.size() > 0)
mSkillButtons[0]->setStateSelected(true); mSkillButtons[0]->setStateSelected(true);
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
} }
} }
@ -1156,7 +1156,7 @@ namespace MWGui
// Make sure the edit box has focus // Make sure the edit box has focus
MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mTextEdit); MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mTextEdit);
mControllerButtons.a = "#{Interface:OK}"; mControllerButtons.mA = "#{Interface:OK}";
} }
DescriptionDialog::~DescriptionDialog() {} DescriptionDialog::~DescriptionDialog() {}

8
apps/openmw/mwgui/companionwindow.cpp
View file

@ -64,10 +64,10 @@ namespace MWGui
setCoord(200, 0, 600, 300); setCoord(200, 0, 600, 300);
mControllerButtons.a = "#{sTake}"; mControllerButtons.mA = "#{sTake}";
mControllerButtons.b = "#{Interface:Close}"; mControllerButtons.mB = "#{Interface:Close}";
mControllerButtons.r3 = "#{sInfo}"; mControllerButtons.mR3 = "#{sInfo}";
mControllerButtons.l2 = "#{sInventory}"; mControllerButtons.mL2 = "#{sInventory}";
} }
void CompanionWindow::onItemSelected(int index) void CompanionWindow::onItemSelected(int index)

4
apps/openmw/mwgui/confirmationdialog.cpp
View file

@ -23,8 +23,8 @@ namespace MWGui
if (Settings::gui().mControllerMenus) if (Settings::gui().mControllerMenus)
{ {
mDisableGamepadCursor = true; mDisableGamepadCursor = true;
mControllerButtons.a = "#{Interface:OK}"; mControllerButtons.mA = "#{Interface:OK}";
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
} }
} }

14
apps/openmw/mwgui/container.cpp
View file

@ -59,11 +59,11 @@ namespace MWGui
setCoord(200, 0, 600, 300); setCoord(200, 0, 600, 300);
mControllerButtons.a = "#{sTake}"; mControllerButtons.mA = "#{sTake}";
mControllerButtons.b = "#{Interface:Close}"; mControllerButtons.mB = "#{Interface:Close}";
mControllerButtons.x = "#{sTakeAll}"; mControllerButtons.mX = "#{sTakeAll}";
mControllerButtons.r3 = "#{sInfo}"; mControllerButtons.mR3 = "#{sInfo}";
mControllerButtons.l2 = "#{sInventory}"; mControllerButtons.mL2 = "#{sInventory}";
} }
void ContainerWindow::onItemSelected(int index) void ContainerWindow::onItemSelected(int index)
@ -353,9 +353,9 @@ namespace MWGui
MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Container); MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Container);
} }
ControllerButtonStr* ContainerWindow::getControllerButtons() ControllerButtons* ContainerWindow::getControllerButtons()
{ {
mControllerButtons.r1 = mDisposeCorpseButton->getVisible() ? "#{sDisposeofCorpse}" : ""; mControllerButtons.mR1 = mDisposeCorpseButton->getVisible() ? "#{sDisposeofCorpse}" : "";
return &mControllerButtons; return &mControllerButtons;
} }

2
apps/openmw/mwgui/container.hpp
View file

@ -48,7 +48,7 @@ namespace MWGui
std::string_view getWindowIdForLua() const override { return "Container"; } std::string_view getWindowIdForLua() const override { return "Container"; }
ControllerButtonStr* getControllerButtons() override; ControllerButtons* getControllerButtons() override;
bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override; bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
void setActiveControllerWindow(bool active) override; void setActiveControllerWindow(bool active) override;

32
apps/openmw/mwgui/controllerbuttonsoverlay.cpp
View file

@ -46,24 +46,24 @@ namespace MWGui
return window->getHeight(); return window->getHeight();
} }
void ControllerButtonsOverlay::setButtons(ControllerButtonStr* buttons) void ControllerButtonsOverlay::setButtons(ControllerButtons* buttons)
{ {
int buttonCount = 0; int buttonCount = 0;
buttonCount += updateButton(Button::Button_A, buttons->a); buttonCount += updateButton(Button::Button_A, buttons->mA);
buttonCount += updateButton(Button::Button_B, buttons->b); buttonCount += updateButton(Button::Button_B, buttons->mB);
buttonCount += updateButton(Button::Button_Dpad, buttons->dpad); buttonCount += updateButton(Button::Button_Dpad, buttons->mDpad);
buttonCount += updateButton(Button::Button_L1, buttons->l1); buttonCount += updateButton(Button::Button_L1, buttons->mL1);
buttonCount += updateButton(Button::Button_L2, buttons->l2); buttonCount += updateButton(Button::Button_L2, buttons->mL2);
buttonCount += updateButton(Button::Button_L3, buttons->l3); buttonCount += updateButton(Button::Button_L3, buttons->mL3);
buttonCount += updateButton(Button::Button_LStick, buttons->lStick); buttonCount += updateButton(Button::Button_LStick, buttons->mLStick);
buttonCount += updateButton(Button::Button_Menu, buttons->menu); buttonCount += updateButton(Button::Button_Menu, buttons->mMenu);
buttonCount += updateButton(Button::Button_R1, buttons->r1); buttonCount += updateButton(Button::Button_R1, buttons->mR1);
buttonCount += updateButton(Button::Button_R2, buttons->r2); buttonCount += updateButton(Button::Button_R2, buttons->mR2);
buttonCount += updateButton(Button::Button_R3, buttons->r3); buttonCount += updateButton(Button::Button_R3, buttons->mR3);
buttonCount += updateButton(Button::Button_RStick, buttons->rStick); buttonCount += updateButton(Button::Button_RStick, buttons->mRStick);
buttonCount += updateButton(Button::Button_View, buttons->view); buttonCount += updateButton(Button::Button_View, buttons->mView);
buttonCount += updateButton(Button::Button_X, buttons->x); buttonCount += updateButton(Button::Button_X, buttons->mX);
buttonCount += updateButton(Button::Button_Y, buttons->y); buttonCount += updateButton(Button::Button_Y, buttons->mY);
mHBox->notifyChildrenSizeChanged(); mHBox->notifyChildrenSizeChanged();

2
apps/openmw/mwgui/controllerbuttonsoverlay.hpp
View file

@ -16,7 +16,7 @@ namespace MWGui
ControllerButtonsOverlay(); ControllerButtonsOverlay();
int getHeight(); int getHeight();
void setButtons(ControllerButtonStr* buttons); void setButtons(ControllerButtons* buttons);
private: private:
enum Button enum Button

4
apps/openmw/mwgui/countdialog.cpp
View file

@ -28,8 +28,8 @@ namespace MWGui
// make sure we read the enter key being pressed to accept multiple items // make sure we read the enter key being pressed to accept multiple items
mItemEdit->eventEditSelectAccept += MyGUI::newDelegate(this, &CountDialog::onEnterKeyPressed); mItemEdit->eventEditSelectAccept += MyGUI::newDelegate(this, &CountDialog::onEnterKeyPressed);
mControllerButtons.a = "#{Interface:OK}"; mControllerButtons.mA = "#{Interface:OK}";
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
} }
void CountDialog::openCountDialog(const std::string& item, const std::string& message, const int maxCount) void CountDialog::openCountDialog(const std::string& item, const std::string& message, const int maxCount)

10
apps/openmw/mwgui/dialogue.cpp
View file

@ -90,8 +90,8 @@ namespace MWGui
mBribe1000Button->eventMouseButtonClick += MyGUI::newDelegate(this, &PersuasionDialog::onPersuade); mBribe1000Button->eventMouseButtonClick += MyGUI::newDelegate(this, &PersuasionDialog::onPersuade);
mDisableGamepadCursor = Settings::gui().mControllerMenus; mDisableGamepadCursor = Settings::gui().mControllerMenus;
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
} }
void PersuasionDialog::adjustAction(MyGUI::Widget* action, int& totalHeight) void PersuasionDialog::adjustAction(MyGUI::Widget* action, int& totalHeight)
@ -387,9 +387,9 @@ namespace MWGui
+= MyGUI::newDelegate(this, &DialogueWindow::onWindowResize); += MyGUI::newDelegate(this, &DialogueWindow::onWindowResize);
mControllerScrollWidget = mHistory->getParent(); mControllerScrollWidget = mHistory->getParent();
mControllerButtons.a = "#{sAsk}"; mControllerButtons.mA = "#{sAsk}";
mControllerButtons.b = "#{sGoodbye}"; mControllerButtons.mB = "#{sGoodbye}";
mControllerButtons.rStick = "#{sScrollup}"; mControllerButtons.mRStick = "#{sScrollup}";
} }
void DialogueWindow::onTradeComplete() void DialogueWindow::onTradeComplete()

14
apps/openmw/mwgui/enchantingdialog.cpp
View file

@ -60,11 +60,11 @@ namespace MWGui
mTypeButton->eventMouseButtonClick += MyGUI::newDelegate(this, &EnchantingDialog::onTypeButtonClicked); mTypeButton->eventMouseButtonClick += MyGUI::newDelegate(this, &EnchantingDialog::onTypeButtonClicked);
mName->eventEditSelectAccept += MyGUI::newDelegate(this, &EnchantingDialog::onAccept); mName->eventEditSelectAccept += MyGUI::newDelegate(this, &EnchantingDialog::onAccept);
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
mControllerButtons.y = "#{OMWEngine:EnchantType}"; mControllerButtons.mY = "#{OMWEngine:EnchantType}";
mControllerButtons.l1 = "#{sItem}"; mControllerButtons.mL1 = "#{sItem}";
mControllerButtons.r1 = "#{sSoulGem}"; mControllerButtons.mR1 = "#{sSoulGem}";
} }
void EnchantingDialog::onOpen() void EnchantingDialog::onOpen()
@ -158,7 +158,7 @@ namespace MWGui
mEnchanting.setSelfEnchanting(false); mEnchanting.setSelfEnchanting(false);
mEnchanting.setEnchanter(ptr); mEnchanting.setEnchanter(ptr);
mBuyButton->setCaptionWithReplacing("#{sBuy}"); mBuyButton->setCaptionWithReplacing("#{sBuy}");
mControllerButtons.x = "#{sBuy}"; mControllerButtons.mX = "#{sBuy}";
mChanceLayout->setVisible(false); mChanceLayout->setVisible(false);
mPtr = ptr; mPtr = ptr;
setSoulGem(MWWorld::Ptr()); setSoulGem(MWWorld::Ptr());
@ -170,7 +170,7 @@ namespace MWGui
mEnchanting.setSelfEnchanting(true); mEnchanting.setSelfEnchanting(true);
mEnchanting.setEnchanter(MWMechanics::getPlayer()); mEnchanting.setEnchanter(MWMechanics::getPlayer());
mBuyButton->setCaptionWithReplacing("#{sCreate}"); mBuyButton->setCaptionWithReplacing("#{sCreate}");
mControllerButtons.x = "#{sCreate}"; mControllerButtons.mX = "#{sCreate}";
mChanceLayout->setVisible(Settings::game().mShowEnchantChance); mChanceLayout->setVisible(Settings::game().mShowEnchantChance);
mPtr = MWMechanics::getPlayer(); mPtr = MWMechanics::getPlayer();
setSoulGem(ptr); setSoulGem(ptr);

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

@ -151,7 +151,7 @@ namespace MWGui
image->setImageTexture(MWBase::Environment::get().getInputManager()->getControllerButtonIcon( image->setImageTexture(MWBase::Environment::get().getInputManager()->getControllerButtonIcon(
SDL_CONTROLLER_BUTTON_RIGHTSHOULDER)); SDL_CONTROLLER_BUTTON_RIGHTSHOULDER));
mControllerButtons.r3 = "#{sInfo}"; mControllerButtons.mR3 = "#{sInfo}";
} }
adjustPanes(); adjustPanes();
@ -966,34 +966,34 @@ namespace MWGui
return osg::Vec2f(normalisedX * float(viewport.width - 1), (1.0 - normalisedY) * float(viewport.height - 1)); return osg::Vec2f(normalisedX * float(viewport.width - 1), (1.0 - normalisedY) * float(viewport.height - 1));
} }
ControllerButtonStr* InventoryWindow::getControllerButtons() ControllerButtons* InventoryWindow::getControllerButtons()
{ {
switch (mGuiMode) switch (mGuiMode)
{ {
case MWGui::GM_Companion: case MWGui::GM_Companion:
mControllerButtons.a = "#{OMWEngine:InventorySelect}"; mControllerButtons.mA = "#{OMWEngine:InventorySelect}";
mControllerButtons.b = "#{Interface:Close}"; mControllerButtons.mB = "#{Interface:Close}";
mControllerButtons.x.clear(); mControllerButtons.mX.clear();
mControllerButtons.r2 = "#{sCompanionShare}"; mControllerButtons.mR2 = "#{sCompanionShare}";
break; break;
case MWGui::GM_Container: case MWGui::GM_Container:
mControllerButtons.a = "#{OMWEngine:InventorySelect}"; mControllerButtons.mA = "#{OMWEngine:InventorySelect}";
mControllerButtons.b = "#{Interface:Close}"; mControllerButtons.mB = "#{Interface:Close}";
mControllerButtons.x = "#{sTakeAll}"; mControllerButtons.mX = "#{sTakeAll}";
mControllerButtons.r2 = "#{sContainer}"; mControllerButtons.mR2 = "#{sContainer}";
break; break;
case MWGui::GM_Barter: case MWGui::GM_Barter:
mControllerButtons.a = "#{sSell}"; mControllerButtons.mA = "#{sSell}";
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
mControllerButtons.x = "#{sOffer}"; mControllerButtons.mX = "#{sOffer}";
mControllerButtons.r2 = "#{sBarter}"; mControllerButtons.mR2 = "#{sBarter}";
break; break;
case MWGui::GM_Inventory: case MWGui::GM_Inventory:
default: default:
mControllerButtons.a = "#{sEquip}"; mControllerButtons.mA = "#{sEquip}";
mControllerButtons.b = "#{sBack}"; mControllerButtons.mB = "#{sBack}";
mControllerButtons.x = "#{sDrop}"; mControllerButtons.mX = "#{sDrop}";
mControllerButtons.r2.clear(); mControllerButtons.mR2.clear();
break; break;
} }
return &mControllerButtons; return &mControllerButtons;

2
apps/openmw/mwgui/inventorywindow.hpp
View file

@ -77,7 +77,7 @@ namespace MWGui
std::string_view getWindowIdForLua() const override { return "Inventory"; } std::string_view getWindowIdForLua() const override { return "Inventory"; }
ControllerButtonStr* getControllerButtons() override; ControllerButtons* getControllerButtons() override;
protected: protected:
void onTitleDoubleClicked() override; void onTitleDoubleClicked() override;

6
apps/openmw/mwgui/itemselection.cpp
View file

@ -29,9 +29,9 @@ namespace MWGui
center(); center();
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
mControllerButtons.r3 = "#{sInfo}"; mControllerButtons.mR3 = "#{sInfo}";
} }
bool ItemSelectionDialog::exit() bool ItemSelectionDialog::exit()

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

@ -224,9 +224,9 @@ namespace
if (isRussian) // Cyrillic is either (10 + 10 + 10) or (15 + 15) if (isRussian) // Cyrillic is either (10 + 10 + 10) or (15 + 15)
mIndexRowCount = MWGui::getCyrillicIndexPageCount(); mIndexRowCount = MWGui::getCyrillicIndexPageCount();
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
mControllerButtons.x = "#{OMWEngine:JournalQuests}"; mControllerButtons.mX = "#{OMWEngine:JournalQuests}";
mControllerButtons.y = "#{sTopics}"; mControllerButtons.mY = "#{sTopics}";
mQuestMode = false; mQuestMode = false;
mAllQuests = false; mAllQuests = false;
@ -696,12 +696,12 @@ namespace
} }
} }
MWGui::ControllerButtonStr* getControllerButtons() override MWGui::ControllerButtons* getControllerButtons() override
{ {
mControllerButtons.b = mOptionsMode || mStates.size() > 1 ? "#{sBack}" : "#{Interface:Close}"; mControllerButtons.mB = mOptionsMode || mStates.size() > 1 ? "#{sBack}" : "#{Interface:Close}";
mControllerButtons.l1 = mOptionsMode ? "" : "#{sPrev}"; mControllerButtons.mL1 = mOptionsMode ? "" : "#{sPrev}";
mControllerButtons.r1 = mOptionsMode ? "" : "#{sNext}"; mControllerButtons.mR1 = mOptionsMode ? "" : "#{sNext}";
mControllerButtons.r3 = mOptionsMode && mQuestMode ? "#{OMWEngine:JournalShowAll}" : ""; mControllerButtons.mR3 = mOptionsMode && mQuestMode ? "#{OMWEngine:JournalShowAll}" : "";
return &mControllerButtons; return &mControllerButtons;
} }

4
apps/openmw/mwgui/levelupdialog.cpp
View file

@ -95,8 +95,8 @@ namespace MWGui
if (Settings::gui().mControllerMenus) if (Settings::gui().mControllerMenus)
{ {
mDisableGamepadCursor = true; mDisableGamepadCursor = true;
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
mControllerButtons.x = "#{sDone}"; mControllerButtons.mX = "#{sDone}";
mOkButton->setCaption( mOkButton->setCaption(
MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sDone", {}))); MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sDone", {})));
} }

18
apps/openmw/mwgui/mapwindow.cpp
View file

@ -836,10 +836,10 @@ namespace MWGui
if (Settings::gui().mControllerMenus) if (Settings::gui().mControllerMenus)
{ {
mControllerButtons.b = "#{sBack}"; mControllerButtons.mB = "#{sBack}";
mControllerButtons.x = global ? "#{sLocal}" : "#{sWorld}"; mControllerButtons.mX = global ? "#{sLocal}" : "#{sWorld}";
mControllerButtons.y = "#{sCenter}"; mControllerButtons.mY = "#{sCenter}";
mControllerButtons.dpad = Settings::map().mAllowZooming ? "" : "#{sMove}"; mControllerButtons.mDpad = Settings::map().mAllowZooming ? "" : "#{sMove}";
} }
} }
@ -1230,7 +1230,7 @@ namespace MWGui
mLocalMap->setVisible(!global); mLocalMap->setVisible(!global);
mButton->setCaptionWithReplacing(global ? "#{sLocal}" : "#{sWorld}"); mButton->setCaptionWithReplacing(global ? "#{sLocal}" : "#{sWorld}");
mControllerButtons.x = global ? "#{sLocal}" : "#{sWorld}"; mControllerButtons.mX = global ? "#{sLocal}" : "#{sWorld}";
MWBase::Environment::get().getWindowManager()->updateControllerButtonsOverlay(); MWBase::Environment::get().getWindowManager()->updateControllerButtonsOverlay();
} }
@ -1475,8 +1475,8 @@ namespace MWGui
if (Settings::gui().mControllerMenus) if (Settings::gui().mControllerMenus)
{ {
mControllerButtons.a = "#{Interface:OK}"; mControllerButtons.mA = "#{Interface:OK}";
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
} }
} }
@ -1529,9 +1529,9 @@ namespace MWGui
eventDeleteClicked(); eventDeleteClicked();
} }
ControllerButtonStr* EditNoteDialog::getControllerButtons() ControllerButtons* EditNoteDialog::getControllerButtons()
{ {
mControllerButtons.x = getDeleteButtonShown() ? "#{sDelete}" : ""; mControllerButtons.mX = getDeleteButtonShown() ? "#{sDelete}" : "";
return &mControllerButtons; return &mControllerButtons;
} }

2
apps/openmw/mwgui/mapwindow.hpp
View file

@ -212,7 +212,7 @@ namespace MWGui
EventHandle_Void eventDeleteClicked; EventHandle_Void eventDeleteClicked;
EventHandle_Void eventOkClicked; EventHandle_Void eventOkClicked;
ControllerButtonStr* getControllerButtons() override; ControllerButtons* getControllerButtons() override;
private: private:
void onCancelButtonClicked(MyGUI::Widget* sender); void onCancelButtonClicked(MyGUI::Widget* sender);

4
apps/openmw/mwgui/merchantrepair.cpp
View file

@ -32,8 +32,8 @@ namespace MWGui
if (Settings::gui().mControllerMenus) if (Settings::gui().mControllerMenus)
{ {
mDisableGamepadCursor = true; mDisableGamepadCursor = true;
mControllerButtons.a = "#{sRepair}"; mControllerButtons.mA = "#{sRepair}";
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
} }
} }

2
apps/openmw/mwgui/messagebox.cpp
View file

@ -285,7 +285,7 @@ namespace MWGui
if (Settings::gui().mControllerMenus) if (Settings::gui().mControllerMenus)
{ {
mDisableGamepadCursor = true; mDisableGamepadCursor = true;
mControllerButtons.a = "#{Interface:OK}"; mControllerButtons.mA = "#{Interface:OK}";
// If we have more than one button, we need to set the focus to the first one. // If we have more than one button, we need to set the focus to the first one.
if (mButtons.size() > 1) if (mButtons.size() > 1)

12
apps/openmw/mwgui/quickkeysmenu.cpp
View file

@ -62,8 +62,8 @@ namespace MWGui
if (Settings::gui().mControllerMenus) if (Settings::gui().mControllerMenus)
{ {
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
mControllerButtons.b = "#{Interface:OK}"; mControllerButtons.mB = "#{Interface:OK}";
} }
} }
@ -541,8 +541,8 @@ namespace MWGui
{ {
mDisableGamepadCursor = true; mDisableGamepadCursor = true;
mItemButton->setStateSelected(true); mItemButton->setStateSelected(true);
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
} }
center(); center();
@ -687,8 +687,8 @@ namespace MWGui
if (Settings::gui().mControllerMenus) if (Settings::gui().mControllerMenus)
{ {
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
} }
center(); center();

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

@ -108,12 +108,12 @@ namespace MWGui
if (Settings::gui().mControllerMenus) if (Settings::gui().mControllerMenus)
{ {
mControllerButtons.lStick = "#{sMouse}"; mControllerButtons.mLStick = "#{sMouse}";
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
mControllerButtons.b = "#{sBack}"; mControllerButtons.mB = "#{sBack}";
mControllerButtons.y = "#{sSex}"; mControllerButtons.mY = "#{sSex}";
mControllerButtons.l1 = "#{sHair}"; mControllerButtons.mL1 = "#{sHair}";
mControllerButtons.r1 = "#{sFace}"; mControllerButtons.mR1 = "#{sFace}";
} }
updateRaces(); updateRaces();
@ -130,13 +130,13 @@ namespace MWGui
{ {
okButton->setCaption( okButton->setCaption(
MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {}))); MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {})));
mControllerButtons.x = "#{sNext}"; mControllerButtons.mX = "#{sNext}";
} }
else if (Settings::gui().mControllerMenus) else if (Settings::gui().mControllerMenus)
{ {
okButton->setCaption( okButton->setCaption(
MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sDone", {}))); MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sDone", {})));
mControllerButtons.x = "#{sDone}"; mControllerButtons.mX = "#{sDone}";
} }
else else
okButton->setCaption( okButton->setCaption(

6
apps/openmw/mwgui/recharge.cpp
View file

@ -40,9 +40,9 @@ namespace MWGui
mGemIcon->eventMouseButtonClick += MyGUI::newDelegate(this, &Recharge::onSelectItem); mGemIcon->eventMouseButtonClick += MyGUI::newDelegate(this, &Recharge::onSelectItem);
mControllerButtons.a = "#{OMWEngine:RechargeSelect}"; mControllerButtons.mA = "#{OMWEngine:RechargeSelect}";
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
mControllerButtons.y = "#{sSoulGem}"; mControllerButtons.mY = "#{sSoulGem}";
} }
void Recharge::onOpen() void Recharge::onOpen()

6
apps/openmw/mwgui/repair.cpp
View file

@ -40,9 +40,9 @@ namespace MWGui
mToolIcon->eventMouseButtonClick += MyGUI::newDelegate(this, &Repair::onSelectItem); mToolIcon->eventMouseButtonClick += MyGUI::newDelegate(this, &Repair::onSelectItem);
mControllerButtons.a = "#{sRepair}"; mControllerButtons.mA = "#{sRepair}";
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
mControllerButtons.y = "#{OMWEngine:RepairTool}"; mControllerButtons.mY = "#{OMWEngine:RepairTool}";
} }
void Repair::onOpen() void Repair::onOpen()

6
apps/openmw/mwgui/review.cpp
View file

@ -123,9 +123,9 @@ namespace MWGui
if (Settings::gui().mControllerMenus) if (Settings::gui().mControllerMenus)
{ {
setControllerFocus(mButtons, mControllerFocus, true); setControllerFocus(mButtons, mControllerFocus, true);
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
mControllerButtons.b = "#{sBack}"; mControllerButtons.mB = "#{sBack}";
mControllerButtons.x = "#{sDone}"; mControllerButtons.mX = "#{sDone}";
okButton->setCaption( okButton->setCaption(
MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sDone", {}))); MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sDone", {})));
} }

8
apps/openmw/mwgui/savegamedialog.cpp
View file

@ -67,8 +67,8 @@ namespace MWGui
// To avoid accidental deletions // To avoid accidental deletions
mDeleteButton->setNeedKeyFocus(false); mDeleteButton->setNeedKeyFocus(false);
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
} }
void SaveGameDialog::onSlotActivated(MyGUI::ListBox* sender, size_t pos) void SaveGameDialog::onSlotActivated(MyGUI::ListBox* sender, size_t pos)
@ -526,9 +526,9 @@ namespace MWGui
mScreenshot->setRenderItemTexture(mScreenshotTexture.get()); mScreenshot->setRenderItemTexture(mScreenshotTexture.get());
} }
ControllerButtonStr* SaveGameDialog::getControllerButtons() ControllerButtons* SaveGameDialog::getControllerButtons()
{ {
mControllerButtons.y = mSaving ? "" : "#{OMWEngine:LoadingSelectCharacter}"; mControllerButtons.mY = mSaving ? "" : "#{OMWEngine:LoadingSelectCharacter}";
return &mControllerButtons; return &mControllerButtons;
} }

2
apps/openmw/mwgui/savegamedialog.hpp
View file

@ -24,7 +24,7 @@ namespace MWGui
void setLoadOrSave(bool load); void setLoadOrSave(bool load);
ControllerButtonStr* getControllerButtons() override; ControllerButtons* getControllerButtons() override;
private: private:
void confirmDeleteSave(); void confirmDeleteSave();

8
apps/openmw/mwgui/scrollwindow.cpp
View file

@ -40,8 +40,8 @@ namespace MWGui
mTakeButton->eventKeyButtonPressed += MyGUI::newDelegate(this, &ScrollWindow::onKeyButtonPressed); mTakeButton->eventKeyButtonPressed += MyGUI::newDelegate(this, &ScrollWindow::onKeyButtonPressed);
mControllerScrollWidget = mTextView; mControllerScrollWidget = mTextView;
mControllerButtons.b = "#{Interface:Close}"; mControllerButtons.mB = "#{Interface:Close}";
mControllerButtons.dpad = "#{sScrolldown}"; mControllerButtons.mDpad = "#{sScrolldown}";
center(); center();
} }
@ -128,9 +128,9 @@ namespace MWGui
BookWindowBase::onClose(); BookWindowBase::onClose();
} }
ControllerButtonStr* ScrollWindow::getControllerButtons() ControllerButtons* ScrollWindow::getControllerButtons()
{ {
mControllerButtons.a = mTakeButton->getVisible() ? "#{sTake}" : ""; mControllerButtons.mA = mTakeButton->getVisible() ? "#{sTake}" : "";
return &mControllerButtons; return &mControllerButtons;
} }

2
apps/openmw/mwgui/scrollwindow.hpp
View file

@ -25,7 +25,7 @@ namespace MWGui
std::string_view getWindowIdForLua() const override { return "Scroll"; } std::string_view getWindowIdForLua() const override { return "Scroll"; }
ControllerButtonStr* getControllerButtons() override; ControllerButtons* getControllerButtons() override;
protected: protected:
void onCloseButtonClicked(MyGUI::Widget* _sender); void onCloseButtonClicked(MyGUI::Widget* _sender);

6
apps/openmw/mwgui/settingswindow.cpp
View file

@ -463,9 +463,9 @@ namespace MWGui
i++; i++;
} }
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
mControllerButtons.b = "#{Interface:OK}"; mControllerButtons.mB = "#{Interface:OK}";
mControllerButtons.lStick = "#{sMouse}"; mControllerButtons.mLStick = "#{sMouse}";
} }
void SettingsWindow::onTabChanged(MyGUI::TabControl* /*_sender*/, size_t /*index*/) void SettingsWindow::onTabChanged(MyGUI::TabControl* /*_sender*/, size_t /*index*/)

6
apps/openmw/mwgui/spellbuyingwindow.cpp
View file

@ -38,9 +38,9 @@ namespace MWGui
if (Settings::gui().mControllerMenus) if (Settings::gui().mControllerMenus)
{ {
mDisableGamepadCursor = true; mDisableGamepadCursor = true;
mControllerButtons.a = "#{sBuy}"; mControllerButtons.mA = "#{sBuy}";
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
mControllerButtons.r3 = "#{sInfo}"; mControllerButtons.mR3 = "#{sInfo}";
} }
} }

14
apps/openmw/mwgui/spellcreationdialog.cpp
View file

@ -100,9 +100,9 @@ namespace MWGui
if (Settings::gui().mControllerMenus) if (Settings::gui().mControllerMenus)
{ {
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
mControllerButtons.x = "#{Interface:OK}"; mControllerButtons.mX = "#{Interface:OK}";
} }
} }
@ -598,10 +598,10 @@ namespace MWGui
if (Settings::gui().mControllerMenus) if (Settings::gui().mControllerMenus)
{ {
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
mControllerButtons.x = "#{sBuy}"; mControllerButtons.mX = "#{sBuy}";
mControllerButtons.r3 = "#{sInfo}"; mControllerButtons.mR3 = "#{sInfo}";
} }
} }

6
apps/openmw/mwgui/spellwindow.cpp
View file

@ -62,9 +62,9 @@ namespace MWGui
if (Settings::gui().mControllerMenus) if (Settings::gui().mControllerMenus)
{ {
setPinButtonVisible(false); setPinButtonVisible(false);
mControllerButtons.a = "#{sSelect}"; mControllerButtons.mA = "#{sSelect}";
mControllerButtons.b = "#{sBack}"; mControllerButtons.mB = "#{sBack}";
mControllerButtons.r3 = "#{sInfo}"; mControllerButtons.mR3 = "#{sInfo}";
} }
} }

6
apps/openmw/mwgui/statswindow.cpp
View file

@ -84,9 +84,9 @@ namespace MWGui
if (Settings::gui().mControllerMenus) if (Settings::gui().mControllerMenus)
{ {
setPinButtonVisible(false); setPinButtonVisible(false);
mControllerButtons.lStick = "#{sMouse}"; mControllerButtons.mLStick = "#{sMouse}";
mControllerButtons.rStick = "#{sScrolldown}"; mControllerButtons.mRStick = "#{sScrolldown}";
mControllerButtons.b = "#{sBack}"; mControllerButtons.mB = "#{sBack}";
} }
onWindowResize(t); onWindowResize(t);

2
apps/openmw/mwgui/textinput.cpp
View file

@ -28,7 +28,7 @@ namespace MWGui
// Make sure the edit box has focus // Make sure the edit box has focus
MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mTextEdit); MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mTextEdit);
mControllerButtons.a = "#{Interface:OK}"; mControllerButtons.mA = "#{Interface:OK}";
} }
void TextInputDialog::setNextButtonShow(bool shown) void TextInputDialog::setNextButtonShow(bool shown)

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

@ -188,11 +188,11 @@ namespace MWGui
image->setImageTexture(MWBase::Environment::get().getInputManager()->getControllerButtonIcon( image->setImageTexture(MWBase::Environment::get().getInputManager()->getControllerButtonIcon(
SDL_CONTROLLER_BUTTON_RIGHTSHOULDER)); SDL_CONTROLLER_BUTTON_RIGHTSHOULDER));
mControllerButtons.a = "#{sBuy}"; mControllerButtons.mA = "#{sBuy}";
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
mControllerButtons.x = "#{sOffer}"; mControllerButtons.mX = "#{sOffer}";
mControllerButtons.r3 = "#{sInfo}"; mControllerButtons.mR3 = "#{sInfo}";
mControllerButtons.l2 = "#{sInventory}"; mControllerButtons.mL2 = "#{sInventory}";
} }
} }

4
apps/openmw/mwgui/trainingwindow.cpp
View file

@ -40,8 +40,8 @@ namespace MWGui
if (Settings::gui().mControllerMenus) if (Settings::gui().mControllerMenus)
{ {
mDisableGamepadCursor = true; mDisableGamepadCursor = true;
mControllerButtons.a = "#{sBuy}"; mControllerButtons.mA = "#{sBuy}";
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
} }
} }

4
apps/openmw/mwgui/travelwindow.cpp
View file

@ -41,8 +41,8 @@ namespace MWGui
if (Settings::gui().mControllerMenus) if (Settings::gui().mControllerMenus)
{ {
mDisableGamepadCursor = true; mDisableGamepadCursor = true;
mControllerButtons.a = "#{sTravel}"; mControllerButtons.mA = "#{sTravel}";
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
} }
} }

8
apps/openmw/mwgui/waitdialog.cpp
View file

@ -80,7 +80,7 @@ namespace MWGui
mTimeAdvancer.eventInterrupted += MyGUI::newDelegate(this, &WaitDialog::onWaitingInterrupted); mTimeAdvancer.eventInterrupted += MyGUI::newDelegate(this, &WaitDialog::onWaitingInterrupted);
mTimeAdvancer.eventFinished += MyGUI::newDelegate(this, &WaitDialog::onWaitingFinished); mTimeAdvancer.eventFinished += MyGUI::newDelegate(this, &WaitDialog::onWaitingFinished);
mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.mB = "#{Interface:Cancel}";
mDisableGamepadCursor = Settings::gui().mControllerMenus; mDisableGamepadCursor = Settings::gui().mControllerMenus;
} }
@ -328,10 +328,10 @@ namespace MWGui
} }
} }
ControllerButtonStr* WaitDialog::getControllerButtons() ControllerButtons* WaitDialog::getControllerButtons()
{ {
mControllerButtons.a = mSleeping ? "#{sRest}" : "#{sWait}"; mControllerButtons.mA = mSleeping ? "#{sRest}" : "#{sWait}";
mControllerButtons.x = mSleeping && mUntilHealedButton->getVisible() ? "#{sUntilHealed}" : ""; mControllerButtons.mX = mSleeping && mUntilHealedButton->getVisible() ? "#{sUntilHealed}" : "";
return &mControllerButtons; return &mControllerButtons;
} }

2
apps/openmw/mwgui/waitdialog.hpp
View file

@ -46,7 +46,7 @@ namespace MWGui
std::string_view getWindowIdForLua() const override { return "WaitDialog"; } std::string_view getWindowIdForLua() const override { return "WaitDialog"; }
ControllerButtonStr* getControllerButtons() override; ControllerButtons* getControllerButtons() override;
protected: protected:
MyGUI::TextBox* mDateTimeText; MyGUI::TextBox* mDateTimeText;

36
apps/openmw/mwgui/windowbase.hpp
View file

@ -17,23 +17,23 @@ namespace MWGui
int wrap(int index, int max); int wrap(int index, int max);
void setControllerFocus(const std::vector<MyGUI::Button*>& buttons, int index, bool selected); void setControllerFocus(const std::vector<MyGUI::Button*>& buttons, int index, bool selected);
struct ControllerButtonStr struct ControllerButtons
{ {
std::string a; std::string mA;
std::string b; std::string mB;
std::string dpad; std::string mDpad;
std::string l1; std::string mL1;
std::string l2; std::string mL2;
std::string l3; std::string mL3;
std::string lStick; std::string mLStick;
std::string menu; std::string mMenu;
std::string r1; std::string mR1;
std::string r2; std::string mR2;
std::string r3; std::string mR3;
std::string rStick; std::string mRStick;
std::string view; std::string mView;
std::string x; std::string mX;
std::string y; std::string mY;
}; };
class WindowBase : public Layout class WindowBase : public Layout
@ -78,7 +78,7 @@ namespace MWGui
static void clampWindowCoordinates(MyGUI::Window* window); static void clampWindowCoordinates(MyGUI::Window* window);
virtual ControllerButtonStr* getControllerButtons() { return &mControllerButtons; } virtual ControllerButtons* getControllerButtons() { return &mControllerButtons; }
MyGUI::Widget* getControllerScrollWidget() { return mControllerScrollWidget; } MyGUI::Widget* getControllerScrollWidget() { return mControllerScrollWidget; }
bool isGamepadCursorAllowed() { return !mDisableGamepadCursor; } bool isGamepadCursorAllowed() { return !mDisableGamepadCursor; }
virtual bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) { return true; } virtual bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) { return true; }
@ -88,7 +88,7 @@ namespace MWGui
protected: protected:
virtual void onTitleDoubleClicked(); virtual void onTitleDoubleClicked();
ControllerButtonStr mControllerButtons; ControllerButtons mControllerButtons;
bool mActiveControllerWindow = false; bool mActiveControllerWindow = false;
bool mDisableGamepadCursor = false; bool mDisableGamepadCursor = false;
MyGUI::Widget* mControllerScrollWidget = nullptr; MyGUI::Widget* mControllerScrollWidget = nullptr;