diff options
author | nicolasroard <nicolasroard@google.com> | 2013-02-26 18:14:39 -0800 |
---|---|---|
committer | nicolasroard <nicolasroard@google.com> | 2013-02-26 18:18:13 -0800 |
commit | 7c3ff29f5d187a9f8c660f8571a43f5a91b46836 (patch) | |
tree | 169cf50b436829a287e22609463f260620dc6df8 /src | |
parent | 076446478f0034de3b563b28f12c18cf62395d7a (diff) | |
download | android_packages_apps_Snap-7c3ff29f5d187a9f8c660f8571a43f5a91b46836.tar.gz android_packages_apps_Snap-7c3ff29f5d187a9f8c660f8571a43f5a91b46836.tar.bz2 android_packages_apps_Snap-7c3ff29f5d187a9f8c660f8571a43f5a91b46836.zip |
Fix vignette startup draw
Change-Id: Ifaab3167e44db05be6c788e10d234975b1f51b56
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/ImageVignette.java | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageVignette.java b/src/com/android/gallery3d/filtershow/imageshow/ImageVignette.java index a51d10276..f43ea6cad 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageVignette.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageVignette.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 The Android Open Source Project + * Copyright (C) 2013 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -88,14 +88,20 @@ public class ImageVignette extends ImageShow { setRepresentation(mVignetteRep); break; } - resetImageCaches(this); + computeEllipses(); invalidate(); - mEditorVignette.commitLocalRepresentation(); return true; } public void setRepresentation(FilterVignetteRepresentation vignetteRep) { mVignetteRep = vignetteRep; + computeEllipses(); + } + + public void computeEllipses() { + if (mVignetteRep == null) { + return; + } Matrix toImg = getScreenToImageMatrix(false); Matrix toScr = new Matrix(); toImg.invert(toScr); @@ -125,6 +131,7 @@ public class ImageVignette extends ImageShow { mElipse.setRadius(toScr.mapRadius(mVignetteRep.getRadiusX()), toScr.mapRadius(mVignetteRep.getRadiusY())); } + mEditorVignette.commitLocalRepresentation(); } public void setEditor(EditorVignette editorVignette) { @@ -132,11 +139,18 @@ public class ImageVignette extends ImageShow { } @Override + public void onSizeChanged(int w, int h, int oldw, int oldh) { + super.onSizeChanged(w, h, oldw, oldh); + computeEllipses(); + } + + @Override public void onDraw(Canvas canvas) { super.onDraw(canvas); - setRepresentation(mVignetteRep); + if (mVignetteRep == null) { + return; + } mElipse.draw(canvas); - } } |