diff options
| author | nicolasroard <nicolasroard@google.com> | 2012-11-28 17:20:03 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-28 17:20:03 -0800 |
| commit | e0a22a0b12741680000b0570e0940d6602ddf003 (patch) | |
| tree | 7d64adbdd35aad7600e3a807ceef5ccb69ddec25 | |
| parent | 17b8c5174410b09ddeb4cdd0b50468a4bbab450c (diff) | |
| parent | d24fdf6ad148ffeb34a721d90e46d038f5a7b0da (diff) | |
| download | android_packages_apps_Gallery2-e0a22a0b12741680000b0570e0940d6602ddf003.tar.gz android_packages_apps_Gallery2-e0a22a0b12741680000b0570e0940d6602ddf003.tar.bz2 android_packages_apps_Gallery2-e0a22a0b12741680000b0570e0940d6602ddf003.zip | |
am d24fdf6a: Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches
* commit 'd24fdf6ad148ffeb34a721d90e46d038f5a7b0da':
Fix moving points in the Curves editor
| -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)) { |