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 | 1fe7caeeaab314cd70d0b54f8f3dd3225c71c081 (patch) | |
| tree | 985fa63bf37bc7e3cee9a58f58fa48259698dec9 | |
| parent | 166524339e9f8ad86c0922142b961776e0da3d8f (diff) | |
| download | android_packages_apps_Gallery2-1fe7caeeaab314cd70d0b54f8f3dd3225c71c081.tar.gz android_packages_apps_Gallery2-1fe7caeeaab314cd70d0b54f8f3dd3225c71c081.tar.bz2 android_packages_apps_Gallery2-1fe7caeeaab314cd70d0b54f8f3dd3225c71c081.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) { |