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

Merge "Fix getChildVisibleRect to clip correctly." into lmp-mr1-dev

Browse Source
This commit is contained in:
George Mount
2014-11-12 22:11:36 +00:00
committed by Android (Google) Code Review
parent c3631b985f 002d43d29b
commit 70cb4f3e71
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/java/android/view/ViewGroup.java
View File

@@ -5045,14 +5045,30 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
offset.y += dy; offset.y += dy;
} }
if (rect.intersect(0, 0, mRight - mLeft, mBottom - mTop)) { boolean rectIsVisible = true;
if (mParent == null) return true; if (mParent instanceof ViewGroup && ((ViewGroup)mParent).getClipChildren()) {
r.set((int) (rect.left + 0.5f), (int) (rect.top + 0.5f), // clipChildren clips to the child's bounds
(int) (rect.right + 0.5f), (int) (rect.bottom + 0.5f)); rectIsVisible = rect.intersect(0, 0, mRight - mLeft, mBottom - mTop);
return mParent.getChildVisibleRect(this, r, offset);
} }
return false; if (rectIsVisible && (mGroupFlags & CLIP_TO_PADDING_MASK) == CLIP_TO_PADDING_MASK) {
// Clip to padding
rectIsVisible = rect.intersect(mPaddingLeft, mPaddingTop,
mRight - mLeft - mPaddingLeft - mPaddingRight,
mBottom - mTop - mPaddingTop - mPaddingBottom);
}
if (rectIsVisible && mClipBounds != null) {
// Clip to clipBounds
rectIsVisible = rect.intersect(mClipBounds.left, mClipBounds.top, mClipBounds.right,
mClipBounds.bottom);
}
r.set((int) (rect.left + 0.5f), (int) (rect.top + 0.5f), (int) (rect.right + 0.5f),
(int) (rect.bottom + 0.5f));
if (rectIsVisible && mParent != null) {
rectIsVisible = mParent.getChildVisibleRect(this, r, offset);
}
return rectIsVisible;
} }
/** /**