toggle and reset IR

weihuoya · Jan 13, 2019 · d5c2e4b · d5c2e4b
1 parent a480fb1
commit d5c2e4b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java
@@ -319,6 +319,10 @@ else if(button.getTrackId() == pointerId)
           if(button.getTrackId() == pointerId)
           {
             button.onPointerUp(pointerId, pointerX, pointerY);
+            if (mOverlayPointer != null && button.getId() == ButtonType.HOTKEYS_UPRIGHT_TOGGLE)
+            {
+              mOverlayPointer.reset();
+            }
             isProcessed = true;
           }
         }

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayPointer.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayPointer.java
@@ -27,6 +27,16 @@ public InputOverlayPointer(float width, float height)
     mTrackId = -1;
   }
 
+  public void reset()
+  {
+    mTrackId = -1;
+    mAxises[0] = mAxises[1] = mAxises[2] = mAxises[3] = 0;
+    for (int i = 0; i < 4; i++)
+    {
+      NativeLibrary.onGamePadMoveEvent(NativeLibrary.TouchScreenDevice, mAxisIDs[i], mAxises[i]);
+    }
+  }
+
   public int getTrackId()
   {
     return mTrackId;