Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3d0cc5c authored by Grace Kloba's avatar Grace Kloba
Browse files

If zoom scale is set to minimum, treat it as in overview 

mode.

When view size changed, we will adjust scale factor,
which should update the zoom button states afterwards.
 
http://b/issue?id=2477282
parent 5e747dd6

core/java/android/webkit/WebView.java

+6 −0
Original line number Diff line number Diff line
@@ -2069,6 +2069,8 @@ public class WebView extends AbsoluteLayout 
            boolean force) {

        if (scale < mMinZoomScale) {

            scale = mMinZoomScale;

            // set mInZoomOverview for non mobile sites

            if (scale < mDefaultScale) mInZoomOverview = true;

        } else if (scale > mMaxZoomScale) {

            scale = mMaxZoomScale;

        }
@@ -4017,6 +4019,10 @@ public class WebView extends AbsoluteLayout 
                // still want to send the notification over to webkit.

                mWebView.setNewZoomScale(mWebView.mActualScale,

                        mUpdateTextWrap, true);

                // update the zoom buttons as the scale can be changed

                if (mWebView.getSettings().getBuiltInZoomControls()) {

                    mWebView.updateZoomButtonsEnabled();

                }

            }

        }

    }