From 21a7aa3a269dfb68a771e010c0554b68f88a1466 Mon Sep 17 00:00:00 2001
From: Ruben Brunk <rubenbrunk@google.com>
Date: Wed, 24 Oct 2012 18:24:34 -0700
Subject: Fix issue where aspect bounds don't get applied.

Bug: 7407937
Change-Id: Ie6484d6458657d6284e04de755a8cc1a912dfb6c
---
 src/com/android/gallery3d/filtershow/PanelController.java         | 4 ++++
 src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/com/android/gallery3d')

diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java
index 4ed2d0d3c..03a9d8bd5 100644
--- a/src/com/android/gallery3d/filtershow/PanelController.java
+++ b/src/com/android/gallery3d/filtershow/PanelController.java
@@ -41,6 +41,7 @@ import com.android.gallery3d.filtershow.filters.ImageFilterVibrance;
 import com.android.gallery3d.filtershow.filters.ImageFilterVignette;
 import com.android.gallery3d.filtershow.filters.ImageFilterWBalance;
 import com.android.gallery3d.filtershow.imageshow.ImageCrop;
+import com.android.gallery3d.filtershow.imageshow.ImageGeometry;
 import com.android.gallery3d.filtershow.imageshow.ImageShow;
 import com.android.gallery3d.filtershow.presets.ImagePreset;
 import com.android.gallery3d.filtershow.ui.FramedTextButton;
@@ -708,6 +709,9 @@ public class PanelController implements OnClickListener {
                 if (mMasterImage.getCurrentFilter() instanceof ImageFilterTinyPlanet) {
                     mActivity.saveImage();
                 } else {
+                    if (mCurrentImage instanceof ImageCrop) {
+                        ((ImageCrop) mCurrentImage).saveAndSetPreset();
+                    }
                     showPanel(mCurrentPanel);
                 }
                 break;
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java b/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
index af4290df9..f99e61473 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
@@ -361,7 +361,7 @@ public abstract class ImageGeometry extends ImageSlave {
         return "Geometry";
     }
 
-    protected void saveAndSetPreset() {
+    public void saveAndSetPreset() {
         ImagePreset lastHistoryItem = getHistory().getLast();
         if (lastHistoryItem != null && lastHistoryItem.historyName().equalsIgnoreCase(getName())) {
             getImagePreset().setGeometry(mLocalGeometry);
-- 
cgit v1.2.3