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

am e03848eb: Merge change 27154 into eclair

Browse Source 
Merge commit 'e03848eb93fde30aee4201f8b41b91fa57475bc2' into eclair-plus-aosp

* commit 'e03848eb93fde30aee4201f8b41b91fa57475bc2':
  When change from narrow screen to wide screen, we will
This commit is contained in:
Grace Kloba
2009-09-27 12:32:47 -07:00
committed by Android Git Automerger
parent c46f886b63 e03848eb93
commit 1ff3d1f0a2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3587,9 +3587,13 @@ public class WebView extends AbsoluteLayout
// update mMinZoomScale if the minimum zoom scale is not fixed // update mMinZoomScale if the minimum zoom scale is not fixed
if (!mMinZoomScaleFixed) { if (!mMinZoomScaleFixed) {
mMinZoomScale = (float) getViewWidth() // when change from narrow screen to wide screen, the new viewWidth
// can be wider than the old content width. We limit the minimum
// scale to 1.0f. The proper minimum scale will be calculated when
// the new picture shows up.
mMinZoomScale = Math.min(1.0f, (float) getViewWidth()
/ (mDrawHistory ? mHistoryPicture.getWidth() / (mDrawHistory ? mHistoryPicture.getWidth()
: mZoomOverviewWidth); : mZoomOverviewWidth));
} }
// we always force, in case our height changed, in which case we still // we always force, in case our height changed, in which case we still