summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2012-10-23 11:14:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-23 11:14:34 -0700
commitf3b39dd8427e68b5321b1cb3409b0bb01d6c4af2 (patch)
tree6e5eba333f640ffba587a4b43249fb142cce194f
parent0d6449b62b94c9a35a24dff093c4fe9d303f6ccd (diff)
parent3a6614628f8d33f8ce881d85355cebf2b9523252 (diff)
downloadandroid_packages_apps_Snap-f3b39dd8427e68b5321b1cb3409b0bb01d6c4af2.tar.gz
android_packages_apps_Snap-f3b39dd8427e68b5321b1cb3409b0bb01d6c4af2.tar.bz2
android_packages_apps_Snap-f3b39dd8427e68b5321b1cb3409b0bb01d6c4af2.zip
am ec995b6b: Fix slow / jerky tracking in Curves
* commit 'ec995b6bf6e2476e820b1e02d0d3a567b1ecb2fc': Fix slow / jerky tracking in Curves
-rw-r--r--src/com/android/gallery3d/filtershow/ui/ImageCurves.java4
-rw-r--r--src/com/android/gallery3d/filtershow/ui/Spline.java6
2 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
index 8f7560e10..4b289e757 100644
--- a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
+++ b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
@@ -202,14 +202,14 @@ public class ImageCurves extends ImageSlave {
}
if (spline.isPointContained(posX, pick)) {
- mCurrentControlPoint.x = posX;
- mCurrentControlPoint.y = posY;
spline.didMovePoint(mCurrentControlPoint);
+ spline.movePoint(pick, posX, posY);
} else if (pick != -1 && spline.getNbPoints() > 2) {
spline.deletePoint(pick);
mDidDelete = true;
}
updateCachedImage();
+ invalidate();
return true;
}
diff --git a/src/com/android/gallery3d/filtershow/ui/Spline.java b/src/com/android/gallery3d/filtershow/ui/Spline.java
index 67840dc23..90a7bf9ec 100644
--- a/src/com/android/gallery3d/filtershow/ui/Spline.java
+++ b/src/com/android/gallery3d/filtershow/ui/Spline.java
@@ -68,6 +68,12 @@ public class Spline {
mCurrentControlPoint = point;
}
+ public void movePoint(int pick, float x, float y) {
+ ControlPoint point = mPoints.elementAt(pick);
+ point.x = x;
+ point.y = y;
+ }
+
public boolean isOriginal() {
if (this.getNbPoints() > 2) {
return false;