diff options
author | Ruben Brunk <rubenbrunk@google.com> | 2013-04-01 14:41:45 -0700 |
---|---|---|
committer | Ruben Brunk <rubenbrunk@google.com> | 2013-04-01 14:42:33 -0700 |
commit | ebe79e4f32a6d8871e49fc91c45a3ef2d61e7f9a (patch) | |
tree | 748165ecd101eeb5fc8a2ce59f1c6d0dee945210 /src/com/android/gallery3d/filtershow/imageshow | |
parent | 8034eec63a1d84450d1841844a9294a10d14ba6d (diff) | |
download | android_packages_apps_Snap-ebe79e4f32a6d8871e49fc91c45a3ef2d61e7f9a.tar.gz android_packages_apps_Snap-ebe79e4f32a6d8871e49fc91c45a3ef2d61e7f9a.tar.bz2 android_packages_apps_Snap-ebe79e4f32a6d8871e49fc91c45a3ef2d61e7f9a.zip |
Added apply UI callbacks for rotate/mirror operations.
Change-Id: I30bfb439d742248c3241742bd11f64a1b4a22640
Diffstat (limited to 'src/com/android/gallery3d/filtershow/imageshow')
-rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/ImageFlip.java | 16 | ||||
-rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java | 9 |
2 files changed, 24 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageFlip.java b/src/com/android/gallery3d/filtershow/imageshow/ImageFlip.java index 70637a30c..15197b055 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageFlip.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageFlip.java @@ -58,6 +58,22 @@ public class ImageFlip extends ImageGeometry { return (rot / 90) % 2 != 0; } + public void flip() { + FLIP flip = getLocalFlip(); + boolean next = true; + // Picks next flip in order from enum FLIP (wrapping) + for (FLIP f : FLIP.values()) { + if (next) { + mNextFlip = f; + next = false; + } + if (f.equals(flip)) { + next = true; + } + } + setLocalFlip(mNextFlip); + } + @Override protected void setActionMove(float x, float y) { super.setActionMove(x, y); diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java b/src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java index c4b9aa27d..ab8023e02 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java @@ -54,6 +54,13 @@ public class ImageRotate extends ImageGeometry { mAngle = (mBaseAngle - angle) % 360; } + public void rotate() { + mAngle += 90; + mAngle = snappedAngle(mAngle); + mAngle %= 360; + setLocalRotation(mAngle); + } + @Override protected void setActionDown(float x, float y) { super.setActionDown(x, y); @@ -76,7 +83,7 @@ public class ImageRotate extends ImageGeometry { } @Override - protected int getLocalValue() { + public int getLocalValue() { return constrainedRotation(snappedAngle(getLocalRotation())); } |