diff options
| author | xbzk <xbzk@eden-emu.dev> | 2025-10-13 15:37:41 +0200 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2025-10-13 15:37:41 +0200 |
| commit | 56e2dbc6198125bbc26ff7aef11a0c0e435400d4 (patch) | |
| tree | 9589f2b9f50ec3183d0b9c6e96294a5ee3f316ea /src/android | |
| parent | a3ef2cc1838a007a2f424e88212aa6f1eb93eab3 (diff) | |
added barriers against zero valued overlayControlData.individualScale (#2721)
Some recent change already in master caused some @android users to reach a state in which they were missing individualScale value to some input overlay controls.
I was affected, and some fella in #tester-chat even shared a video.
These 3 new barriers makes eden ignore individualScales if they're zeroed (feeding 1f instead), avoiding the crash, and allowing users to further adjust controls scales.
Safe and functional.
Co-authored-by: Allison Cunha <allisonbzk@gmail.com>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2721
Reviewed-by: Lizzie <lizzie@eden-emu.dev>
Reviewed-by: Shinmegumi <shinmegumi@eden-emu.dev>
Co-authored-by: xbzk <xbzk@eden-emu.dev>
Co-committed-by: xbzk <xbzk@eden-emu.dev>
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt index 9f050a5053..256e5968d1 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt @@ -1039,7 +1039,7 @@ class InputOverlay(context: Context, attrs: AttributeSet?) : scale /= 100f // Apply individual scale - scale *= overlayControlData.individualScale + scale *= overlayControlData.individualScale.let { if (it > 0f) it else 1f } // Initialize the InputOverlayDrawableButton. val defaultStateBitmap = getBitmap(context, defaultResId, scale) @@ -1114,7 +1114,7 @@ class InputOverlay(context: Context, attrs: AttributeSet?) : // Apply individual scale if (dpadData != null) { - scale *= dpadData.individualScale + scale *= dpadData.individualScale.let { if (it > 0f) it else 1f } } // Initialize the InputOverlayDrawableDpad. @@ -1191,7 +1191,7 @@ class InputOverlay(context: Context, attrs: AttributeSet?) : scale /= 100f // Apply individual scale - scale *= overlayControlData.individualScale + scale *= overlayControlData.individualScale.let { if (it > 0f) it else 1f } // Initialize the InputOverlayDrawableJoystick. val bitmapOuter = getBitmap(context, resOuter, scale) |