diff options
| author | Charles Lombardo <clombardo169@gmail.com> | 2023-06-02 15:47:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-02 15:47:07 -0400 |
| commit | 6028c056444cb5d89d72377b1547adef084211e6 (patch) | |
| tree | be54aa34f2174ea8292f6dfe8839396659a3ed20 /Source/Android/app/src/main/java | |
| parent | 09dc764ff9bb6aba964d2126c1472069d19e90d3 (diff) | |
| parent | 3a81463e680a40868a12ce544360b3f02953f159 (diff) | |
Merge pull request #11868 from JosJuice/android-wiimote-submenu-number
Android: Fix submenus for Wii Remote 2-4
Diffstat (limited to 'Source/Android/app/src/main/java')
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) |