diff options
| -rw-r--r-- | src/com/android/camera/ui/ZoomRenderer.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/camera/ui/ZoomRenderer.java b/src/com/android/camera/ui/ZoomRenderer.java index bddd5cc6a..f8a4b508e 100644 --- a/src/com/android/camera/ui/ZoomRenderer.java +++ b/src/com/android/camera/ui/ZoomRenderer.java @@ -41,7 +41,7 @@ public class ZoomRenderer extends OverlayRenderer private ScaleGestureDetector mDetector; private Paint mPaint; private Paint mTextPaint; - private int mCircleSize; + private float mCircleSize; private int mCenterX; private int mCenterY; private float mMaxCircle; @@ -86,7 +86,7 @@ public class ZoomRenderer extends OverlayRenderer } public void setZoom(int index) { - mCircleSize = (int) (mMinCircle + index * (mMaxCircle - mMinCircle) / (mMaxZoom - mMinZoom)); + mCircleSize = mMinCircle + index * (mMaxCircle - mMinCircle) / (mMaxZoom - mMinZoom); } public void setZoomValue(int value) { @@ -122,7 +122,7 @@ public class ZoomRenderer extends OverlayRenderer mCenterX - mMaxCircle - 4, mCenterY, mPaint); mPaint.setStrokeWidth(mOuterStroke); canvas.drawCircle((float) mCenterX, (float) mCenterY, - (float) mCircleSize, mPaint); + mCircleSize, mPaint); String txt = mZoomSig+"."+mZoomFraction+"x"; mTextPaint.getTextBounds(txt, 0, txt.length(), mTextBounds); canvas.drawText(txt, mCenterX - mTextBounds.centerX(), mCenterY - mTextBounds.centerY(), @@ -132,11 +132,11 @@ public class ZoomRenderer extends OverlayRenderer @Override public boolean onScale(ScaleGestureDetector detector) { final float sf = detector.getScaleFactor(); - float circle = (int) (mCircleSize * sf * sf); + float circle = mCircleSize * sf * sf; circle = Math.max(mMinCircle, circle); circle = Math.min(mMaxCircle, circle); - if (mListener != null && (int) circle != mCircleSize) { - mCircleSize = (int) circle; + if (mListener != null && circle != mCircleSize) { + mCircleSize = circle; int zoom = mMinZoom + (int) ((mCircleSize - mMinCircle) * (mMaxZoom - mMinZoom) / (mMaxCircle - mMinCircle)); mListener.onZoomValueChanged(zoom); } |