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

am 85a8dcec: Merge "Only honor the scrollbar mode at the minimum zoom level. This reduced the impact of https://android-git.corp.google.com/g/#change,48683. In GB, we need to revisit this issue." into froyo

Browse Source 
Merge commit '85a8dcec5460edda72e9917d4f02ad1b6a133251' into froyo-plus-aosp

* commit '85a8dcec5460edda72e9917d4f02ad1b6a133251':
  Only honor the scrollbar mode at the minimum zoom
This commit is contained in:
Grace Kloba
2010-04-23 17:14:15 -07:00
committed by Android Git Automerger
parent cdf96f75da 85a8dcec54
commit bd17156fda
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

@@ -2286,7 +2286,9 @@ public class WebView extends AbsoluteLayout
protected int computeHorizontalScrollRange() {
if (mDrawHistory) {
return mHistoryWidth;
} else if (mHorizontalScrollBarMode == SCROLLBAR_ALWAYSOFF) {
} else if (mHorizontalScrollBarMode == SCROLLBAR_ALWAYSOFF
&& (mActualScale - mMinZoomScale <= MINIMUM_SCALE_INCREMENT)) {
// only honor the scrollbar mode when it is at minimum zoom level
return computeHorizontalScrollExtent();
} else {
// to avoid rounding error caused unnecessary scrollbar, use floor
@@ -2298,7 +2300,9 @@ public class WebView extends AbsoluteLayout
protected int computeVerticalScrollRange() {
if (mDrawHistory) {
return mHistoryHeight;
} else if (mVerticalScrollBarMode == SCROLLBAR_ALWAYSOFF) {
} else if (mVerticalScrollBarMode == SCROLLBAR_ALWAYSOFF
&& (mActualScale - mMinZoomScale <= MINIMUM_SCALE_INCREMENT)) {
// only honor the scrollbar mode when it is at minimum zoom level
return computeVerticalScrollExtent();
} else {
// to avoid rounding error caused unnecessary scrollbar, use floor