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

am 4258bfb7: Merge "Fix some drawing artifacts/bugs around overlays/text anchors" into gingerbread

Browse Source 
Merge commit '4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1' into gingerbread-plus-aosp

* commit '4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1':
  Fix some drawing artifacts/bugs around overlays/text anchors
This commit is contained in:
Adam Powell
2010-09-17 19:30:03 -07:00
committed by Android Git Automerger
parent a8d95248bd 4258bfb7a9
commit 99f0f3676f
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3542,10 +3542,10 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
for (int i = 0; i < childCount; i++) { for (int i = 0; i < childCount; i++) {
final View child = getChildAt(i); final View child = getChildAt(i);
if (child.isOverlayEnabled()) { if (child.isOverlayEnabled()) {
canvas.translate(child.mLeft + child.mScrollX, child.mTop + child.mScrollY); canvas.translate(child.mLeft - child.mScrollX, child.mTop - child.mScrollY);
child.onDrawOverlay(canvas); child.onDrawOverlay(canvas);
canvas.translate(-(child.mLeft + child.mScrollX), canvas.translate(-(child.mLeft - child.mScrollX),
-(child.mTop + child.mScrollY)); -(child.mTop - child.mScrollY));
} }
} }
} }

12
core/java/android/widget/TextView.java
View File

@@ -7732,8 +7732,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
bounds.bottom = bounds.top + drawableHeight; bounds.bottom = bounds.top + drawableHeight;
convertFromViewportToContentCoordinates(bounds); convertFromViewportToContentCoordinates(bounds);
invalidate();
mDrawable.setBounds(bounds); mDrawable.setBounds(bounds);
postInvalidate(); invalidate();
} }
boolean hasFingerOn(float x, float y) { boolean hasFingerOn(float x, float y) {
@@ -7750,9 +7751,16 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
return Rect.intersects(mDrawable.getBounds(), fingerRect); return Rect.intersects(mDrawable.getBounds(), fingerRect);
} }
void invalidate() {
final Rect bounds = mDrawable.getBounds();
TextView.this.invalidate(bounds.left, bounds.top,
bounds.right, bounds.bottom);
}
void postInvalidate() { void postInvalidate() {
final Rect bounds = mDrawable.getBounds(); final Rect bounds = mDrawable.getBounds();
TextView.this.postInvalidate(bounds.left, bounds.top, bounds.right, bounds.bottom); TextView.this.postInvalidate(bounds.left, bounds.top,
bounds.right, bounds.bottom);
} }
void postInvalidateDelayed(long delay) { void postInvalidateDelayed(long delay) {