mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-25 04:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Return correct key code for delete/backspace on android.

Browse Source 
Also increased minimum Android API version to 14.
This commit is contained in:
Maximilian Wagenbach 2018-01-29 22:35:04 +01:00 committed by Lukas Dürrenberger
parent 66369645b5
commit 186294607f
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -104,8 +104,8 @@ endif()
# Android options # Android options
if(SFML_OS_ANDROID) if(SFML_OS_ANDROID)
# make sure there's the android library available # make sure there's the android library available
if (CMAKE_ANDROID_API LESS 9) if (CMAKE_ANDROID_API LESS 14)
message(FATAL_ERROR "Android API level (${CMAKE_ANDROID_API}) must be equal or greater than 9.") message(FATAL_ERROR "Android API level (${CMAKE_ANDROID_API}) must be equal or greater than 14.")
endif() endif()
# CMake doesn't support defining the STL to be used with Nsight Tegra, so warn the user # CMake doesn't support defining the STL to be used with Nsight Tegra, so warn the user

4
examples/android/AndroidManifest.xml
View File

@ -7,11 +7,11 @@
<uses-feature android:glEsVersion="0x00010001" /> <uses-feature android:glEsVersion="0x00010001" />
<uses-sdk android:minSdkVersion="9" <uses-sdk android:minSdkVersion="14"
android:targetSdkVersion="19" /> android:targetSdkVersion="19" />
<uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.VIBRATE" />
<application android:label="@string/app_name" <application android:label="@string/app_name"
android:icon="@drawable/sfml_logo" android:icon="@drawable/sfml_logo"
android:hasCode="false" android:hasCode="false"

2
examples/android/jni/Application.mk
View File

@ -1,5 +1,5 @@
NDK_TOOLCHAIN_VERSION := 4.9 NDK_TOOLCHAIN_VERSION := 4.9
APP_PLATFORM := android-9 APP_PLATFORM := android-14
APP_STL := c++_shared APP_STL := c++_shared
APP_ABI := armeabi-v7a APP_ABI := armeabi-v7a
APP_MODULES := sfml-activity sfml-example APP_MODULES := sfml-activity sfml-example

3
src/SFML/Window/Android/WindowImplAndroid.cpp
View File

@ -620,7 +620,8 @@ Keyboard::Key WindowImplAndroid::androidKeyToSF(int32_t key)
case AKEYCODE_EXPLORER: case AKEYCODE_EXPLORER:
case AKEYCODE_ENVELOPE: return Keyboard::Unknown; case AKEYCODE_ENVELOPE: return Keyboard::Unknown;
case AKEYCODE_ENTER: return Keyboard::Return; case AKEYCODE_ENTER: return Keyboard::Return;
case AKEYCODE_DEL: return Keyboard::Delete; case AKEYCODE_DEL: return Keyboard::BackSpace;
case AKEYCODE_FORWARD_DEL: return Keyboard::Delete;
case AKEYCODE_GRAVE: return Keyboard::Tilde; case AKEYCODE_GRAVE: return Keyboard::Tilde;
case AKEYCODE_MINUS: return Keyboard::Subtract; case AKEYCODE_MINUS: return Keyboard::Subtract;
case AKEYCODE_EQUALS: return Keyboard::Equal; case AKEYCODE_EQUALS: return Keyboard::Equal;