Eden/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-02-04 02:51:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes joypad overlay autohide during holding actions (#3337)

Browse Source 
fixes joypad overlay autohide during holding actions

suppose holding right to move character. that wouldn't clear autohide countdown, and it also would deny other touches to do so.
i guess this was buried coz those who truly use joypad overlay don't use autohide.

Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3337
Reviewed-by: Maufeat <sahyno1996@gmail.com>
Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>
Co-authored-by: xbzk <xbzk@eden-emu.dev>
Co-committed-by: xbzk <xbzk@eden-emu.dev>
This commit is contained in:
xbzk
2026-01-18 16:11:31 +01:00
committed by crueter
parent 291b5febec
commit d72553f519
2 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
View File

@@ -134,6 +134,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
private var amiiboLoadJob: Job? = null
private var wasInputOverlayAutoHidden = false
private var overlayTouchActive = false
private val loadAmiiboLauncher =
registerForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
@@ -1123,6 +1124,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
super.onDestroyView()
amiiboLoadJob?.cancel()
amiiboLoadJob = null
_binding?.surfaceInputOverlay?.touchEventListener = null
_binding = null
isAmiiboPickerOpen = false
}
@@ -1173,10 +1175,10 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
}
binding.showStatsOverlayText.setVisible(showPerfOverlay)
if (showPerfOverlay) {
val SYSTEM_FPS = 0
//val SYSTEM_FPS = 0
val FPS = 1
val FRAMETIME = 2
val SPEED = 3
//val SPEED = 3
val sb = StringBuilder()
perfStatsUpdater = {
if (emulationViewModel.emulationStarted.value &&
@@ -2000,46 +2002,63 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
handler.postDelayed({
if (showInputOverlay && isAdded && _binding != null) {
autoHideOverlay()
if (overlayTouchActive) {
startOverlayAutoHideTimer(seconds)
} else {
autoHideOverlay()
}
}
}, seconds * 1000L)
}
fun handleScreenTap(isLongTap: Boolean) {
if (!isAdded || _binding == null) return
if (binding.surfaceInputOverlay.isGamelessMode()) return
val shouldProceed = BooleanSetting.ENABLE_INPUT_OVERLAY_AUTO_HIDE.getBoolean()
if (!shouldProceed) return
if (!BooleanSetting.ENABLE_INPUT_OVERLAY_AUTO_HIDE.getBoolean()) return
// failsafe
val autoHideSeconds = IntSetting.INPUT_OVERLAY_AUTO_HIDE.getInt()
if (autoHideSeconds == 0) {
toggleOverlay(true)
return
} else {
val showInputOverlay = BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean()
if (!showInputOverlay && !isLongTap && wasInputOverlayAutoHidden) {
toggleOverlay(true)
}
startOverlayAutoHideTimer(autoHideSeconds)
}
val showInputOverlay = BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean()
if (!showInputOverlay && !isLongTap && wasInputOverlayAutoHidden) {
toggleOverlay(true)
}
startOverlayAutoHideTimer(autoHideSeconds)
}
private fun initializeOverlayAutoHide() {
if (binding.surfaceInputOverlay.isGamelessMode()) {
return
}
if (!isAdded || _binding == null) return
if (binding.surfaceInputOverlay.isGamelessMode()) return
val autoHideSeconds = IntSetting.INPUT_OVERLAY_AUTO_HIDE.getInt()
val autoHideEnabled = BooleanSetting.ENABLE_INPUT_OVERLAY_AUTO_HIDE.getBoolean()
val showInputOverlay = BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean()
if (autoHideEnabled && showInputOverlay) {
toggleOverlay(true)
startOverlayAutoHideTimer(autoHideSeconds)
}
binding.surfaceInputOverlay.touchEventListener = { event ->
when (event.actionMasked) {
MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> {
overlayTouchActive = true
handler.removeCallbacksAndMessages(null)
}
MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP -> {
overlayTouchActive = event.pointerCount > 1
if (!overlayTouchActive) handleScreenTap(isLongTap = false)
}
MotionEvent.ACTION_CANCEL -> {
overlayTouchActive = false
handleScreenTap(isLongTap = false)
}
MotionEvent.ACTION_MOVE -> {
overlayTouchActive = true
}
}
}
}
private fun autoHideOverlay() {
@@ -2048,6 +2067,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
}
fun toggleOverlay(enable: Boolean) {
if (!isAdded || _binding == null) return
if (enable == !BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean()) {
// Reset controller input flag so controller can hide overlay again
if (!enable) {

7
src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt
View File

@@ -73,6 +73,9 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
var layout = OverlayLayout.Landscape
// External listener for EmulationFragment joypad overlay auto-hide
var touchEventListener: ((MotionEvent) -> Unit)? = null
override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
super.onLayout(changed, left, top, right, bottom)
@@ -138,6 +141,10 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
}
override fun onTouch(v: View, event: MotionEvent): Boolean {
try {
touchEventListener?.invoke(event)
} catch (e: Exception) {}
if (inEditMode) {
return onTouchWhileEditing(event)
}