Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 608f9f47: When zooming, do not draw the WebTextView. Resize it when done.

Browse Source 
Merge commit '608f9f470fa562fc6a32449297110d4ec2953515' into eclair-plus-aosp

* commit '608f9f470fa562fc6a32449297110d4ec2953515':
  When zooming, do not draw the WebTextView.  Resize it when done.
This commit is contained in:
Leon Scroggins
2009-09-04 15:09:28 -07:00
committed by Android Git Automerger
parent dce5b2ce09 608f9f470f
commit 63aca6389c
1 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
core/java/android/webkit/WebView.java
View File

@@ -58,6 +58,7 @@ import android.view.ViewGroup;
import android.view.ViewParent;
import android.view.ViewTreeObserver;
import android.view.animation.AlphaAnimation;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
import android.webkit.WebTextView.AutoCompleteAdapter;
import android.webkit.WebViewCore.EventHub;
@@ -2733,6 +2734,15 @@ public class WebView extends AbsoluteLayout
}
}
/**
* Need to adjust the WebTextView after a change in zoom, since mActualScale
* has changed. This is especially important for password fields, which are
* drawn by the WebTextView, since it conveys more information than what
* webkit draws. Thus we need to reposition it to show in the correct
* place.
*/
private boolean mNeedToAdjustWebTextView;
private void drawCoreAndCursorRing(Canvas canvas, int color,
boolean drawCursorRing) {
if (mDrawHistory) {
@@ -2756,6 +2766,20 @@ public class WebView extends AbsoluteLayout
zoomScale = mZoomScale;
// set mZoomScale to be 0 as we have done animation
mZoomScale = 0;
if (mNeedToAdjustWebTextView) {
mNeedToAdjustWebTextView = false;
mWebTextView.setTextSize(contentToViewDimension(
nativeFocusCandidateTextSize()));
Rect bounds = nativeFocusCandidateNodeBounds();
Rect vBox = contentToView(bounds);
mWebTextView.setRect(vBox.left, vBox.top, vBox.width(),
vBox.height());
// If it is a password field, start drawing the
// WebTextView once again.
if (nativeFocusCandidateIsPassword()) {
mWebTextView.setInPassword(true);
}
}
}
float scale = zoomScale * mInvInitialZoomScale;
int tx = Math.round(scale * (mInitialScrollX + mZoomCenterX)
@@ -2768,6 +2792,17 @@ public class WebView extends AbsoluteLayout
* zoomScale)) + mScrollY;
canvas.translate(tx, ty);
canvas.scale(zoomScale, zoomScale);
if (inEditingMode() && !mNeedToAdjustWebTextView
&& mZoomScale != 0) {
// The WebTextView is up. Keep track of this so we can adjust
// its size and placement when we finish zooming
mNeedToAdjustWebTextView = true;
// If it is in password mode, turn it off so it does not draw
// misplaced.
if (nativeFocusCandidateIsPassword()) {
mWebTextView.setInPassword(false);
}
}
} else {
canvas.scale(mActualScale, mActualScale);
}