summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2021-06-19 16:18:30 +0200
committerJosJuice <josjuice@gmail.com>2021-06-19 16:28:25 +0200
commitd33efc37af5d7d13d0342d2de3922202289b7a8a (patch)
tree8906ef85aaf89ba8c8fb69260ce795b82b41df36 /Source/Android/app/src/main/java
parent3e1a25ead050554add154efcc236e1f7a9d427e9 (diff)
Android: Apply opacity setting to pressed buttons too
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java1
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableDpad.java2
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableJoystick.java14
3 files changed, 16 insertions, 1 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java
index 41779c84b6..f9fde5c7e6 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java
@@ -117,6 +117,7 @@ public final class InputOverlayDrawableButton
public void setOpacity(int value)
{
mDefaultStateBitmap.setAlpha(value);
+ mPressedStateBitmap.setAlpha(value);
}
public Rect getBounds()
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableDpad.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableDpad.java
index 3d422aeb8a..1af45c5ac3 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableDpad.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableDpad.java
@@ -186,6 +186,8 @@ public final class InputOverlayDrawableDpad
public void setOpacity(int value)
{
mDefaultStateBitmap.setAlpha(value);
+ mPressedOneDirectionStateBitmap.setAlpha(value);
+ mPressedTwoDirectionsStateBitmap.setAlpha(value);
}
public Rect getBounds()
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableJoystick.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableJoystick.java
index a9917e8e07..83ed506356 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableJoystick.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableJoystick.java
@@ -255,8 +255,20 @@ public final class InputOverlayDrawableJoystick
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()