From fd7578a86249332ae4020ab60954e5e32f691fb0 Mon Sep 17 00:00:00 2001 From: Aaron Culliney Date: Wed, 13 Apr 2016 19:50:03 -0700 Subject: [PATCH] Always show touch joystick azimuth (if we're rendering the joystick axis) --- .../apple2ix/Apple2JoystickSettingsMenu.java | 35 ------------------- src/prefs.h | 1 - src/video/gltouchjoy.c | 2 +- 3 files changed, 1 insertion(+), 37 deletions(-) diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2JoystickSettingsMenu.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2JoystickSettingsMenu.java index 6e416308..caa66fbb 100644 --- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2JoystickSettingsMenu.java +++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2JoystickSettingsMenu.java @@ -426,41 +426,6 @@ public class Apple2JoystickSettingsMenu extends Apple2AbstractMenu { return convertView; } }, - JOYSTICK_AZIMUTH_VISIBILITY { - @Override - public final String getTitle(Apple2Activity activity) { - return activity.getResources().getString(R.string.joystick_azimuth_visible); - } - - @Override - public final String getSummary(Apple2Activity activity) { - return activity.getResources().getString(R.string.joystick_azimuth_visible_summary); - } - - @Override - public String getPrefKey() { - return "showAzimuth"; - } - - @Override - public Object getPrefDefault() { - return true; - } - - @Override - public View getView(final Apple2Activity activity, View convertView) { - final IMenuEnum self = this; - convertView = _basicView(activity, this, convertView); - CheckBox cb = _addCheckbox(activity, this, convertView, (boolean) Apple2Preferences.getJSONPref(this)); - cb.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - Apple2Preferences.setJSONPref(self, isChecked); - } - }); - return convertView; - } - }, JOYSTICK_AXIS_ON_LEFT { @Override public final String getTitle(Apple2Activity activity) { diff --git a/src/prefs.h b/src/prefs.h index e1a6b963..8f7023d8 100644 --- a/src/prefs.h +++ b/src/prefs.h @@ -62,7 +62,6 @@ #define PREF_KPAD_TOUCHDOWN_SCAN "kpTouchDownScancode" #define PREF_SCREEN_DIVISION "screenDivider" #define PREF_SHOW_CONTROLS "showControls" -#define PREF_SHOW_AZIMUTH "showAzimuth" #define PREF_SWITCH_THRESHOLD "switchThreshold" // keyboard diff --git a/src/video/gltouchjoy.c b/src/video/gltouchjoy.c index 0e6123a2..90fe2766 100644 --- a/src/video/gltouchjoy.c +++ b/src/video/gltouchjoy.c @@ -865,7 +865,7 @@ static void gltouchjoy_applyPrefs(void) { } joyglobals.showControls = prefs_parseBoolValue (PREF_DOMAIN_JOYSTICK, PREF_SHOW_CONTROLS, &bVal) ? bVal : true; - joyglobals.showAzimuth = prefs_parseBoolValue (PREF_DOMAIN_JOYSTICK, PREF_SHOW_AZIMUTH, &bVal) ? bVal : true; + joyglobals.showAzimuth = true;//prefs_parseBoolValue (PREF_DOMAIN_JOYSTICK, PREF_SHOW_AZIMUTH, &bVal) ? bVal : true; joyglobals.switchThreshold = prefs_parseLongValue (PREF_DOMAIN_JOYSTICK, PREF_SWITCH_THRESHOLD, &lVal, 10) ? lVal : BUTTON_SWITCH_THRESHOLD_DEFAULT; joyglobals.screenDivider = prefs_parseFloatValue(PREF_DOMAIN_JOYSTICK, PREF_SCREEN_DIVISION, &fVal) ? fVal : 0.5f; joyglobals.axisIsOnLeft = prefs_parseBoolValue (PREF_DOMAIN_JOYSTICK, PREF_AXIS_ON_LEFT, &bVal) ? bVal : true;