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

am 840b856d: Merge change 22452 into eclair

Browse Source 
Merge commit '840b856d2a7287e98526d3957715eba3677e872f' into eclair-plus-aosp

* commit '840b856d2a7287e98526d3957715eba3677e872f':
  don't center zoom on size change if zoom is in progress
This commit is contained in:
Cary Clark
2009-08-24 11:50:15 -07:00
committed by Android Git Automerger
parent ab3803bd8d 840b856d2a
commit decbc3dbc4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3674,8 +3674,10 @@ public class WebView extends AbsoluteLayout
protected void onSizeChanged(int w, int h, int ow, int oh) { protected void onSizeChanged(int w, int h, int ow, int oh) {
super.onSizeChanged(w, h, ow, oh); super.onSizeChanged(w, h, ow, oh);
// Center zooming to the center of the screen. // Center zooming to the center of the screen.
mZoomCenterX = getViewWidth() * .5f; if (mZoomScale == 0) { // unless we're already zooming
mZoomCenterY = getViewHeight() * .5f; mZoomCenterX = getViewWidth() * .5f;
mZoomCenterY = getViewHeight() * .5f;
}
// update mMinZoomScale if the minimum zoom scale is not fixed // update mMinZoomScale if the minimum zoom scale is not fixed
if (!mMinZoomScaleFixed) { if (!mMinZoomScaleFixed) {