diff options
| author | Grace Kloba <klobag@google.com> | 2010-01-15 16:08:17 -0800 |
|---|---|---|
| committer | Grace Kloba <klobag@google.com> | 2010-01-18 15:29:46 -0800 |
| commit | 17b14bd36aba265ac6bffc2626d8db29713d7c45 (patch) | |
| tree | c6f716e4bb95d7392f95c3eefa79de44f763085c /core | |
| parent | 5a0bf1f03e5f62449ea2520edb79ea868e6f06e7 (diff) | |
| download | frameworks_base-17b14bd36aba265ac6bffc2626d8db29713d7c45.zip frameworks_base-17b14bd36aba265ac6bffc2626d8db29713d7c45.tar.gz frameworks_base-17b14bd36aba265ac6bffc2626d8db29713d7c45.tar.bz2 | |
DO NOT MERGE
Make sure the mZoomOverviewWidth is as least as
wide as the current (adjusted) view width.
This should fix the weird state Bart got in with
m.wikipedia.org.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index c749df3..023f61f 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -5194,8 +5194,9 @@ public class WebView extends AbsoluteLayout mPictureListener.onNewPicture(WebView.this, capturePicture()); } if (useWideViewport) { - mZoomOverviewWidth = Math.max(draw.mMinPrefWidth, - draw.mViewPoint.x); + mZoomOverviewWidth = Math.max( + (int) (viewWidth / mDefaultScale), Math.max( + draw.mMinPrefWidth, draw.mViewPoint.x)); } if (!mMinZoomScaleFixed) { mMinZoomScale = (float) viewWidth / mZoomOverviewWidth; |