Fix switching between controllers

zhulik · Jul 4, 2023 · 4fe08f5 · 4fe08f5
1 parent f3833bc
commit 4fe08f5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/resources/qml/DebugOverlay.qml b/resources/qml/DebugOverlay.qml
@@ -22,16 +22,6 @@ Item {
         root.visible = !root.visible
     }
 
-    SteamInputControl {
-        objectName: "DebugOverlayInput"
-        controller: steam_input.lastController
-
-        enabled: visible
-
-        actionSet: "deckfm"
-        actionSetLayers: []
-    }
-
     Rectangle {
         anchors.fill: parent
         color: "black"

diff --git a/src/QSteamworks/QSteamInput/controller.cpp b/src/QSteamworks/QSteamInput/controller.cpp
@@ -140,6 +140,8 @@ void Controller::onActionEvent(SteamInputActionEvent_t *event) {
 
   auto digital = event->eEventType == ESteamInputActionEventType_DigitalAction;
 
+  emit userInteracted();
+
   if (digital) {
     actionHandle = event->digitalAction.actionHandle;
 

diff --git a/src/QSteamworks/QSteamInput/controller.h b/src/QSteamworks/QSteamInput/controller.h
@@ -75,6 +75,7 @@ class Controller : public QObject {
   void actionSetsChanged();
   void actionSetChanged();
 
+  void userInteracted();
   void inputEvent(const QSteamworks::QSteamInput::InputEvent &event);
 
   void actionStatesChanged();

diff --git a/src/QSteamworks/steaminput.cpp b/src/QSteamworks/steaminput.cpp
@@ -83,24 +83,24 @@ void SteamInput::onControllerConnected(SteamInputDeviceConnected_t *cb) {
 
   auto controller = new Controller(handle, name, m_iga);
 
-  connect(controller, &Controller::inputEvent, controller, [controller, this](auto e) {
+  connect(controller, &Controller::userInteracted, controller, [controller, this]() {
     if (m_lastController != controller) {
       m_lastController = controller;
       emit lastControllerChanged();
     }
-    emit inputEvent(e);
   });
+
+  connect(controller, &Controller::inputEvent, this, &SteamInput::inputEvent);
   connect(this, &SteamInput::configurationLoaded, controller, &Controller::loadActions);
+
   controller->moveToThread(QGuiApplication::instance()->thread());
   controller->setParent(this);
 
   m_controllers[handle] = controller;
   emit controllersChanged();
 
-  if (m_controllers.count() == 1) { // First added controller
-    m_lastController = controller;
-    emit lastControllerChanged();
-  }
+  m_lastController = controller;
+  emit lastControllerChanged();
 
   qDebug() << "Controller connected:" << controller->name() << controller->handle();
 }