Skip to content

Update RectangleGridLayout.java #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kevinylo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update RectangleGridLayout.java #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions library/src/main/java/com/github/channguyen/rl/RectangleGridLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
if (child.getVisibility() == View.GONE) {
continue;
}
measureChildWithMargins(
child,
MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED),
0,
MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED),
0
);
measureChild(child, widthMeasureSpec, heightMeasureSpec);
final MarginLayoutParams lp = (MarginLayoutParams) child.getLayoutParams();
childMarginWidth += (lp.leftMargin + lp.rightMargin);
childMarginHeight += (lp.topMargin + lp.bottomMargin);
Expand All @@ -101,7 +95,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
w = (mw * column) + paddingWidth + childMarginWidth;
h = (mh * row) + paddingHeight + childMarginHeight;

// If child decide to give no with or height, use default
// If child decide to give no width or height, use default
if (mw == 0) {
w = dpToPx(getContext(), DEFAULT_WIDTH) + childMarginWidth;
}
Expand Down Expand Up @@ -157,7 +151,7 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
// right
x + (y + 1) * cw - lp.rightMargin,
// bottom
(x + 1) * ch - lp.topMargin
(x + 1) * ch - lp.bottomMargin
);
}
}
Expand Down