diff options
Diffstat (limited to 'src/com/android/camera/ViewImage.java')
| -rw-r--r-- | src/com/android/camera/ViewImage.java | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/src/com/android/camera/ViewImage.java b/src/com/android/camera/ViewImage.java index 07d396f..f6d0744 100644 --- a/src/com/android/camera/ViewImage.java +++ b/src/com/android/camera/ViewImage.java @@ -341,9 +341,19 @@ public class ViewImage extends Activity implements View.OnClickListener return (oldScale != getScale()); } - public void onSimpleZoom(boolean zoomIn) { - if (zoomIn) zoomIn(); - else zoomOut(); + public void onSimpleZoom(boolean zoomIn, int centerX, int centerY) { + // First move centerX/centerY to the center of the view. + int deltaX = getWidth() / 2 - centerX; + int deltaY = getHeight() / 2 - centerY; + panBy(deltaX, deltaY); + + if (zoomIn) { + zoomIn(); + } else { + zoomOut(); + } + + panBy(-deltaX, -deltaY); } }; @@ -361,8 +371,7 @@ public class ViewImage extends Activity implements View.OnClickListener mViewImage = (ViewImage) context; mZoomRingController = new ZoomRingController(context, this); mZoomRingController.setVibration(false); - mZoomRingController.setZoomCallbackThreshold(STEP_ANGLE); - mZoomRingController.setResetThumbAutomatically(false); + mZoomRingController.setTickDelta(STEP_ANGLE); mZoomRingController.setCallback(mZoomListener); mGestureDetector = new GestureDetector(getContext(), new MyGestureListener()); mGestureDetector.setOnDoubleTapListener(new MyDoubleTapListener()); @@ -382,7 +391,7 @@ public class ViewImage extends Activity implements View.OnClickListener } public void onZoom(boolean zoomIn) { - mZoomListener.onSimpleZoom(zoomIn); + mZoomListener.onSimpleZoom(zoomIn, getWidth()/2, getHeight()/2); } }); } |