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

Merge change 26876 into eclair

Browse Source 
* changes:
  Restrict touch to the view height with the title. This should fix the links in the bottom of the screen are not touchable when title bar presents.
This commit is contained in:
Android (Google) Code Review
2009-09-24 14:45:57 -04:00
parent 4cc86e1ae8 8eff73f79b
commit bb6aba1984
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;