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

Merge change I3656f7a3 into eclair

Browse Source 
* changes:
  Honor the mInitialScale set on WebView. This was lost when we fixed restoring the scale for a new page.
This commit is contained in:
Android (Google) Code Review
2009-11-11 20:11:25 -08:00
parent f2897fe42e 16efce7242
commit dc30d28bc8
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -500,7 +500,7 @@ public class WebView extends AbsoluteLayout
private boolean mMinZoomScaleFixed = true; private boolean mMinZoomScaleFixed = true;
// initial scale in percent. 0 means using default. // initial scale in percent. 0 means using default.
private int mInitialScale = 0; private int mInitialScaleInPercent = 0;
// while in the zoom overview mode, the page's width is fully fit to the // while in the zoom overview mode, the page's width is fully fit to the
// current window. The page is alive, in another words, you can click to // current window. The page is alive, in another words, you can click to
@@ -1595,7 +1595,7 @@ public class WebView extends AbsoluteLayout
* @param scaleInPercent The initial scale in percent. * @param scaleInPercent The initial scale in percent.
*/ */
public void setInitialScale(int scaleInPercent) { public void setInitialScale(int scaleInPercent) {
mInitialScale = scaleInPercent; mInitialScaleInPercent = scaleInPercent;
} }
/** /**
@@ -3615,6 +3615,13 @@ public class WebView extends AbsoluteLayout
mMinZoomScale = Math.min(1.0f, (float) getViewWidth() mMinZoomScale = Math.min(1.0f, (float) getViewWidth()
/ (mDrawHistory ? mHistoryPicture.getWidth() / (mDrawHistory ? mHistoryPicture.getWidth()
: mZoomOverviewWidth)); : mZoomOverviewWidth));
if (mInitialScaleInPercent > 0) {
// limit the minZoomScale to the initialScale if it is set
float initialScale = mInitialScaleInPercent / 100.0f;
if (mMinZoomScale > initialScale) {
mMinZoomScale = initialScale;
}
}
} }
// 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
@@ -4967,7 +4974,9 @@ public class WebView extends AbsoluteLayout
WebViewCore.RestoreState restoreState = draw.mRestoreState; WebViewCore.RestoreState restoreState = draw.mRestoreState;
if (restoreState != null) { if (restoreState != null) {
mInZoomOverview = false; mInZoomOverview = false;
mLastScale = restoreState.mTextWrapScale; mLastScale = mInitialScaleInPercent > 0
? mInitialScaleInPercent / 100.0f
: restoreState.mTextWrapScale;
if (restoreState.mMinScale == 0) { if (restoreState.mMinScale == 0) {
if (restoreState.mMobileSite) { if (restoreState.mMobileSite) {
if (draw.mMinPrefWidth > if (draw.mMinPrefWidth >