Citra-emu/citra-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: frontend: Fix default state for toggle controls, enable D-pad by default.

Browse Source
This commit is contained in:
bunnei 2019-07-22 21:22:33 -04:00
parent 5ae7096004
commit e296fe3fa0
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/android/app/src/main/java/org/citra/citra_android/activities/EmulationActivity.java
View File

@ -491,7 +491,17 @@ public final class EmulationActivity extends AppCompatActivity {
builder.setTitle(R.string.emulation_toggle_controls); builder.setTitle(R.string.emulation_toggle_controls);
for (int i = 0; i < enabledButtons.length; i++) { for (int i = 0; i < enabledButtons.length; i++) {
enabledButtons[i] = mPreferences.getBoolean("buttonToggle" + i, true); // Buttons that are disabled by default
boolean defaultValue = true;
switch (i) {
case 6: // ZL
case 7: // ZR
case 13: // C-stick
defaultValue = false;
break;
}
enabledButtons[i] = mPreferences.getBoolean("buttonToggle" + i, defaultValue);
} }
builder.setMultiChoiceItems(R.array.n3dsButtons, enabledButtons, builder.setMultiChoiceItems(R.array.n3dsButtons, enabledButtons,
(dialog, indexSelected, isChecked) -> editor (dialog, indexSelected, isChecked) -> editor

2
src/android/app/src/main/java/org/citra/citra_android/overlay/InputOverlay.java
View File

@ -648,7 +648,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener {
overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_home, overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_home,
R.drawable.button_home_pressed, ButtonType.BUTTON_HOME, orientation)); R.drawable.button_home_pressed, ButtonType.BUTTON_HOME, orientation));
} }
if (mPreferences.getBoolean("buttonToggle11", false)) { if (mPreferences.getBoolean("buttonToggle11", true)) {
overlayDpads.add(initializeOverlayDpad(getContext(), R.drawable.dpad, overlayDpads.add(initializeOverlayDpad(getContext(), R.drawable.dpad,
R.drawable.dpad_pressed_one_direction, R.drawable.dpad_pressed_one_direction,
R.drawable.dpad_pressed_two_directions, R.drawable.dpad_pressed_two_directions,