AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-18 17:07:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix right stick from causing mouse to appear in controller mode

Browse Source
This commit is contained in:
Andrew Lanzone 2025-07-29 19:29:20 -07:00
parent 5d5d14a5a6
commit 582b409f7f
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwgui/windowbase.hpp
View File

@ -82,7 +82,7 @@ namespace MWGui
MyGUI::Widget* getControllerScrollWidget() { return mControllerScrollWidget; }
bool isGamepadCursorAllowed() { return !mDisableGamepadCursor; }
virtual bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) { return true; }
virtual bool onControllerThumbstickEvent(const SDL_ControllerAxisEvent& arg) { return true; }
virtual bool onControllerThumbstickEvent(const SDL_ControllerAxisEvent& arg) { return false; }
virtual void setActiveControllerWindow(bool active) { mActiveControllerWindow = active; }
protected:

23
apps/openmw/mwinput/controllermanager.cpp
View File

@ -221,7 +221,8 @@ namespace MWInput
mJoystickLastUsed = true;
if (MWBase::Environment::get().getWindowManager()->isGuiMode())
{
gamepadToGuiControl(arg);
if (gamepadToGuiControl(arg))
return;
}
else if (mBindingsManager->actionIsActive(A_TogglePOV)
&& (arg.axis == SDL_CONTROLLER_AXIS_TRIGGERRIGHT || arg.axis == SDL_CONTROLLER_AXIS_TRIGGERLEFT))
@ -354,6 +355,7 @@ namespace MWInput
MWGui::WindowBase* topWin = winMgr->getActiveControllerWindow();
if (topWin)
{
bool isPastDeadzone = std::abs(arg.value) > 2000;
// Update cursor state
mGamepadGuiCursorEnabled = topWin->isGamepadCursorAllowed();
if (!mGamepadGuiCursorEnabled)
@ -363,23 +365,36 @@ namespace MWInput
&& (arg.axis == SDL_CONTROLLER_AXIS_LEFTX || arg.axis == SDL_CONTROLLER_AXIS_LEFTY))
{
// Treat the left stick like a cursor, which is the default behavior.
if (winMgr->getControllerTooltip() && std::abs(arg.value) > 2000)
if (isPastDeadzone && winMgr->getControllerTooltip())
{
winMgr->setControllerTooltip(false);
winMgr->setCursorVisible(true);
}
else if (isPastDeadzone && mGamepadGuiCursorEnabled)
{
winMgr->setCursorVisible(true);
}
return false;
}
// On some windows, treat right stick like a scroll wheel.
if (arg.axis == SDL_CONTROLLER_AXIS_RIGHTY && topWin->getControllerScrollWidget() != nullptr)
// Some windows have a specific widget to scroll with the right stick. Move the mouse there.
if (arg.axis == SDL_CONTROLLER_AXIS_RIGHTY && isPastDeadzone
&& topWin->getControllerScrollWidget() != nullptr)
{
mMouseManager->warpMouseToWidget(topWin->getControllerScrollWidget());
winMgr->setCursorVisible(false);
}
if (topWin->onControllerThumbstickEvent(arg))
{
// Window handled the event.
return true;
}
else if (arg.axis == SDL_CONTROLLER_AXIS_RIGHTX || arg.axis == SDL_CONTROLLER_AXIS_RIGHTY)
{
// Only right-stick scroll if mouse is visible or there's a widget to scroll.
return !winMgr->getCursorVisible() && topWin->getControllerScrollWidget() == nullptr;
}
}
}