VERY experimental Nintendo Switch 2 emulator
C++
android: Fix fps counter not showing up
german772e0e20e86bd5
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.ktindex 18517bdf8e..3f6f39dff4 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@@ -33,6 +33,7 @@ import org.yuzu.yuzu_emu.model.Gameimport org.yuzu.yuzu_emu.utils.DirectoryInitializationimport org.yuzu.yuzu_emu.utils.DirectoryInitialization.DirectoryInitializationStateimport org.yuzu.yuzu_emu.utils.DirectoryStateReceiver+import org.yuzu.yuzu_emu.utils.EmulationMenuSettingsimport org.yuzu.yuzu_emu.utils.InsetsHelperimport org.yuzu.yuzu_emu.utils.Logimport org.yuzu.yuzu_emu.utils.SerializableHelper.parcelable@@ -221,8 +222,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram}private fun updateShowFpsOverlay() {- // TODO: Create a setting so that this actually works...- if (true) {+ if (EmulationMenuSettings.showFps) {val SYSTEM_FPS = 0val FPS = 1val FRAMETIME = 2@@ -238,6 +238,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram}}perfStatsUpdateHandler.post(perfStatsUpdater!!)+ binding.showFpsText.text = resources.getString(R.string.emulation_game_loading)binding.showFpsText.visibility = View.VISIBLE} else {if (perfStatsUpdater != null) {diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/EmulationMenuSettings.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/EmulationMenuSettings.ktindex 46690bee20..937f13fea5 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/EmulationMenuSettings.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/EmulationMenuSettings.kt@@ -46,7 +46,7 @@ object EmulationMenuSettings {.apply()}var showFps: Boolean- get() = preferences.getBoolean(Settings.PREF_MENU_SETTINGS_SHOW_FPS, false)+ get() = preferences.getBoolean(Settings.PREF_MENU_SETTINGS_SHOW_FPS, true)set(value) {preferences.edit().putBoolean(Settings.PREF_MENU_SETTINGS_SHOW_FPS, value)diff --git a/src/android/app/src/main/res/layout/fragment_emulation.xml b/src/android/app/src/main/res/layout/fragment_emulation.xmlindex b99c2e9c3c..68eedffe17 100644--- a/src/android/app/src/main/res/layout/fragment_emulation.xml+++ b/src/android/app/src/main/res/layout/fragment_emulation.xml@@ -20,6 +20,14 @@android:focusable="false"android:focusableInTouchMode="false" />+ <!-- This is the onscreen input overlay -->+ <org.yuzu.yuzu_emu.overlay.InputOverlay+ android:id="@+id/surface_input_overlay"+ android:layout_width="match_parent"+ android:layout_height="match_parent"+ android:focusable="true"+ android:focusableInTouchMode="true" />+<TextViewandroid:id="@+id/show_fps_text"android:layout_width="wrap_content"@@ -33,14 +41,6 @@android:textColor="@android:color/white"android:textSize="12sp" />- <!-- This is the onscreen input overlay -->- <org.yuzu.yuzu_emu.overlay.InputOverlay- android:id="@+id/surface_input_overlay"- android:layout_width="match_parent"- android:layout_height="match_parent"- android:focusable="true"- android:focusableInTouchMode="true" />-<Buttonstyle="@style/Widget.Material3.Button.ElevatedButton"android:id="@+id/done_control_config"diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xmlindex c471425f26..0014b2146f 100644--- a/src/android/app/src/main/res/values/strings.xml+++ b/src/android/app/src/main/res/values/strings.xml@@ -91,6 +91,7 @@<string name="emulation_pause">Pause Emulation</string><string name="emulation_unpause">Unpause Emulation</string><string name="emulation_input_overlay">Input Overlay</string>+ <string name="emulation_game_loading">Game loading…</string><string name="load_settings">Loading Settings…</string>