diff options
| author | JosJuice <josjuice@gmail.com> | 2023-06-01 20:17:50 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2023-06-01 20:17:50 +0200 |
| commit | 3a81463e680a40868a12ce544360b3f02953f159 (patch) | |
| tree | fabb9c3e91a68038b2a27b094381450efd798318 /Source/Android/app/src/main/java/org | |
| parent | 6743ca8e098268e7a11f26d626a15a09bd342577 (diff) | |
Android: Fix submenus for Wii Remote 2-4
Accessing any of the submenus "Buttons", "Motion Simulation" or
"Motion Input" for Wii Remotes 2-4 would actually lead to the
corresponding submenu for Wii Remote 1.
Diffstat (limited to 'Source/Android/app/src/main/java/org')
2 files changed, 9 insertions, 1 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/MenuTag.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/MenuTag.kt index 38c162d6fd..6a5960e1e9 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/MenuTag.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/MenuTag.kt @@ -85,6 +85,14 @@ enum class MenuTag { val isWiimoteMenu: Boolean get() = this == WIIMOTE_1 || this == WIIMOTE_2 || this == WIIMOTE_3 || this == WIIMOTE_4 + val isWiimoteSubmenu: Boolean + get() = this == WIIMOTE_GENERAL_1 || this == WIIMOTE_GENERAL_2 || + this == WIIMOTE_GENERAL_3 || this == WIIMOTE_GENERAL_4 || + this == WIIMOTE_MOTION_SIMULATION_1 || this == WIIMOTE_MOTION_SIMULATION_2 || + this == WIIMOTE_MOTION_SIMULATION_3 || this == WIIMOTE_MOTION_SIMULATION_4 || + this == WIIMOTE_MOTION_INPUT_1 || this == WIIMOTE_MOTION_INPUT_2 || + this == WIIMOTE_MOTION_INPUT_3 || this == WIIMOTE_MOTION_INPUT_4 + val isWiimoteExtensionMenu: Boolean get() = this == WIIMOTE_EXTENSION_1 || this == WIIMOTE_EXTENSION_2 || this == WIIMOTE_EXTENSION_3 || this == WIIMOTE_EXTENSION_4 diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt index e119813183..8805916d7a 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt @@ -52,7 +52,7 @@ class SettingsFragmentPresenter( if (menuTag.isGCPadMenu || menuTag.isWiimoteExtensionMenu) { controllerNumber = menuTag.subType controllerType = extras.getInt(ARG_CONTROLLER_TYPE) - } else if (menuTag.isWiimoteMenu) { + } else if (menuTag.isWiimoteMenu || menuTag.isWiimoteSubmenu) { controllerNumber = menuTag.subType } else if (menuTag.isSerialPort1Menu) { serialPort1Type = extras.getInt(ARG_SERIALPORT1_TYPE) |