From 924146128735eab43340c293fdd77d1af3efe436 Mon Sep 17 00:00:00 2001 From: Ruben Brunk Date: Wed, 17 Oct 2012 03:52:25 -0700 Subject: Fixed flip (mirror) orientation. Bug: 7342859 Change-Id: Ic9508927738f64e82e1bd078461b6ee1e1892300 --- src/com/android/gallery3d/filtershow/imageshow/ImageFlip.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageFlip.java b/src/com/android/gallery3d/filtershow/imageshow/ImageFlip.java index 3408405dc..00b9aed16 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageFlip.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageFlip.java @@ -45,6 +45,11 @@ public class ImageFlip extends ImageGeometry { super.setActionDown(x, y); } + boolean hasRotated90(){ + int rot = constrainedRotation(getLocalRotation()); + return ((int) (rot / 90)) % 2 != 0; + } + @Override protected void setActionMove(float x, float y) { super.setActionMove(x, y); @@ -52,6 +57,11 @@ public class ImageFlip extends ImageGeometry { float diffx = mTouchCenterX - x; float diffy = mTouchCenterY - y; float flick = getScaledMinFlick(); + if(hasRotated90()){ + float temp = diffx; + diffx = diffy; + diffy = temp; + } if (Math.abs(diffx) >= flick) { // flick moving left/right FLIP flip = getLocalFlip(); -- cgit v1.2.3