diff options
author | nicolasroard <nicolasroard@google.com> | 2013-02-28 13:45:14 -0800 |
---|---|---|
committer | nicolasroard <nicolasroard@google.com> | 2013-02-28 14:12:11 -0800 |
commit | 20b5ca5bfa5e07db5f909c0869d1c758c586d7d9 (patch) | |
tree | f3ec3d538688451f8b46eefb5c733b31febaefbd /src/com/android/gallery3d/filtershow/editors | |
parent | 67e00e042fab5f5234bfa7c33148724d9119b817 (diff) | |
download | android_packages_apps_Snap-20b5ca5bfa5e07db5f909c0869d1c758c586d7d9.tar.gz android_packages_apps_Snap-20b5ca5bfa5e07db5f909c0869d1c758c586d7d9.tar.bz2 android_packages_apps_Snap-20b5ca5bfa5e07db5f909c0869d1c758c586d7d9.zip |
Fix for applied ratios
Change-Id: Idbb7366522751c4b330cc99b88129df5808048e9
Diffstat (limited to 'src/com/android/gallery3d/filtershow/editors')
4 files changed, 28 insertions, 8 deletions
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorCrop.java b/src/com/android/gallery3d/filtershow/editors/EditorCrop.java index 0fbf48313..947fccb82 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorCrop.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorCrop.java @@ -29,7 +29,7 @@ public class EditorCrop extends Editor implements EditorInfo { private static final String LOGTAG = "EditorCrop"; ImageCrop mImageCrop; - private String mAspectString = null; + private String mAspectString = ""; private boolean mCropActionFlag = false; private CropExtras mCropExtras = null; @@ -40,13 +40,24 @@ public class EditorCrop extends Editor implements EditorInfo { @Override public void createEditor(Context context, FrameLayout frameLayout) { super.createEditor(context, frameLayout); - mView = mImageShow = mImageCrop = new ImageCrop(context); - mImageCrop.setExtras(mCropExtras); - mImageCrop.setAspectString(mAspectString); - mImageCrop.setCropActionFlag(mCropActionFlag); + if (mImageCrop == null) { + // TODO: need this for now because there's extra state in ImageCrop. + // all the state instead should be in the representation. + // Same thing for the other geometry editors. + mImageCrop = new ImageCrop(context); + } + mView = mImageShow = mImageCrop; mImageCrop.setImageLoader(MasterImage.getImage().getImageLoader()); mImageCrop.setEditor(this); mImageCrop.syncLocalToMasterGeometry(); + mImageCrop.setCropActionFlag(mCropActionFlag); + if (mCropActionFlag) { + mImageCrop.setExtras(mCropExtras); + mImageCrop.setAspectString(mAspectString); + mImageCrop.clear(); + } else { + mImageCrop.setExtras(null); + } } @Override diff --git a/src/com/android/gallery3d/filtershow/editors/EditorFlip.java b/src/com/android/gallery3d/filtershow/editors/EditorFlip.java index bc04c1113..94ab2ee29 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorFlip.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorFlip.java @@ -34,7 +34,10 @@ public class EditorFlip extends Editor implements EditorInfo { @Override public void createEditor(Context context, FrameLayout frameLayout) { super.createEditor(context, frameLayout); - mView = mImageShow = mImageFlip = new ImageFlip(context); + if (mImageFlip == null) { + mImageFlip = new ImageFlip(context); + } + mView = mImageShow = mImageFlip; mImageFlip.setImageLoader(MasterImage.getImage().getImageLoader()); mImageFlip.setEditor(this); mImageFlip.syncLocalToMasterGeometry(); diff --git a/src/com/android/gallery3d/filtershow/editors/EditorRotate.java b/src/com/android/gallery3d/filtershow/editors/EditorRotate.java index 1385ec8ab..0032399a3 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorRotate.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorRotate.java @@ -34,7 +34,10 @@ public class EditorRotate extends Editor implements EditorInfo { @Override public void createEditor(Context context, FrameLayout frameLayout) { super.createEditor(context, frameLayout); - mView = mImageShow = mImageRotate = new ImageRotate(context); + if (mImageRotate == null) { + mImageRotate = new ImageRotate(context); + } + mView = mImageShow = mImageRotate; mImageRotate.setImageLoader(MasterImage.getImage().getImageLoader()); mImageRotate.setEditor(this); mImageRotate.syncLocalToMasterGeometry(); diff --git a/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java b/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java index 092558998..46419704b 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java @@ -34,7 +34,10 @@ public class EditorStraighten extends Editor implements EditorInfo { @Override public void createEditor(Context context, FrameLayout frameLayout) { super.createEditor(context, frameLayout); - mView = mImageShow = mImageStraighten = new ImageStraighten(context); + if (mImageStraighten == null) { + mImageStraighten = new ImageStraighten(context); + } + mView = mImageShow = mImageStraighten; mImageStraighten.setImageLoader(MasterImage.getImage().getImageLoader()); mImageStraighten.setEditor(this); mImageStraighten.syncLocalToMasterGeometry(); |