From 3eb4f642da18e1d4510b251fb136344595456372 Mon Sep 17 00:00:00 2001
From: nicolasroard <nicolasroard@google.com>
Date: Fri, 5 Oct 2012 03:48:34 -0700
Subject: New UI...

bug:7289525
bug:7289361

Change-Id: Ifde15d57f0d307417a1c7a7ae9b1122be873558f
---
 .../filtershow/imageshow/ImageStraighten.java      | 29 +++++++++++++++++-----
 1 file changed, 23 insertions(+), 6 deletions(-)

(limited to 'src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java')

diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java b/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
index eb034bf10..99aa389ac 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
@@ -1,26 +1,24 @@
 
 package com.android.gallery3d.filtershow.imageshow;
 
-import com.android.gallery3d.filtershow.presets.ImagePreset;
-
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Path;
-import android.graphics.Rect;
 import android.graphics.RectF;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.MotionEvent;
 
+import com.android.gallery3d.filtershow.presets.ImagePreset;
+
 public class ImageStraighten extends ImageSlave {
     private float mImageRotation = 0;
     private float mImageRotationZoomFactor = 0;
 
-    private float mMinAngle = -45;
-    private float mMaxAngle = 45;
+    private final float mMinAngle = -45;
+    private final float mMaxAngle = 45;
     private float mBaseAngle = 0;
     private float mAngle = 0;
     private float mCenterX;
@@ -69,6 +67,7 @@ public class ImageStraighten extends ImageSlave {
     public void setActionUp() {
         mMode = MODES.UP;
         updatePreset();
+        invalidate();
     }
 
     public void setNoAction() {
@@ -81,6 +80,16 @@ public class ImageStraighten extends ImageSlave {
         setImagePreset(copy);
     }
 
+    @Override
+    public void resetParameter() {
+        super.resetParameter();
+        mImageRotation = 0;
+        mAngle = 0;
+        updatePreset();
+        invalidate();
+    }
+
+    @Override
     public boolean onTouchEvent(MotionEvent event) {
         switch (event.getActionMasked()) {
             case (MotionEvent.ACTION_DOWN):
@@ -97,6 +106,9 @@ public class ImageStraighten extends ImageSlave {
         }
         mImageRotation = mAngle;
         updateAngle();
+        if (getPanelController() != null) {
+            getPanelController().onNewValue((int) mImageRotation);
+        }
         invalidate();
         return true;
     }
@@ -124,11 +136,16 @@ public class ImageStraighten extends ImageSlave {
 
     // ///////////////////////////////////////////////////////////////////////////
 
+    @Override
     public void onNewValue(int value) {
         mImageRotation = value;
+        if (getPanelController() != null) {
+            getPanelController().onNewValue(value);
+        }
         invalidate();
     }
 
+    @Override
     public void onDraw(Canvas canvas) {
         mCenterX = getWidth() / 2;
         mCenterY = getHeight() / 2;
-- 
cgit v1.2.3