From 7eb0bb2170120e42bfd12984375109e466a0b08a Mon Sep 17 00:00:00 2001
From: Kleidis <167202775+kleidis@users.noreply.github.com>
Date: Wed, 5 Mar 2025 21:00:10 +0100
Subject: [PATCH] Readd frametime

---
 .../features/settings/model/BooleanSetting.kt          |  2 +-
 .../features/settings/ui/SettingsFragmentPresenter.kt  | 10 ++++++++++
 .../org/citra/citra_emu/fragments/EmulationFragment.kt | 10 ++++++++++
 src/android/app/src/main/res/values/strings.xml        |  2 ++
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/BooleanSetting.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/BooleanSetting.kt
index 1d523af54..d010ddbf1 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/BooleanSetting.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/BooleanSetting.kt
@@ -17,7 +17,7 @@ enum class BooleanSetting(
     INSTANT_DEBUG_LOG("instant_debug_log", Settings.SECTION_DEBUG, false),
     CUSTOM_LAYOUT("custom_layout",Settings.SECTION_LAYOUT,false),
     SHOW_FPS("show_fps", Settings.SECTION_LAYOUT, true),
-        SHOW_FRAMETIME("show_frame_time", Settings.SECTION_LAYOUT, false),
+    SHOW_FRAMETIME("show_frame_time", Settings.SECTION_LAYOUT, false),
     SHOW_SPEED("show_speed", Settings.SECTION_LAYOUT, false),
     SHOW_APP_RAM_USAGE("show_app_ram_usage", Settings.SECTION_LAYOUT, false),
     SHOW_SYSTEM_RAM_USAGE("show_system_ram_usage", Settings.SECTION_LAYOUT, false),
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt
index 0f3be01bb..35dee68c1 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt
@@ -1072,6 +1072,16 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                 )
             )
 
+            add(
+                SwitchSetting(
+                    BooleanSetting.SHOW_FRAMETIME,
+                    R.string.show_frametime,
+                    R.string.show_frametime_description,
+                    "show_frame_time",
+                    true
+                )
+            )
+
             add(
                 SwitchSetting(
                     BooleanSetting.SHOW_SPEED,
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt b/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt
index 04d393ddf..c232030f5 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt
@@ -1161,6 +1161,16 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
                         sb.append(String.format("FPS: %d", (perfStats[FPS] + 0.5).toInt()))
                     }
 
+                    if (BooleanSetting.SHOW_FRAMETIME.boolean) {
+                        if (sb.isNotEmpty()) sb.append(" | ")
+                        sb.append(
+                            String.format(
+                                "FT: %.1fms",
+                                (perfStats[FRAMETIME] * 1000.0f).toFloat()
+                            )
+                        )
+                    }
+
                     if (BooleanSetting.SHOW_SPEED.boolean) {
                         if (sb.isNotEmpty()) sb.append(" | ")
                         sb.append(
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index 51d96329c..ec50c6695 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -487,6 +487,8 @@
     <string name="stats_overlay_options_description">Configure what information is shown in the performance stats overlay</string>
     <string name="show_fps">Show FPS</string>
     <string name="show_fps_description">Display current frames per second</string>
+    <string name="show_frametime">Show Frametime</string>
+    <string name="show_frametime_description">Display current frametime</string>
     <string name="show_speed">Show Speed</string>
     <string name="show_speed_description">Display current emulation speed percentage</string>
     <string name="show_app_ram_usage">Show App Memory Usage</string>