static int DEFAULT_SCALE_PERCENT;
private float mDefaultScale;
- // set to true temporarily while the zoom control is being dragged
+ // set to true temporarily during ScaleGesture triggered zoom
private boolean mPreviewZoomOnly = false;
+ // extra scale during zoom preview
+ private float mPreviewExtraZoomScale = 1.0f;
// computed scale and inverse, from mZoomWidth.
private float mActualScale;
nativeRecordButtons(hasFocus() && hasWindowFocus(),
mTouchMode == TOUCH_SHORTPRESS_START_MODE
|| mTrackballDown || mGotCenterDown, false);
- drawCoreAndCursorRing(canvas, mBackgroundColor, mDrawCursorRing);
+ // use the DKGRAY as background when drawing zoom preview
+ drawCoreAndCursorRing(canvas, mPreviewZoomOnly ? Color.DKGRAY
+ : mBackgroundColor, mDrawCursorRing);
}
@Override
return;
}
int saveCount = canvas.save();
+ if (mPreviewZoomOnly) {
+ // scale after canvas.save() so that the child, like titlebar, will
+ // not be scaled.
+ canvas.scale(mPreviewExtraZoomScale, mPreviewExtraZoomScale,
+ mZoomCenterX + mScrollX, mZoomCenterY + mScrollY);
+ }
if (mTitleBar != null) {
canvas.translate(0, (int) mTitleBar.getHeight());
}
}
canvas.restoreToCount(saveCount);
- // Now draw the shadow.
- if (mTitleBar != null) {
+ // Now draw the shadow, skip if it is in zoom preview mode.
+ if ((mTitleBar != null && !mPreviewZoomOnly)) {
int y = mScrollY + getVisibleTitleHeight();
int height = (int) (5f * getContext().getResources()
.getDisplayMetrics().density);
private class ScaleDetectorListener implements
ScaleGestureDetector.OnScaleGestureListener {
+ float mStartX, mStartY;
+
public boolean onScaleBegin(ScaleGestureDetector detector) {
// cancel the single touch handling
cancelTouch();
if (inEditingMode() && nativeFocusCandidateIsPassword()) {
mWebTextView.setInPassword(false);
}
+ mPreviewExtraZoomScale = 1.0f;
+ mStartX = detector.getFocusX();
+ mStartY = detector.getFocusY();
return true;
}
mPreviewZoomOnly = false;
mAnchorX = viewToContentX((int) mZoomCenterX + mScrollX);
mAnchorY = viewToContentY((int) mZoomCenterY + mScrollY);
+ float scale = mPreviewExtraZoomScale * mActualScale;
// don't reflow when zoom in; when zoom out, do reflow if the
// new scale is almost minimum scale;
- boolean reflowNow = (mActualScale - mMinZoomScale <= 0.01f)
- || ((mActualScale <= 0.8 * mTextWrapScale));
- // force zoom after mPreviewZoomOnly is set to false so that the
- // new view size will be passed to the WebKit
- setNewZoomScale(mActualScale, reflowNow, true);
+ boolean reflowNow = (scale - mMinZoomScale <= 0.01f)
+ || ((scale <= 0.8 * mTextWrapScale));
+ setNewZoomScale(scale, reflowNow, false);
// call invalidate() to draw without zoom filter
invalidate();
}
}
public boolean onScale(ScaleGestureDetector detector) {
+ float currScale = mPreviewExtraZoomScale * mActualScale;
float scale = (float) (Math.round(detector.getScaleFactor()
- * mActualScale * 100) / 100.0);
- if (Math.abs(scale - mActualScale) >= PREVIEW_SCALE_INCREMENT) {
+ * currScale * 100) / 100.0);
+ // limit the scale change per step
+ if (scale > currScale) {
+ scale = Math.min(scale, currScale * 1.25f);
+ } else {
+ // the preview scale can be 80% of mMinZoomScale for feedback
+ scale = Math.max(Math.max(scale, currScale * 0.8f),
+ mMinZoomScale * 0.8f);
+ }
+ if (Math.abs(scale - currScale) >= PREVIEW_SCALE_INCREMENT) {
mPreviewZoomOnly = true;
- // limit the scale change per step
- if (scale > mActualScale) {
- scale = Math.min(scale, mActualScale * 1.25f);
+ // FIXME: mZoomCenterX/Y need to be relative to mActualScale.
+ // Ideally the focusX/Y should be a fixed point. But currently
+ // it just returns the center of the two pointers. If only one
+ // pointer is moving, the center is shifting. Currently we only
+ // adjust it for zoom in case to get better result.
+ if (mPreviewExtraZoomScale > 1.0f) {
+ mZoomCenterX = mStartX - (mStartX - detector.getFocusX())
+ / mPreviewExtraZoomScale;
+ mZoomCenterY = mStartY - (mStartY - detector.getFocusY())
+ / mPreviewExtraZoomScale;
} else {
- scale = Math.max(scale, mActualScale * 0.8f);
+ mZoomCenterX = detector.getFocusX();
+ mZoomCenterY = detector.getFocusY();
}
- mZoomCenterX = detector.getFocusX();
- mZoomCenterY = detector.getFocusY();
- setNewZoomScale(scale, false, false);
+ mPreviewExtraZoomScale = scale / mActualScale;
invalidate();
return true;
}
// FIXME: we may consider to give WebKit an option to handle multi-touch
// events later.
- if (mSupportMultiTouch && mMinZoomScale < mMaxZoomScale
- && ev.getPointerCount() > 1) {
+ if (mSupportMultiTouch && ev.getPointerCount() > 1) {
mScaleDetector.onTouchEvent(ev);
if (mScaleDetector.isInProgress()) {
mLastTouchTime = eventTime;