eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 60 Projects 1 Releases Packages Wiki Activity Actions

Update src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
All checks were successful
eden-license / license-header (pull_request) Successful in 40s
Details

Browse source
This commit is contained in:
xbzk 2025-09-12 02:24:25 +02:00
parent ec5078dd3f
commit aa4fac61a1
1 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
View file

@ -810,28 +810,26 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
override fun onConfigurationChanged(newConfig: Configuration) { override fun onConfigurationChanged(newConfig: Configuration) {
super.onConfigurationChanged(newConfig) super.onConfigurationChanged(newConfig)
if (_binding == null) { val b = _binding ?: return
return
}
updateScreenLayout() updateScreenLayout()
val showInputOverlay = BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean() val showInputOverlay = BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean()
if (emulationActivity?.isInPictureInPictureMode == true) { if (emulationActivity?.isInPictureInPictureMode == true) {
if (binding.drawerLayout.isOpen) { if (b.drawerLayout.isOpen) {
binding.drawerLayout.close() b.drawerLayout.close()
} }
if (showInputOverlay) { if (showInputOverlay) {
binding.surfaceInputOverlay.setVisible(visible = false, gone = false) b.surfaceInputOverlay.setVisible(visible = false, gone = false)
} }
} else { } else {
binding.surfaceInputOverlay.setVisible( b.surfaceInputOverlay.setVisible(
showInputOverlay && emulationViewModel.emulationStarted.value showInputOverlay && emulationViewModel.emulationStarted.value
) )
if (!isInFoldableLayout) { if (!isInFoldableLayout) {
if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) { if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
binding.surfaceInputOverlay.layout = OverlayLayout.Portrait b.surfaceInputOverlay.layout = OverlayLayout.Portrait
} else { } else {
binding.surfaceInputOverlay.layout = OverlayLayout.Landscape b.surfaceInputOverlay.layout = OverlayLayout.Landscape
} }
} }
} }
@ -907,16 +905,15 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
// If the overlay is enabled, we need to update the position if changed
val position = IntSetting.PERF_OVERLAY_POSITION.getInt()
updateStatsPosition(position)
val socPosition = IntSetting.SOC_OVERLAY_POSITION.getInt() val b = _binding ?: return
updateSocPosition(socPosition) updateStatsPosition(IntSetting.PERF_OVERLAY_POSITION.getInt())
updateSocPosition(IntSetting.SOC_OVERLAY_POSITION.getInt())
binding.inGameMenu.post { if (this::emulationState.isInitialized) {
emulationState?.isPaused?.let { paused -> b.inGameMenu.post {
updatePauseMenuEntry(paused) if (!this::emulationState.isInitialized || _binding == null) return@post
updatePauseMenuEntry(emulationState.isPaused)
} }
} }
} }
@ -1232,6 +1229,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
} }
private fun updateScreenLayout() { private fun updateScreenLayout() {
val b = _binding ?: return
val verticalAlignment = val verticalAlignment =
EmulationVerticalAlignment.from(IntSetting.VERTICAL_ALIGNMENT.getInt()) EmulationVerticalAlignment.from(IntSetting.VERTICAL_ALIGNMENT.getInt())
val aspectRatio = when (IntSetting.RENDERER_ASPECT_RATIO.getInt()) { val aspectRatio = when (IntSetting.RENDERER_ASPECT_RATIO.getInt()) {
@ -1243,35 +1241,37 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
} }
when (verticalAlignment) { when (verticalAlignment) {
EmulationVerticalAlignment.Top -> { EmulationVerticalAlignment.Top -> {
binding.surfaceEmulation.setAspectRatio(aspectRatio) b.surfaceEmulation.setAspectRatio(aspectRatio)
val params = FrameLayout.LayoutParams( val params = FrameLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT ViewGroup.LayoutParams.WRAP_CONTENT
) )
params.gravity = Gravity.TOP or Gravity.CENTER_HORIZONTAL params.gravity = Gravity.TOP or Gravity.CENTER_HORIZONTAL
binding.surfaceEmulation.layoutParams = params b.surfaceEmulation.layoutParams = params
} }
EmulationVerticalAlignment.Center -> { EmulationVerticalAlignment.Center -> {
binding.surfaceEmulation.setAspectRatio(null) b.surfaceEmulation.setAspectRatio(null)
binding.surfaceEmulation.updateLayoutParams { b.surfaceEmulation.updateLayoutParams {
width = ViewGroup.LayoutParams.MATCH_PARENT width = ViewGroup.LayoutParams.MATCH_PARENT
height = ViewGroup.LayoutParams.MATCH_PARENT height = ViewGroup.LayoutParams.MATCH_PARENT
} }
} }
EmulationVerticalAlignment.Bottom -> { EmulationVerticalAlignment.Bottom -> {
binding.surfaceEmulation.setAspectRatio(aspectRatio) b.surfaceEmulation.setAspectRatio(aspectRatio)
val params = val params =
FrameLayout.LayoutParams( FrameLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT ViewGroup.LayoutParams.WRAP_CONTENT
) )
params.gravity = Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL params.gravity = Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL
binding.surfaceEmulation.layoutParams = params b.surfaceEmulation.layoutParams = params
} }
} }
emulationState.updateSurface() if (this::emulationState.isInitialized) {
emulationState.updateSurface()
}
emulationActivity?.buildPictureInPictureParams() emulationActivity?.buildPictureInPictureParams()
updateOrientation() updateOrientation()
} }