diff options
Diffstat (limited to 'src')
5 files changed, 14 insertions, 2 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 79383b1dd..c7e44a0fb 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 | |||
| @@ -223,6 +223,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback { | |||
| 223 | popup.menuInflater.inflate(R.menu.menu_overlay_options, popup.menu) | 223 | popup.menuInflater.inflate(R.menu.menu_overlay_options, popup.menu) |
| 224 | 224 | ||
| 225 | popup.menu.findItem(R.id.menu_rel_stick_center).isChecked = EmulationMenuSettings.joystickRelCenter | 225 | popup.menu.findItem(R.id.menu_rel_stick_center).isChecked = EmulationMenuSettings.joystickRelCenter |
| 226 | popup.menu.findItem(R.id.menu_dpad_slide).isChecked = EmulationMenuSettings.dpadSlide | ||
| 226 | 227 | ||
| 227 | popup.setOnMenuItemClickListener { | 228 | popup.setOnMenuItemClickListener { |
| 228 | when (it.itemId) { | 229 | when (it.itemId) { |
| @@ -266,6 +267,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback { | |||
| 266 | EmulationMenuSettings.joystickRelCenter = it.isChecked | 267 | EmulationMenuSettings.joystickRelCenter = it.isChecked |
| 267 | true | 268 | true |
| 268 | } | 269 | } |
| 270 | R.id.menu_dpad_slide -> { | ||
| 271 | it.isChecked = !it.isChecked | ||
| 272 | EmulationMenuSettings.dpadSlide = it.isChecked | ||
| 273 | true | ||
| 274 | } | ||
| 269 | R.id.menu_reset_overlay -> { | 275 | R.id.menu_reset_overlay -> { |
| 270 | binding.drawerLayout.close() | 276 | binding.drawerLayout.close() |
| 271 | resetInputOverlay() | 277 | resetInputOverlay() |
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt index 97e0ba3df..7bff0a9cd 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt | |||
| @@ -127,7 +127,7 @@ class InputOverlay(context: Context, attrs: AttributeSet?) : SurfaceView(context | |||
| 127 | } | 127 | } |
| 128 | 128 | ||
| 129 | for (dpad in overlayDpads) { | 129 | for (dpad in overlayDpads) { |
| 130 | if (!dpad.updateStatus(event, EmulationMenuSettings.dpadSlideEnable)) { | 130 | if (!dpad.updateStatus(event, EmulationMenuSettings.dpadSlide)) { |
| 131 | continue | 131 | continue |
| 132 | } | 132 | } |
| 133 | NativeLibrary.onGamePadButtonEvent( | 133 | NativeLibrary.onGamePadButtonEvent( |
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.kt index e51ac1cc1..021698d15 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 | |||
| @@ -26,7 +26,7 @@ object EmulationMenuSettings { | |||
| 26 | .putBoolean(Settings.PREF_MENU_SETTINGS_JOYSTICK_REL_CENTER, value) | 26 | .putBoolean(Settings.PREF_MENU_SETTINGS_JOYSTICK_REL_CENTER, value) |
| 27 | .apply() | 27 | .apply() |
| 28 | } | 28 | } |
| 29 | var dpadSlideEnable: Boolean | 29 | var dpadSlide: Boolean |
| 30 | get() = preferences.getBoolean(Settings.PREF_MENU_SETTINGS_DPAD_SLIDE, true) | 30 | get() = preferences.getBoolean(Settings.PREF_MENU_SETTINGS_DPAD_SLIDE, true) |
| 31 | set(value) { | 31 | set(value) { |
| 32 | preferences.edit() | 32 | preferences.edit() |
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 151f305fb..36c710f14 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 | |||
| @@ -15,6 +15,11 @@ | |||
| 15 | android:checkable="true" /> | 15 | android:checkable="true" /> |
| 16 | 16 | ||
| 17 | <item | 17 | <item |
| 18 | android:id="@+id/menu_dpad_slide" | ||
| 19 | android:title="@string/emulation_dpad_slide" | ||
| 20 | android:checkable="true" /> | ||
| 21 | |||
| 22 | <item | ||
| 18 | android:id="@+id/menu_reset_overlay" | 23 | android:id="@+id/menu_reset_overlay" |
| 19 | android:title="@string/emulation_touch_overlay_reset" /> | 24 | android:title="@string/emulation_touch_overlay_reset" /> |
| 20 | 25 | ||
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index 441d88978..70bff5749 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml | |||
| @@ -88,6 +88,7 @@ | |||
| 88 | <string name="emulation_done">Done</string> | 88 | <string name="emulation_done">Done</string> |
| 89 | <string name="emulation_toggle_controls">Toggle Controls</string> | 89 | <string name="emulation_toggle_controls">Toggle Controls</string> |
| 90 | <string name="emulation_rel_stick_center">Relative Stick Center</string> | 90 | <string name="emulation_rel_stick_center">Relative Stick Center</string> |
| 91 | <string name="emulation_dpad_slide">DPad Slide</string> | ||
| 91 | <string name="emulation_toggle_all">Toggle All</string> | 92 | <string name="emulation_toggle_all">Toggle All</string> |
| 92 | <string name="emulation_control_scale">Adjust Scale</string> | 93 | <string name="emulation_control_scale">Adjust Scale</string> |
| 93 | <string name="emulation_touch_overlay_reset">Reset Overlay</string> | 94 | <string name="emulation_touch_overlay_reset">Reset Overlay</string> |