libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 13:50:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ANDROID: Menu key on virtual keyboard is system menu now

Browse Source 
Before it was a Media Top Menu key and did nothing
This commit is contained in:
antoniou 2020-11-26 14:42:04 +02:00
parent 2c56ec0aad
commit 60e7ea79d2
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backends/platform/android/org/scummvm/scummvm/CustomKeyboardView.java
View File

@ -882,6 +882,7 @@ public class CustomKeyboardView extends View implements View.OnClickListener {
}
private void detectAndSendKey(int index, int x, int y, long eventTime, boolean isRepeated, boolean isReleaseKey) {
//Log.d(ScummVM.LOG_TAG, "CustomKeyboardView:: index =" + index + "isRelease: "+ isReleaseKey);
if (index != NOT_A_KEY && index < mKeys.length) {
final CustomKeyboard.CustomKey key = mKeys[index];
if (key.text != null) {

5
backends/platform/android/org/scummvm/scummvm/ScummVMEventsBase.java
View File

@ -171,7 +171,7 @@ public class ScummVMEventsBase implements
// default:
// actionStr = e.toString();
// }
// Log.d(ScummVM.LOG_TAG, "SCUMMV-EVENTS-BASE - onKEY:::" + keyCode + " Action::" + actionStr + " View:: " + actionView); // Called
// Log.d(ScummVM.LOG_TAG, "SCUMMV-EVENTS-BASE - onKEY:::" + keyCode + " Action::" + actionStr); // Called
final int action = e.getAction();
@ -216,7 +216,7 @@ public class ScummVMEventsBase implements
}
}
if (e.isSystem()) {
if (e.isSystem() || keyCode == KeyEvent.KEYCODE_MENU) {
// no repeats for system keys
if (e.getRepeatCount() > 0) {
return false;
@ -356,6 +356,7 @@ public class ScummVMEventsBase implements
}
//_scummvm.displayMessageOnOSD("GetKey: " + keyCode + " unic=" + eventUnicodeChar+ " arg3= " + (eventUnicodeChar& KeyCharacterMap.COMBINING_ACCENT_MASK) + " meta: " + e.getMetaState());
//Log.d(ScummVM.LOG_TAG,"GetKey: " + keyCode + " unic=" + eventUnicodeChar+ " arg3= " + (eventUnicodeChar& KeyCharacterMap.COMBINING_ACCENT_MASK) + " meta: " + e.getMetaState());
// look in events.cpp for how this is handled
_scummvm.pushEvent(type,

2
dists/android/res/xml/qwerty_alt.xml
View File

@ -52,7 +52,7 @@
<CustomKey scummvm:codes="57" scummvm:keyLabel="Alt" scummvm:isSticky="true"/>
<CustomKey scummvm:codes="58" scummvm:keyLabel="Alt" scummvm:isSticky="true"/>
<CustomKey scummvm:codes="118" scummvm:keyLabel="Meta" scummvm:isSticky="true"/>
<CustomKey scummvm:codes="226" scummvm:keyLabel="Menu" scummvm:isRepeatable="true"/>
<CustomKey scummvm:codes="82" scummvm:keyLabel="Menu" scummvm:isRepeatable="true"/>
<CustomKey scummvm:codes="114" scummvm:keyLabel="Ctrl" scummvm:isSticky="true"/>
<CustomKey scummvm:codes="60" scummvm:keyLabel="Shift" scummvm:isSticky="true"/>
</CustomRow>