summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Lombardo <clombardo169@gmail.com>2023-04-04 19:10:17 +0200
committerbunnei <bunneidev@gmail.com>2023-06-03 09:05:49 +0200
commitbebc822334bf0e974b161771acec720956acac46 (patch)
treeadbf70a22871fd8529e429b4dcb0312c1fb74030
parentandroid: Make hash and branch accessible from BuildConfig (diff)
downloadyuzu-bebc822334bf0e974b161771acec720956acac46.tar
yuzu-bebc822334bf0e974b161771acec720956acac46.tar.gz
yuzu-bebc822334bf0e974b161771acec720956acac46.tar.bz2
yuzu-bebc822334bf0e974b161771acec720956acac46.tar.lz
yuzu-bebc822334bf0e974b161771acec720956acac46.tar.xz
yuzu-bebc822334bf0e974b161771acec720956acac46.tar.zst
yuzu-bebc822334bf0e974b161771acec720956acac46.zip
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt7
-rw-r--r--src/android/app/src/main/res/menu/menu_overlay_options.xml5
-rw-r--r--src/android/app/src/main/res/values/strings.xml1
3 files changed, 13 insertions, 0 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 1d4641d5c..79383b1dd 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
@@ -222,6 +222,8 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
popup.menuInflater.inflate(R.menu.menu_overlay_options, popup.menu)
+ popup.menu.findItem(R.id.menu_rel_stick_center).isChecked = EmulationMenuSettings.joystickRelCenter
+
popup.setOnMenuItemClickListener {
when (it.itemId) {
R.id.menu_edit_overlay -> {
@@ -259,6 +261,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
true
}
+ R.id.menu_rel_stick_center -> {
+ it.isChecked = !it.isChecked
+ EmulationMenuSettings.joystickRelCenter = it.isChecked
+ true
+ }
R.id.menu_reset_overlay -> {
binding.drawerLayout.close()
resetInputOverlay()
diff --git a/src/android/app/src/main/res/menu/menu_overlay_options.xml b/src/android/app/src/main/res/menu/menu_overlay_options.xml
index b9341c508..151f305fb 100644
--- a/src/android/app/src/main/res/menu/menu_overlay_options.xml
+++ b/src/android/app/src/main/res/menu/menu_overlay_options.xml
@@ -10,6 +10,11 @@
android:title="@string/emulation_toggle_controls" />
<item
+ android:id="@+id/menu_rel_stick_center"
+ android:title="@string/emulation_rel_stick_center"
+ android:checkable="true" />
+
+ <item
android:id="@+id/menu_reset_overlay"
android:title="@string/emulation_touch_overlay_reset" />
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index 98a06c45d..441d88978 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -87,6 +87,7 @@
<string name="emulation_exit">Exit Emulation</string>
<string name="emulation_done">Done</string>
<string name="emulation_toggle_controls">Toggle Controls</string>
+ <string name="emulation_rel_stick_center">Relative Stick Center</string>
<string name="emulation_toggle_all">Toggle All</string>
<string name="emulation_control_scale">Adjust Scale</string>
<string name="emulation_touch_overlay_reset">Reset Overlay</string>