aboutsummaryrefslogtreecommitdiffhomepage
path: root/android_sample/SampleApp/jni
diff options
context:
space:
mode:
authorGravatar Scroggo <Scroggo@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-06-22 13:26:56 +0000
committerGravatar Scroggo <Scroggo@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-06-22 13:26:56 +0000
commitd3aed39ab1ad88b05b9423ee1329c227d1f8f612 (patch)
tree47960b4de36c6188aa8374e89cef85e078b5ebe0 /android_sample/SampleApp/jni
parent1eeaf0ba2381f84ffd889f56303cbe0d1886bb21 (diff)
Unify handleTouch and handleClick in SampleApp.
Allow each sample to handle clicks in Android SampleApp. Remove SampleWindow::handleTouch. Allow an SkWindow to have multiple clicks. Add an owner pointer to SkView::Click. Reviewed at http://codereview.appspot.com/4643052/ git-svn-id: http://skia.googlecode.com/svn/trunk@1673 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'android_sample/SampleApp/jni')
-rw-r--r--android_sample/SampleApp/jni/sample-jni.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/android_sample/SampleApp/jni/sample-jni.cpp b/android_sample/SampleApp/jni/sample-jni.cpp
index ffda03d796..d602c07395 100644
--- a/android_sample/SampleApp/jni/sample-jni.cpp
+++ b/android_sample/SampleApp/jni/sample-jni.cpp
@@ -210,7 +210,7 @@ JNIEXPORT void JNICALL Java_com_skia_sampleapp_SampleApp_handleClick(JNIEnv* env
SkDebugf("motion event ignored\n");
return;
}
- gWindow->handleTouch(owner, x, y, state);
+ gWindow->handleClick(x, y, state, (void*) owner);
}
JNIEXPORT void JNICALL Java_com_skia_sampleapp_SampleApp_updateSize(JNIEnv* env,