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

Add basic controller support to scrolls

Browse source
This commit is contained in:
Andrew Lanzone 2025-05-12 22:36:28 -07:00
parent 9a72ecb61c
commit 65bab3858a
2 changed files with 46 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,7 @@
#include <components/widgets/imagebutton.hpp> #include <components/widgets/imagebutton.hpp>
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwbase/inputmanager.hpp"
#include "../mwbase/windowmanager.hpp" #include "../mwbase/windowmanager.hpp"
#include "../mwmechanics/actorutil.hpp" #include "../mwmechanics/actorutil.hpp"
@ -28,9 +29,11 @@ namespace MWGui
getWidget(mCloseButton, "CloseButton"); getWidget(mCloseButton, "CloseButton");
mCloseButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ScrollWindow::onCloseButtonClicked); mCloseButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ScrollWindow::onCloseButtonClicked);
trackFocusEvents(mCloseButton);
getWidget(mTakeButton, "TakeButton"); getWidget(mTakeButton, "TakeButton");
mTakeButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ScrollWindow::onTakeButtonClicked); mTakeButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ScrollWindow::onTakeButtonClicked);
trackFocusEvents(mTakeButton);
adjustButton("CloseButton"); adjustButton("CloseButton");
adjustButton("TakeButton"); adjustButton("TakeButton");
@ -115,4 +118,44 @@ namespace MWGui
MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Scroll); MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Scroll);
} }
void ScrollWindow::onClose()
{
if (Settings::gui().mControllerMenus)
MWBase::Environment::get().getInputManager()->setGamepadGuiCursorEnabled(true);
BookWindowBase::onClose();
}
bool ScrollWindow::onControllerButtonEvent(const SDL_ControllerButtonEvent& arg)
{
if (arg.button == SDL_CONTROLLER_BUTTON_A)
{
if (mMouseFocus != nullptr)
return false;
if (mTakeButton->getVisible())
onTakeButtonClicked(mTakeButton);
}
else if (arg.button == SDL_CONTROLLER_BUTTON_B)
onCloseButtonClicked(mCloseButton);
else if (arg.button == SDL_CONTROLLER_BUTTON_DPAD_UP)
onKeyButtonPressed(nullptr, MyGUI::KeyCode::ArrowUp, 0);
else if (arg.button == SDL_CONTROLLER_BUTTON_DPAD_DOWN)
onKeyButtonPressed(nullptr, MyGUI::KeyCode::ArrowDown, 0);
return true;
}
bool ScrollWindow::onControllerThumbstickEvent(const SDL_ControllerAxisEvent& arg)
{
if (arg.axis == SDL_CONTROLLER_AXIS_RIGHTY)
{
MWBase::Environment::get().getInputManager()->setGamepadGuiCursorEnabled(false);
int scroll = -30.0f * arg.value / 32767;
mTextView->setViewOffset(mTextView->getViewOffset() + MyGUI::IntPoint(0, scroll));
return true;
}
return false;
}
} }

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

@ -20,6 +20,7 @@ namespace MWGui
void setPtr(const MWWorld::Ptr& scroll) override; void setPtr(const MWWorld::Ptr& scroll) override;
void setInventoryAllowed(bool allowed); void setInventoryAllowed(bool allowed);
void onClose() override;
void onResChange(int, int) override { center(); } void onResChange(int, int) override { center(); }
std::string_view getWindowIdForLua() const override { return "Scroll"; } std::string_view getWindowIdForLua() const override { return "Scroll"; }
@ -29,6 +30,8 @@ namespace MWGui
void onTakeButtonClicked(MyGUI::Widget* _sender); void onTakeButtonClicked(MyGUI::Widget* _sender);
void setTakeButtonShow(bool show); void setTakeButtonShow(bool show);
void onKeyButtonPressed(MyGUI::Widget* sender, MyGUI::KeyCode key, MyGUI::Char character); void onKeyButtonPressed(MyGUI::Widget* sender, MyGUI::KeyCode key, MyGUI::Char character);
bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
bool onControllerThumbstickEvent(const SDL_ControllerAxisEvent& arg) override;
private: private:
Gui::ImageButton* mCloseButton; Gui::ImageButton* mCloseButton;