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

Add controller support to message boxes

Browse source
This commit is contained in:
Andrew Lanzone 2025-05-11 00:20:31 -07:00
parent 80166cddd0
commit 3b42d02cfc
2 changed files with 53 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@
#include <components/debug/debuglog.hpp>
#include <components/misc/strings/algorithm.hpp>
#include <components/settings/values.hpp>
#include "../mwbase/environment.hpp"
#include "../mwbase/inputmanager.hpp"
@ -259,6 +260,7 @@ namespace MWGui
button->setCaptionWithReplacing(buttonId);
button->eventMouseButtonClick += MyGUI::newDelegate(this, &InteractiveMessageBox::mousePressed);
trackFocusEvents(button);
mButtons.push_back(button);
@ -280,6 +282,12 @@ namespace MWGui
}
}
if (Settings::gui().mControllerMenus && mButtons.size() > 1)
{
// If we have more than one button, we need to set the focus to the first one.
mButtons[0]->setStateSelected(true);
}
MyGUI::IntSize mainWidgetSize;
if (buttonsWidth < textSize.width)
{
@ -431,4 +439,46 @@ namespace MWGui
return mButtonPressed;
}
bool InteractiveMessageBox::onControllerButtonEvent(const SDL_ControllerButtonEvent& arg)
{
if (arg.button == SDL_CONTROLLER_BUTTON_A)
{
if (mMouseFocus != nullptr)
return false;
buttonActivated(mButtons[mControllerFocus]);
return true;
}
else if (arg.button == SDL_CONTROLLER_BUTTON_B)
{
if (mButtons.size() == 1)
buttonActivated(mButtons[0]);
}
else if (arg.button == SDL_CONTROLLER_BUTTON_DPAD_LEFT)
{
if (mButtons.size() > 1)
{
mButtons[mControllerFocus]->setStateSelected(false);
if (mControllerFocus == 0)
mControllerFocus = mButtons.size() - 1;
else
mControllerFocus--;
mButtons[mControllerFocus]->setStateSelected(true);
}
}
else if (arg.button == SDL_CONTROLLER_BUTTON_DPAD_RIGHT)
{
if (mButtons.size() > 1)
{
mButtons[mControllerFocus]->setStateSelected(false);
if (mControllerFocus == mButtons.size() - 1)
mControllerFocus = 0;
else
mControllerFocus++;
mButtons[mControllerFocus]->setStateSelected(true);
}
}
return true;
}
}

3
apps/openmw/mwgui/messagebox.hpp
View file

@ -103,6 +103,8 @@ namespace MWGui
bool mMarkedToDelete;
bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
private:
void buttonActivated(MyGUI::Widget* _widget);
@ -114,6 +116,7 @@ namespace MWGui
int mButtonPressed;
int mDefaultFocus;
bool mImmediate;
int mControllerFocus = 0;
};
}