In PDA and talk window only focus the cursor when using gamepad (#943)

OpenXRay · Jan 20, 2025 · d5fd1ae · d5fd1ae
1 parent f38295a
commit d5fd1ae
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/xrGame/ui/UISecondTaskWnd.cpp b/src/xrGame/ui/UISecondTaskWnd.cpp
@@ -95,15 +95,18 @@ void UITaskListWnd::Show(bool status)
         GetMessageTarget()->SetKeyboardCapture(this, true);
         focus.LockToWindow(this);
 
-        if (m_list->Empty())
+        if (pInput->IsCurrentInputTypeController())
         {
-            focus.SetFocused(nullptr);
-            UI().GetUICursor().WarpToWindow(m_list, true);
-        }
-        else
-        {
-            const auto item = static_cast<UITaskListWndItem*>(m_list->Items()[0]);
-            item->Focus();
+            if (m_list->Empty())
+            {
+                focus.SetFocused(nullptr);
+                UI().GetUICursor().WarpToWindow(m_list, true);
+            }
+            else
+            {
+                const auto item = static_cast<UITaskListWndItem*>(m_list->Items()[0]);
+                item->Focus();
+            }
         }
     }
     else

diff --git a/src/xrGame/ui/UITalkWnd.cpp b/src/xrGame/ui/UITalkWnd.cpp
@@ -140,7 +140,8 @@ void CUITalkWnd::UpdateQuestions()
         }
     }
 
-    UITalkDialogWnd->FocusOnFirstQuestion();
+    if (pInput->IsCurrentInputTypeController())
+        UITalkDialogWnd->FocusOnFirstQuestion();
 
     m_bNeedToUpdateQuestions = false;
 }