miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL: increased on-screen keyboard to 12 keys

Browse Source
This commit is contained in:
Sergii Pylypenko
2021-05-23 03:12:03 +03:00
parent cc6cebb094
commit 5e27a1f850
8 changed files with 232 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
project/java/SettingsMenuKeyboard.java
View File

@@ -386,26 +386,22 @@ class SettingsMenuKeyboard extends SettingsMenu
p.getResources().getString(R.string.remap_screenkb_button) + " 4",
p.getResources().getString(R.string.remap_screenkb_button) + " 5",
p.getResources().getString(R.string.remap_screenkb_button) + " 6",
p.getResources().getString(R.string.remap_screenkb_joystick) + " 2",
p.getResources().getString(R.string.remap_screenkb_joystick) + " 3",
p.getResources().getString(R.string.remap_screenkb_button) + " 7",
p.getResources().getString(R.string.remap_screenkb_button) + " 8",
p.getResources().getString(R.string.remap_screenkb_button) + " 9",
p.getResources().getString(R.string.remap_screenkb_button) + " 10",
p.getResources().getString(R.string.remap_screenkb_button) + " 11",
p.getResources().getString(R.string.remap_screenkb_button) + " 12",
};
boolean defaults[] = Arrays.copyOf(Globals.ScreenKbControlsShown, Globals.ScreenKbControlsShown.length);
if( Globals.AppUsesSecondJoystick )
{
items = Arrays.copyOf(items, items.length + 1);
items[items.length - 1] = p.getResources().getString(R.string.remap_screenkb_joystick) + " 2";
defaults = Arrays.copyOf(defaults, defaults.length + 1);
defaults[defaults.length - 1] = true;
}
if( Globals.AppUsesThirdJoystick )
{
items = Arrays.copyOf(items, items.length + 1);
items[items.length - 1] = p.getResources().getString(R.string.remap_screenkb_joystick) + " 3";
defaults = Arrays.copyOf(defaults, defaults.length + 1);
defaults[defaults.length - 1] = true;
}
for( int i = 0; i < Math.min(6, Globals.AppTouchscreenKeyboardKeysNames.length); i++ )
items[i+2] = items[i+2] + " - " + Globals.AppTouchscreenKeyboardKeysNames[i].replace("_", " ");
for( int i = 6; i < Math.min(12, Globals.AppTouchscreenKeyboardKeysNames.length); i++ )
items[i+4] = items[i+4] + " - " + Globals.AppTouchscreenKeyboardKeysNames[i].replace("_", " ");
AlertDialog.Builder builder = new AlertDialog.Builder(p);
builder.setTitle(p.getResources().getString(R.string.remap_screenkb));
@@ -445,9 +441,15 @@ class SettingsMenuKeyboard extends SettingsMenu
p.getResources().getString(R.string.remap_screenkb_button) + " 4",
p.getResources().getString(R.string.remap_screenkb_button) + " 5",
p.getResources().getString(R.string.remap_screenkb_button) + " 6",
p.getResources().getString(R.string.remap_screenkb_button) + " 7",
p.getResources().getString(R.string.remap_screenkb_button) + " 8",
p.getResources().getString(R.string.remap_screenkb_button) + " 9",
p.getResources().getString(R.string.remap_screenkb_button) + " 10",
p.getResources().getString(R.string.remap_screenkb_button) + " 11",
p.getResources().getString(R.string.remap_screenkb_button) + " 12",
};
for( int i = 0; i < Math.min(6, Globals.AppTouchscreenKeyboardKeysNames.length); i++ )
for( int i = 0; i < Math.min(12, Globals.AppTouchscreenKeyboardKeysNames.length); i++ )
items[i] = items[i] + " - " + Globals.AppTouchscreenKeyboardKeysNames[i].replace("_", " ");
if( currentButton >= Globals.RemapScreenKbKeycode.length )
@@ -657,7 +659,13 @@ class SettingsMenuKeyboard extends SettingsMenu
R.drawable.b5,
R.drawable.b6,
R.drawable.dpad,
R.drawable.dpad
R.drawable.dpad,
R.drawable.b1,
R.drawable.b2,
R.drawable.b3,
R.drawable.b4,
R.drawable.b5,
R.drawable.b6,
};
int oldX = 0, oldY = 0;
boolean resizing = false;
@@ -780,6 +788,10 @@ class SettingsMenuKeyboard extends SettingsMenu
buttonText = "Joystick 2";
if( i == 9 )
buttonText = "Joystick 3";
if( i >= 10 && i <= 15 )
buttonText = p.getResources().getString(R.string.remap_screenkb_button) + (i - 4);
if( i >= 10 && i - 4 < Globals.AppTouchscreenKeyboardKeysNames.length )
buttonText = Globals.AppTouchscreenKeyboardKeysNames[i - 4].replace("_", " ");
p.setText(p.getResources().getString(R.string.screenkb_custom_layout_help) + "\n" + buttonText);
}
@@ -879,7 +891,7 @@ class SettingsMenuKeyboard extends SettingsMenu
p.getResources().getString(R.string.screenkb_floating_joystick),
};
boolean defaults[] = {
boolean defaults[] = {
Globals.FloatingScreenJoystick,
};