diff options
| author | Léo Lam <leo@leolam.fr> | 2021-06-24 01:36:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-24 01:36:02 +0200 |
| commit | 4979974a57c06ae605e43555f6cfe96e3472d12b (patch) | |
| tree | 91175abc3a3efdc9bd2ef16fcc70d80d87d7d2e6 /Source/Android/app/src/main/java | |
| parent | 9476733a80e014dd415d103f755ed5c7d9f73ebe (diff) | |
| parent | d33efc37af5d7d13d0342d2de3922202289b7a8a (diff) | |
Merge pull request #9828 from JosJuice/android-pressed-opacity
Android: Apply opacity setting to pressed buttons too
Diffstat (limited to 'Source/Android/app/src/main/java')
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() |