am fd840084: am 1b227549: am 3e3e9e21: fix vignette dragged off screen

* commit 'fd8400841ff68ff4d10692b6addcfb0c37d6c17b':
  fix vignette dragged off screen

diff --git a/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java b/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java
index 8ceb375..068464c 100644 (file)
--- a/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java
@@ -22,6 +22,7 @@ import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.RadialGradient;
+import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Shader;
 
@@ -56,6 +57,7 @@ public class EclipseControl {
     public final static int HAN_SW = 4;
     public final static int HAN_WEST = 5;
     public final static int HAN_NW = 6;
+    private Rect mImageBounds;
 
     public EclipseControl(Context context) {
         mSliderColor = Color.WHITE;
@@ -96,8 +98,13 @@ public class EclipseControl {
         return -1;
     }
 
-    public void setScrToImageMatrix(Matrix scrToImg) {
+    public void setScrImageInfo(Matrix scrToImg, Rect imageBounds) {
         mScrToImg = scrToImg;
+        mImageBounds = new Rect(imageBounds);
+    }
+
+    private boolean centerIsOutside(float x1, float y1) {
+        return (!mImageBounds.contains((int) x1, (int)  y1));
     }
 
     public void actionDown(float x, float y, Oval oval) {
@@ -130,6 +137,9 @@ public class EclipseControl {
             case HAN_CENTER:
                 float ctrdx = mDownX - mDownCenterX;
                 float ctrdy = mDownY - mDownCenterY;
+                if (centerIsOutside(x - ctrdx, y - ctrdy)) {
+                    break;
+                }
                 oval.setCenter(x - ctrdx, y - ctrdy);
                 // setRepresentation(mVignetteRep);
                 break;

diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageVignette.java b/src/com/android/gallery3d/filtershow/imageshow/ImageVignette.java
index 518969e..039aea9 100644 (file)
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageVignette.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageVignette.java
@@ -71,7 +71,8 @@ public class ImageVignette extends ImageShow {
         float x = event.getX();
         float y = event.getY();
 
-        mElipse.setScrToImageMatrix(getScreenToImageMatrix(true));
+        mElipse.setScrImageInfo(getScreenToImageMatrix(true),
+                MasterImage.getImage().getOriginalBounds());
 
         boolean didComputeEllipses = false;
         switch (mask) {