diff options
author | nicolasroard <nicolasroard@google.com> | 2013-04-08 20:07:47 -0700 |
---|---|---|
committer | nicolasroard <nicolasroard@google.com> | 2013-04-08 20:08:05 -0700 |
commit | 1d728cf75969807b607838c77d2c8418462a92d6 (patch) | |
tree | 163315eeadf6d049ed0d892d02ad16b537cfd36e | |
parent | a5e47821f783cc14ba0ec3d3910af79dab3a870c (diff) | |
download | android_packages_apps_Snap-1d728cf75969807b607838c77d2c8418462a92d6.tar.gz android_packages_apps_Snap-1d728cf75969807b607838c77d2c8418462a92d6.tar.bz2 android_packages_apps_Snap-1d728cf75969807b607838c77d2c8418462a92d6.zip |
Fix crash in curves
Change-Id: Ic5b61b3a4653f718bf2e4327f3920b5f39162a49
-rw-r--r-- | src/com/android/gallery3d/filtershow/ui/ImageCurves.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java index e5ffd8b68..7b881c7f5 100644 --- a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java +++ b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java @@ -260,15 +260,22 @@ public class ImageCurves extends ImageShow { return true; } - float posX = e.getX() / getWidth(); - float posY = e.getY(); float margin = Spline.curveHandleSize() / 2; + float posX = e.getX(); + if (posX < margin) { + posX = margin; + } + float posY = e.getY(); if (posY < margin) { posY = margin; } + if (posX > getWidth() - margin) { + posX = getWidth() - margin; + } if (posY > getHeight() - margin) { posY = getHeight() - margin; } + posX = (posX - margin) / (getWidth() - 2 * margin); posY = (posY - margin) / (getHeight() - 2 * margin); if (e.getActionMasked() == MotionEvent.ACTION_UP) { |