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

Merge "Fixing inconsistency between invalidate region and draw region" into honeycomb-mr1

Browse Source
This commit is contained in:
Adam Cohen
2011-03-08 14:59:51 -08:00
committed by Android (Google) Code Review
parent c9e598995d 321aa2b025
commit f10615d8d8
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/java/android/widget/StackView.java
View File

@@ -531,6 +531,8 @@ public class StackView extends AdapterViewAnimator {
@Override
protected void dispatchDraw(Canvas canvas) {
boolean expandClipRegion = false;
canvas.getClipBounds(stackInvalidateRect);
final int childCount = getChildCount();
for (int i = 0; i < childCount; i++) {
@@ -540,12 +542,22 @@ public class StackView extends AdapterViewAnimator {
child.getAlpha() == 0f || child.getVisibility() != VISIBLE) {
lp.resetInvalidateRect();
}
stackInvalidateRect.union(lp.getInvalidateRect());
Rect childInvalidateRect = lp.getInvalidateRect();
if (!childInvalidateRect.isEmpty()) {
expandClipRegion = true;
stackInvalidateRect.union(childInvalidateRect);
}
}
// We only expand the clip bounds if necessary.
if (expandClipRegion) {
canvas.save(Canvas.CLIP_SAVE_FLAG);
canvas.clipRect(stackInvalidateRect, Region.Op.UNION);
super.dispatchDraw(canvas);
canvas.restore();
} else {
super.dispatchDraw(canvas);
}
canvas.save(Canvas.CLIP_SAVE_FLAG);
canvas.clipRect(stackInvalidateRect, Region.Op.UNION);
super.dispatchDraw(canvas);
canvas.restore();
}
private void onLayout() {