diff options
| author | nicolasroard <nicolasroard@google.com> | 2012-11-28 17:17:35 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-28 17:17:36 -0800 |
| commit | 91287749301c41b8ae8a827350b040384b9c0217 (patch) | |
| tree | 3f28fce5791454d56a51389a4c2e4e86461558ff /src/com | |
| parent | 9174643f1e0004e7240ed4d49877dc207c47acf3 (diff) | |
| parent | 800cb2eb683643df5816ef5000b9cedaa8a98b88 (diff) | |
| download | android_packages_apps_Snap-91287749301c41b8ae8a827350b040384b9c0217.tar.gz android_packages_apps_Snap-91287749301c41b8ae8a827350b040384b9c0217.tar.bz2 android_packages_apps_Snap-91287749301c41b8ae8a827350b040384b9c0217.zip | |
Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/ui/ImageCurves.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java index c4ca900e1..405524862 100644 --- a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java +++ b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java @@ -43,6 +43,7 @@ public class ImageCurves extends ImageSlave { private boolean mDidAddPoint = false; private boolean mDidDelete = false; private ControlPoint mCurrentControlPoint = null; + private int mCurrentPick = -1; private ImagePreset mLastPreset = null; int[] redHistogram = new int[256]; int[] greenHistogram = new int[256]; @@ -186,6 +187,7 @@ public class ImageCurves extends ImageSlave { if (e.getActionMasked() == MotionEvent.ACTION_UP) { mCurrentControlPoint = null; + mCurrentPick = -1; updateCachedImage(); mDidAddPoint = false; if (mDidDelete) { @@ -205,8 +207,9 @@ public class ImageCurves extends ImageSlave { } Spline spline = getSpline(mCurrentCurveIndex); - int pick = pickControlPoint(posX, posY); + int pick = mCurrentPick; if (mCurrentControlPoint == null) { + pick = pickControlPoint(posX, posY); if (pick == -1) { mCurrentControlPoint = new ControlPoint(posX, posY); pick = spline.addPoint(mCurrentControlPoint); @@ -214,6 +217,7 @@ public class ImageCurves extends ImageSlave { } else { mCurrentControlPoint = spline.getPoint(pick); } + mCurrentPick = pick; } if (spline.isPointContained(posX, pick)) { |