Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d24fdf6a authored by nicolasroard's avatar nicolasroard Committed by Android (Google) Code Review
Browse files

Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches

parents 7a36d427 952144dd

src/com/android/gallery3d/filtershow/ui/ImageCurves.java

+5 −1
Original line number Diff line number Diff line
@@ -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)) {