Fixed bug in text input
This commit is contained in:
@@ -68,6 +68,7 @@ echo "If the URL in in the form ':dir/file.dat:http://URL/' it will be downloade
|
|||||||
echo "If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir -"
|
echo "If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir -"
|
||||||
echo "these files are put inside .apk package by build system"
|
echo "these files are put inside .apk package by build system"
|
||||||
echo "Also please avoid 'https://' URLs, many Android devices do not have trust certificates and will fail to connect to SF.net over HTTPS"
|
echo "Also please avoid 'https://' URLs, many Android devices do not have trust certificates and will fail to connect to SF.net over HTTPS"
|
||||||
|
echo " "
|
||||||
echo "`echo $AppDataDownloadUrl | tr '^' '\\n'`"
|
echo "`echo $AppDataDownloadUrl | tr '^' '\\n'`"
|
||||||
echo
|
echo
|
||||||
AppDataDownloadUrl1=""
|
AppDataDownloadUrl1=""
|
||||||
|
|||||||
@@ -269,7 +269,7 @@ public class MainActivity extends Activity {
|
|||||||
if ((sendBackspace && event.getAction() == KeyEvent.ACTION_UP) && (keyCode == KeyEvent.KEYCODE_DEL || keyCode == KeyEvent.KEYCODE_CLEAR))
|
if ((sendBackspace && event.getAction() == KeyEvent.ACTION_UP) && (keyCode == KeyEvent.KEYCODE_DEL || keyCode == KeyEvent.KEYCODE_CLEAR))
|
||||||
{
|
{
|
||||||
synchronized(textInput) {
|
synchronized(textInput) {
|
||||||
DemoRenderer.nativeTextInput( 8, 8 ); // Send backspace to native code
|
DemoRenderer.nativeTextInput( 8, 0 ); // Send backspace to native code
|
||||||
}
|
}
|
||||||
return false; // and proceed to delete text in keyboard input field
|
return false; // and proceed to delete text in keyboard input field
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
ballfield
|
ufoai
|
||||||
@@ -1613,7 +1613,7 @@ extern void SDL_ANDROID_MainThreadPushText( int ascii, int unicode )
|
|||||||
deferredTextIdx2 = 0;
|
deferredTextIdx2 = 0;
|
||||||
deferredText[deferredTextIdx2].down = SDL_PRESSED;
|
deferredText[deferredTextIdx2].down = SDL_PRESSED;
|
||||||
deferredText[deferredTextIdx2].scancode = SDLK_LSHIFT;
|
deferredText[deferredTextIdx2].scancode = SDLK_LSHIFT;
|
||||||
deferredText[deferredTextIdx2].unicode = SDLK_LSHIFT;
|
deferredText[deferredTextIdx2].unicode = 0;
|
||||||
}
|
}
|
||||||
deferredTextIdx2++;
|
deferredTextIdx2++;
|
||||||
if( deferredTextIdx2 >= DEFERRED_TEXT_COUNT )
|
if( deferredTextIdx2 >= DEFERRED_TEXT_COUNT )
|
||||||
@@ -1635,7 +1635,7 @@ extern void SDL_ANDROID_MainThreadPushText( int ascii, int unicode )
|
|||||||
deferredTextIdx2 = 0;
|
deferredTextIdx2 = 0;
|
||||||
deferredText[deferredTextIdx2].down = SDL_RELEASED;
|
deferredText[deferredTextIdx2].down = SDL_RELEASED;
|
||||||
deferredText[deferredTextIdx2].scancode = SDLK_LSHIFT;
|
deferredText[deferredTextIdx2].scancode = SDLK_LSHIFT;
|
||||||
deferredText[deferredTextIdx2].unicode = SDLK_LSHIFT;
|
deferredText[deferredTextIdx2].unicode = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
SDL_mutexV(deferredTextMutex);
|
SDL_mutexV(deferredTextMutex);
|
||||||
|
|||||||
Reference in New Issue
Block a user