PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing bug with layout of PagedViewCellLayoutChildren

Browse Source
This commit is contained in:
Michael Jurka
2011-06-02 16:41:34 -07:00
parent 32271c3d20
commit 2478480a97
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/PagedViewCellLayout.java
+6 -8
View File
@@ -189,8 +189,6 @@ public class PagedViewCellLayout extends ViewGroup implements Page {
}
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
// TODO: currently ignoring padding
int widthSpecMode = MeasureSpec.getMode(widthMeasureSpec);
int widthSpecSize = MeasureSpec.getSize(widthMeasureSpec);
@@ -233,10 +231,8 @@ public class PagedViewCellLayout extends ViewGroup implements Page {
widthGap = heightGap = minGap;
}
int newWidth = mPaddingLeft + mPaddingRight + (mCellCountX * cellWidth) +
((mCellCountX - 1) * widthGap);
int newHeight = mPaddingTop + mPaddingBottom + (mCellCountY * cellHeight) +
((mCellCountY - 1) * heightGap);
int newWidth = (mCellCountX * cellWidth) + ((mCellCountX - 1) * widthGap);
int newHeight = (mCellCountY * cellHeight) + ((mCellCountY - 1) * heightGap);
final int count = getChildCount();
for (int i = 0; i < count; i++) {
@@ -248,7 +244,8 @@ public class PagedViewCellLayout extends ViewGroup implements Page {
child.measure(childWidthMeasureSpec, childheightMeasureSpec);
}
setMeasuredDimension(newWidth, newHeight);
setMeasuredDimension(newWidth + mPaddingLeft + mPaddingRight,
newHeight + mPaddingTop + mPaddingBottom);
}
int getContentWidth() {
@@ -278,7 +275,8 @@ public class PagedViewCellLayout extends ViewGroup implements Page {
int count = getChildCount();
for (int i = 0; i < count; i++) {
View child = getChildAt(i);
child.layout(0, 0, r - l, b - t);
child.layout(mPaddingLeft, mPaddingTop,
r - l - mPaddingRight, b - t - mPaddingBottom);
}
}
src/com/android/launcher2/PagedViewCellLayoutChildren.java
+9 -6
View File
@@ -92,8 +92,8 @@ public class PagedViewCellLayoutChildren extends ViewGroup {
PagedViewCellLayout.LayoutParams lp =
(PagedViewCellLayout.LayoutParams) child.getLayoutParams();
lp.setup(mCellWidth, mCellHeight, mWidthGap, mHeightGap,
((ViewGroup)getParent()).getPaddingLeft(),
((ViewGroup)getParent()).getPaddingTop());
getPaddingLeft(),
getPaddingTop());
int childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(lp.width,
MeasureSpec.EXACTLY);
@@ -111,18 +111,21 @@ public class PagedViewCellLayoutChildren extends ViewGroup {
int count = getChildCount();
int offsetX = 0;
if (mCenterContent) {
if (mCenterContent && count > 0) {
// determine the max width of all the rows and center accordingly
int maxRowWidth = 0;
int maxRowX = 0;
int minRowX = Integer.MAX_VALUE;
for (int i = 0; i < count; i++) {
View child = getChildAt(i);
if (child.getVisibility() != GONE) {
PagedViewCellLayout.LayoutParams lp =
(PagedViewCellLayout.LayoutParams) child.getLayoutParams();
maxRowWidth = Math.max(maxRowWidth, lp.x + lp.width);
minRowX = Math.min(minRowX, lp.x);
maxRowX = Math.max(maxRowX, lp.x + lp.width);
}
}
offsetX = (getMeasuredWidth() / 2) - (maxRowWidth / 2);
int maxRowWidth = maxRowX - minRowX;
offsetX = (getMeasuredWidth() - maxRowWidth) / 2;
}
for (int i = 0; i < count; i++) {