Merge pull request #9828 from JosJuice/android-pressed-opacity

Android: Apply opacity setting to pressed buttons too
dolphin-emu · Jun 23, 2021 · 4979974 · 4979974
2 parents 9476733 + d33efc3
commit 4979974
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/...droid/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java b/...droid/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java
@@ -117,6 +117,7 @@ public void setBounds(int left, int top, int right, int bottom)
   public void setOpacity(int value)
   {
     mDefaultStateBitmap.setAlpha(value);
+    mPressedStateBitmap.setAlpha(value);
   }
 
   public Rect getBounds()

diff --git a/...Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableDpad.java b/...Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableDpad.java
@@ -186,6 +186,8 @@ public void setBounds(int left, int top, int right, int bottom)
   public void setOpacity(int value)
   {
     mDefaultStateBitmap.setAlpha(value);
+    mPressedOneDirectionStateBitmap.setAlpha(value);
+    mPressedTwoDirectionsStateBitmap.setAlpha(value);
   }
 
   public Rect getBounds()

diff --git a/...oid/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableJoystick.java b/...oid/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableJoystick.java
@@ -255,8 +255,20 @@ public void setBounds(Rect bounds)
   public void setOpacity(int value)
   {
     mOpacity = value;
+
     mDefaultStateInnerBitmap.setAlpha(value);
-    mOuterBitmap.setAlpha(value);
+    mPressedStateInnerBitmap.setAlpha(value);
+
+    if (trackId == -1)
+    {
+      mOuterBitmap.setAlpha(value);
+      mBoundsBoxBitmap.setAlpha(0);
+    }
+    else
+    {
+      mOuterBitmap.setAlpha(0);
+      mBoundsBoxBitmap.setAlpha(value);
+    }
   }
 
   public Rect getBounds()