drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix dividers for LinearLayout (TabWidget)"

Browse Source
This commit is contained in:
Adam Powell
2012-03-01 16:26:03 -08:00
committed by android code review
parent 5aeb85877a 20761fcdcd
commit c7e5a2fe30
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/LinearLayout.java
View File

@ -307,7 +307,7 @@ public class LinearLayout extends ViewGroup {
if (child != null && child.getVisibility() != GONE) { if (child != null && child.getVisibility() != GONE) {
if (hasDividerBeforeChildAt(i)) { if (hasDividerBeforeChildAt(i)) {
final LayoutParams lp = (LayoutParams) child.getLayoutParams(); final LayoutParams lp = (LayoutParams) child.getLayoutParams();
final int top = child.getTop() - lp.topMargin; final int top = child.getTop() - lp.topMargin - mDividerHeight;
drawHorizontalDivider(canvas, top); drawHorizontalDivider(canvas, top);
} }
} }
@ -334,7 +334,7 @@ public class LinearLayout extends ViewGroup {
if (child != null && child.getVisibility() != GONE) { if (child != null && child.getVisibility() != GONE) {
if (hasDividerBeforeChildAt(i)) { if (hasDividerBeforeChildAt(i)) {
final LayoutParams lp = (LayoutParams) child.getLayoutParams(); final LayoutParams lp = (LayoutParams) child.getLayoutParams();
final int left = child.getLeft() - lp.leftMargin; final int left = child.getLeft() - lp.leftMargin - mDividerWidth;
drawVerticalDivider(canvas, left); drawVerticalDivider(canvas, left);
} }
} }