From 728455e9573bb891517b0b25f4153f5ea091eb8d Mon Sep 17 00:00:00 2001 From: pelya Date: Sun, 2 Mar 2014 00:34:46 +0200 Subject: [PATCH] Do not send mujltitouch gestures when third mouse butto nis pressed --- project/jni/application/xserver-gimp/AndroidAppSettings.cfg | 4 ++-- project/jni/sdl-1.2/src/video/android/SDL_androidinput.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project/jni/application/xserver-gimp/AndroidAppSettings.cfg b/project/jni/application/xserver-gimp/AndroidAppSettings.cfg index 51204e5a8..3ea13fcc2 100644 --- a/project/jni/application/xserver-gimp/AndroidAppSettings.cfg +++ b/project/jni/application/xserver-gimp/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="GIMP Inkscape" AppFullName=org.gimp.inkscape # Application version code (integer) -AppVersionCode=28213 +AppVersionCode=28214 # Application user-visible version name (string) -AppVersionName="2.8.2.13" +AppVersionName="2.8.2.14" # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c index 17e56ea36..f056f6ffe 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c @@ -307,7 +307,7 @@ static void ProcessMultitouchGesture( int x, int y, int action, int pointerId ) multitouchGestureMiddleX = -1; multitouchGestureMiddleY = -1; } - else if( !hardwareMouseDetected ) + else if( !hardwareMouseDetected && !(SDL_GetMouseState(NULL, NULL) & SDL_BUTTON_MMASK) ) { if( firstMousePointerId != pointerId ) {