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

am bb6aba19: Merge change 26876 into eclair

Browse Source 
Merge commit 'bb6aba1984bfdceaec43054ef0b2a8e5dcd26215' into eclair-plus-aosp

* commit 'bb6aba1984bfdceaec43054ef0b2a8e5dcd26215':
  Restrict touch to the view height with the title. This
This commit is contained in:
Grace Kloba
2009-09-24 11:52:45 -07:00
committed by Android Git Automerger
parent 2b091c882d bb6aba1984
commit 34b9dab1ba
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -937,11 +937,15 @@ public class WebView extends AbsoluteLayout
* Note: this can be called from WebCoreThread.
*/
/* package */ int getViewHeight() {
return getViewHeightWithTitle() - getVisibleTitleHeight();
}
private int getViewHeightWithTitle() {
int height = getHeight();
if (isHorizontalScrollBarEnabled() && !mOverlayHorizontalScrollbar) {
height -= getHorizontalScrollbarHeight();
}
return height - getVisibleTitleHeight();
return height;
}
/**
@@ -2023,10 +2027,9 @@ public class WebView extends AbsoluteLayout
// the visible height back in to account for the fact that if the title
// bar is partially visible, the part of the visible rect which is
// displaying our content is displaced by that amount.
int titleHeight = getVisibleTitleHeight();
r.top = viewToContentY(r.top + titleHeight);
r.top = viewToContentY(r.top + getVisibleTitleHeight());
r.right = viewToContentX(r.right);
r.bottom = viewToContentY(r.bottom + titleHeight);
r.bottom = viewToContentY(r.bottom);
}
static class ViewSizeData {
@@ -3659,8 +3662,8 @@ public class WebView extends AbsoluteLayout
if (x > getViewWidth() - 1) {
x = getViewWidth() - 1;
}
if (y > getViewHeight() - 1) {
y = getViewHeight() - 1;
if (y > getViewHeightWithTitle() - 1) {
y = getViewHeightWithTitle() - 1;
}
// pass the touch events from UI thread to WebCore thread
@@ -4705,7 +4708,7 @@ public class WebView extends AbsoluteLayout
rect.offset(child.getLeft() - child.getScrollX(),
child.getTop() - child.getScrollY());
int height = getHeight() - getHorizontalScrollbarHeight();
int height = getViewHeightWithTitle();
int screenTop = mScrollY;
int screenBottom = screenTop + height;