aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-03 09:26:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing bug with layout of PagedViewCellLayoutChildren

Browse Source 
Change-Id: I3fa34ad500632c4b257973aca9be0cb1bda5884a
This commit is contained in:
Michael Jurka
2011-06-02 16:41:34 -07:00
parent dcfc25ca5f
commit 9bfe2b2646
2 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/launcher2/PagedViewCellLayout.java
View File

@@ -211,8 +211,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);
@@ -255,10 +253,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++) {
@@ -270,7 +266,8 @@ public class PagedViewCellLayout extends ViewGroup implements Page {
child.measure(childWidthMeasureSpec, childheightMeasureSpec);
}
setMeasuredDimension(newWidth, newHeight);
setMeasuredDimension(newWidth + mPaddingLeft + mPaddingRight,
newHeight + mPaddingTop + mPaddingBottom);
}
int getContentWidth() {
@@ -304,12 +301,8 @@ public class PagedViewCellLayout extends ViewGroup implements Page {
int count = getChildCount();
for (int i = 0; i < count; i++) {
View child = getChildAt(i);
if (LauncherApplication.isScreenLarge()) {
child.layout(0, 0, r - l, b - t);
} else {
child.layout(mPaddingLeft, mPaddingTop, getMeasuredWidth() - mPaddingRight,
getMeasuredHeight() - mPaddingBottom);
}
child.layout(mPaddingLeft, mPaddingTop,
r - l - mPaddingRight, b - t - mPaddingBottom);
}
}