From fb5fa6ce1849812ca18fc731d663627433491f7a Mon Sep 17 00:00:00 2001
From: Andrew Lanzone <andy@enoznal.com>
Date: Sat, 21 Jun 2025 22:04:35 -0700
Subject: [PATCH] Fix controller tooltip disappearing because of spurious
 controller input

---
 apps/openmw/mwgui/itemview.cpp            | 2 +-
 apps/openmw/mwinput/controllermanager.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwgui/itemview.cpp b/apps/openmw/mwgui/itemview.cpp
index c114db5e35..8b003b267d 100644
--- a/apps/openmw/mwgui/itemview.cpp
+++ b/apps/openmw/mwgui/itemview.cpp
@@ -81,7 +81,6 @@ namespace MWGui
 
         if (Settings::gui().mControllerMenus)
         {
-            MWBase::Environment::get().getWindowManager()->setControllerTooltip(false);
             mControllerFocus = std::clamp(mControllerFocus, 0, mItemCount - 1);
             updateControllerFocus(-1, mControllerFocus);
         }
@@ -215,6 +214,7 @@ namespace MWGui
             // Select the focused item, if any.
             if (mControllerFocus >= 0 && mControllerFocus < mItemCount)
             {
+                MWBase::Environment::get().getWindowManager()->setControllerTooltip(false);
                 MyGUI::Widget* dragArea = mScrollView->getChildAt(0);
                 onSelectedItem(dragArea->getChildAt(mControllerFocus));
             }
diff --git a/apps/openmw/mwinput/controllermanager.cpp b/apps/openmw/mwinput/controllermanager.cpp
index b6994cc3d6..8a60ff0673 100644
--- a/apps/openmw/mwinput/controllermanager.cpp
+++ b/apps/openmw/mwinput/controllermanager.cpp
@@ -360,7 +360,7 @@ 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())
+                    if (winMgr->getControllerTooltip() && std::abs(arg.value) > 2000)
                     {
                         winMgr->setControllerTooltip(false);
                         winMgr->setCursorVisible(true);