commit 840b856d2a7287e98526d3957715eba3677e872f
author Android (Google) Code Review <android-gerrit@google.com> Mon Aug 24 11:47:53 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 24 11:47:53 2009 -0700
tree eb28778d49e6b1520e2895c3db1ee29198baa621
parent d507ff21296b10ed57feec1200a8fe7eb09c0fc4
parent a91874d1f980f20e874b2d12548fb65334efdfb2

Merge change 22452 into eclair

* changes:
  don't center zoom on size change if zoom is in progress

core/java/android/webkit/WebView.java

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index f49aab1..3c93fb0 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -3674,8 +3674,10 @@
     protected void onSizeChanged(int w, int h, int ow, int oh) {
         super.onSizeChanged(w, h, ow, oh);
         // Center zooming to the center of the screen.
-        mZoomCenterX = getViewWidth() * .5f;
-        mZoomCenterY = getViewHeight() * .5f;
+        if (mZoomScale == 0) { // unless we're already zooming
+            mZoomCenterX = getViewWidth() * .5f;
+            mZoomCenterY = getViewHeight() * .5f;
+        }
 
         // update mMinZoomScale if the minimum zoom scale is not fixed
         if (!mMinZoomScaleFixed) {