summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2012-10-17 09:34:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-17 09:34:11 -0700
commit36e2c62408eb9529e7c0db086508cd37efab3a3f (patch)
tree98930544f12beca8a96e067288bdd8dca06387a6
parent786b545019145ff4e4bafc45e281ced11c3d0960 (diff)
parent178a1c115552a22526fb3a263a01c3cc66300328 (diff)
downloadandroid_packages_apps_Gallery2-36e2c62408eb9529e7c0db086508cd37efab3a3f.tar.gz
android_packages_apps_Gallery2-36e2c62408eb9529e7c0db086508cd37efab3a3f.tar.bz2
android_packages_apps_Gallery2-36e2c62408eb9529e7c0db086508cd37efab3a3f.zip
am 178a1c11: Fixed flip (mirror) orientation.
* commit '178a1c115552a22526fb3a263a01c3cc66300328': Fixed flip (mirror) orientation.
-rw-r--r--src/com/android/gallery3d/filtershow/imageshow/ImageFlip.java10
1 files changed, 10 insertions, 0 deletions
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();