diff options
author | John Hoford <hoford@google.com> | 2013-09-04 13:53:29 -0700 |
---|---|---|
committer | John Hoford <hoford@google.com> | 2013-09-04 15:32:48 -0700 |
commit | 805a7fe57da2534462f4720abc7fe9cdb8f7ecc9 (patch) | |
tree | efa0acc6f903b493270d65da774a91e717cb5163 /src/com/android/gallery3d/filtershow/imageshow | |
parent | ec1f915006e5ec2db8be633b5d3d73e568951da4 (diff) | |
download | android_packages_apps_Gallery2-805a7fe57da2534462f4720abc7fe9cdb8f7ecc9.tar.gz android_packages_apps_Gallery2-805a7fe57da2534462f4720abc7fe9cdb8f7ecc9.tar.bz2 android_packages_apps_Gallery2-805a7fe57da2534462f4720abc7fe9cdb8f7ecc9.zip |
put back shade in crop and straighten
Change-Id: I046d98ea61f93d00131eaa7e7058a16bc1be0adc
Diffstat (limited to 'src/com/android/gallery3d/filtershow/imageshow')
-rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java | 1 | ||||
-rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java | 13 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java index b6e964163..4b0399128 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java @@ -313,6 +313,7 @@ public class ImageCrop extends ImageShow { if (mDisplayCropMatrix.mapRect(mScreenCropBounds)) { // Draw crop rect and markers CropDrawingUtils.drawCropRect(canvas, mScreenCropBounds); + CropDrawingUtils.drawShade(canvas, mScreenCropBounds); CropDrawingUtils.drawRuleOfThird(canvas, mScreenCropBounds); CropDrawingUtils.drawIndicators(canvas, mCropIndicator, mIndicatorSize, mScreenCropBounds, mCropObj.isFixedAspect(), diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java b/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java index 92cdadb8b..e00e55293 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java @@ -28,7 +28,7 @@ import android.graphics.RectF; import android.util.AttributeSet; import android.view.MotionEvent; -import com.android.gallery3d.app.Log; +import com.android.gallery3d.filtershow.crop.CropDrawingUtils; import com.android.gallery3d.filtershow.editors.EditorStraighten; import com.android.gallery3d.filtershow.filters.FilterCropRepresentation; import com.android.gallery3d.filtershow.filters.FilterRepresentation; @@ -44,6 +44,7 @@ public class ImageStraighten extends ImageShow { private float mBaseAngle = 0; private float mAngle = 0; private float mInitialAngle = 0; + private static final int NBLINES = 16; private boolean mFirstDrawSinceUp = false; private EditorStraighten mEditorStraighten; private FilterStraightenRepresentation mLocalRep = new FilterStraightenRepresentation(); @@ -243,15 +244,15 @@ public class ImageStraighten extends ImageShow { mLocalRep.setStraighten(mAngle); mFirstDrawSinceUp = false; } - + CropDrawingUtils.drawShade(canvas, mDrawRect); // Draw the grid if (mState == MODES.MOVE) { canvas.save(); canvas.clipRect(mDrawRect); - int n = 16; - float step = viewWidth / n; + + float step = Math.max(viewWidth,viewWidth) / NBLINES; float p = 0; - for (int i = 1; i < n; i++) { + for (int i = 1; i < NBLINES; i++) { p = i * step; mPaint.setAlpha(60); canvas.drawLine(p, 0, p, viewHeight, mPaint); @@ -264,6 +265,8 @@ public class ImageStraighten extends ImageShow { mPaint.setStyle(Style.STROKE); mPaint.setStrokeWidth(3); mDrawPath.reset(); + + mDrawPath.addRect(mDrawRect, Path.Direction.CW); canvas.drawPath(mDrawPath, mPaint); } |