android: Have input overlay follow player 1 style index (#13085)

This commit is contained in:
Charles Lombardo 2024-02-19 16:47:21 -05:00 committed by GitHub
parent 8d5473e67c
commit f567a41f53
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -28,6 +28,7 @@ import org.yuzu.yuzu_emu.features.input.NativeInput
import org.yuzu.yuzu_emu.R import org.yuzu.yuzu_emu.R
import org.yuzu.yuzu_emu.features.input.model.NativeAnalog import org.yuzu.yuzu_emu.features.input.model.NativeAnalog
import org.yuzu.yuzu_emu.features.input.model.NativeButton import org.yuzu.yuzu_emu.features.input.model.NativeButton
import org.yuzu.yuzu_emu.features.input.model.NpadStyleIndex
import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting
import org.yuzu.yuzu_emu.features.settings.model.IntSetting import org.yuzu.yuzu_emu.features.settings.model.IntSetting
import org.yuzu.yuzu_emu.overlay.model.OverlayControl import org.yuzu.yuzu_emu.overlay.model.OverlayControl
@ -99,11 +100,9 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
} }
var shouldUpdateView = false var shouldUpdateView = false
val playerIndex = val playerIndex = when (NativeInput.getStyleIndex(0)) {
if (NativeInput.isHandheldOnly()) { NpadStyleIndex.Handheld -> 8
NativeInput.ConsoleDevice else -> 0
} else {
NativeInput.Player1Device
} }
for (button in overlayButtons) { for (button in overlayButtons) {