From f34535f3626549a7cb527d6ecd98251195cd7a5e Mon Sep 17 00:00:00 2001 From: Abandoned Cart Date: Tue, 13 Jun 2023 06:36:48 -0400 Subject: [PATCH] android: Display FPS with emulation on hinge --- .../yuzu_emu/fragments/EmulationFragment.kt | 6 +---- .../main/res/layout/fragment_emulation.xml | 24 +++++++++---------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt index 2f1a16f00c..7db89aef00 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt @@ -327,8 +327,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback { onConfigurationChanged(resources.configuration) } - private val Number.toPx get() = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, this.toFloat(), Resources.getSystem().displayMetrics).toInt() - private fun updateFoldableLayout(emulationActivity: EmulationActivity, newLayoutInfo: WindowLayoutInfo) { val isFolding = (newLayoutInfo.displayFeatures.find { it is FoldingFeature } as? FoldingFeature)?.let { if (it.isSeparating) { @@ -336,8 +334,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback { if (it.orientation == FoldingFeature.Orientation.HORIZONTAL) { binding.emulationContainer.layoutParams.height = it.bounds.top // Prevent touch regions from being displayed in the hinge - binding.overlayContainer.layoutParams.height = it.bounds.bottom - 48.toPx - binding.overlayContainer.updatePadding(0, 0, 0, 24.toPx) + binding.overlayContainer.layoutParams.height = it.bounds.bottom binding.inGameMenu.layoutParams.height = it.bounds.bottom isInFoldableLayout = true binding.surfaceInputOverlay.setOrientation(InputOverlay.FOLDABLE) @@ -349,7 +346,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback { if (!isFolding) { binding.emulationContainer.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT binding.overlayContainer.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT - binding.overlayContainer.updatePadding(0, 0, 0, 0) binding.inGameMenu.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT isInFoldableLayout = false updateScreenLayout() diff --git a/src/android/app/src/main/res/layout/fragment_emulation.xml b/src/android/app/src/main/res/layout/fragment_emulation.xml index 01f6b9fe48..ffe5f48822 100644 --- a/src/android/app/src/main/res/layout/fragment_emulation.xml +++ b/src/android/app/src/main/res/layout/fragment_emulation.xml @@ -26,6 +26,18 @@ android:focusable="false" android:focusableInTouchMode="false" /> + + - -