early-access version 3626

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/RunnableSetting.kt

@@ -6,6 +6,7 @@ package org.yuzu.yuzu_emu.features.settings.model.view
 class RunnableSetting(
     titleId: Int,
     descriptionId: Int,
+    val isRuntimeRunnable: Boolean,
     val runnable: () -> Unit
 ) : SettingsItem(null, titleId, descriptionId) {
     override val type = TYPE_RUNNABLE

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt

@@ -115,7 +115,8 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
             add(
                 RunnableSetting(
                     R.string.reset_to_default,
-                    0
+                    0,
+                    false
                 ) {
                     ResetSettingsDialogFragment().show(
                         settingsActivity.supportFragmentManager,

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/RunnableViewHolder.kt

@@ -4,6 +4,7 @@
 package org.yuzu.yuzu_emu.features.settings.ui.viewholder
 
 import android.view.View
+import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.databinding.ListItemSettingBinding
 import org.yuzu.yuzu_emu.features.settings.model.view.RunnableSetting
 import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
@@ -25,7 +26,9 @@ class RunnableViewHolder(val binding: ListItemSettingBinding, adapter: SettingsA
     }
 
     override fun onClick(clicked: View) {
-        setting.runnable.invoke()
+        if (!setting.isRuntimeRunnable && !NativeLibrary.isRunning()) {
+            setting.runnable.invoke()
+        }
     }
 
     override fun onLongClick(clicked: View): Boolean {

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

@@ -354,12 +354,23 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
             v.setPadding(left, cutInsets.top, right, 0)
 
-            binding.showFpsText.setPadding(
-                cutInsets.left,
-                cutInsets.top,
-                cutInsets.right,
-                cutInsets.bottom
-            )
+            // Ensure FPS text doesn't get cut off by rounded display corners
+            val sidePadding = resources.getDimensionPixelSize(R.dimen.spacing_xtralarge)
+            if (cutInsets.left == 0) {
+                binding.showFpsText.setPadding(
+                    sidePadding,
+                    cutInsets.top,
+                    cutInsets.right,
+                    cutInsets.bottom
+                )
+            } else {
+                binding.showFpsText.setPadding(
+                    cutInsets.left,
+                    cutInsets.top,
+                    cutInsets.right,
+                    cutInsets.bottom
+                )
+            }
             windowInsets
         }
     }

src/android/app/src/main/res/layout/fragment_emulation.xml

@@ -32,11 +32,13 @@
             android:id="@+id/show_fps_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="left"
             android:clickable="false"
             android:focusable="false"
             android:shadowColor="@android:color/black"
             android:textColor="@android:color/white"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            tools:ignore="RtlHardcoded" />
 
         <Button
             style="@style/Widget.Material3.Button.ElevatedButton"

src/android/app/src/main/res/values/styles.xml

@@ -22,6 +22,7 @@
         <item name="colorPrimary">@color/yuzu_primaryContainer</item>
         <item name="colorSurface">@color/yuzu_primaryContainer</item>
         <item name="colorSecondary">@color/yuzu_primary</item>
+        <item name="android:textColorLink">@color/yuzu_primary</item>
         <item name="buttonBarPositiveButtonStyle">@style/YuzuButton</item>
         <item name="buttonBarNegativeButtonStyle">@style/YuzuButton</item>
         <item name="buttonBarNeutralButtonStyle">@style/YuzuButton</item>