Skip to content

F
flexbox-layout

门心叼龙 / flexbox-layout

通知 2
Star 0
Fork 0
F
flexbox-layout

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 e206556d 编写于 作者: T Takeshi Hagikura
浏览文件
操作

Merge pull request #24 from magazmj/master 

getChildMeasureSpec use parent padding
上级 5ca92f0a 9829bcfb
隐藏空白更改
内联 并排
Showing with 4 addition and 4 deletion
flexbox/src/main/java/com/google/android/flexbox/FlexboxLayout.java
浏览文件 @ e206556d
...@@ -321,10 +321,10 @@ public class FlexboxLayout extends ViewGroup { ...@@ -321,10 +321,10 @@ public class FlexboxLayout extends ViewGroup {
// is set to wrap_content) // is set to wrap_content)
} }
int childWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec, int childWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec,
child.getPaddingLeft() + child.getPaddingRight() + lp.leftMargin getPaddingLeft() + getPaddingRight() + lp.leftMargin
+ lp.rightMargin, childWidth); + lp.rightMargin, childWidth);
int childHeightMeasureSpec = getChildMeasureSpec(heightMeasureSpec, int childHeightMeasureSpec = getChildMeasureSpec(heightMeasureSpec,
child.getPaddingTop() + child.getPaddingBottom() + lp.topMargin getPaddingTop() + getPaddingBottom() + lp.topMargin
+ lp.bottomMargin, lp.height); + lp.bottomMargin, lp.height);
child.measure(childWidthMeasureSpec, childHeightMeasureSpec); child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
childState = combineMeasuredStates(childState, child.getMeasuredState()); childState = combineMeasuredStates(childState, child.getMeasuredState());
...@@ -464,10 +464,10 @@ public class FlexboxLayout extends ViewGroup { ...@@ -464,10 +464,10 @@ public class FlexboxLayout extends ViewGroup {
} }
int childWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec, int childWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec,
child.getPaddingLeft() + child.getPaddingRight() + lp.leftMargin getPaddingLeft() + getPaddingRight() + lp.leftMargin
+ lp.rightMargin, lp.width); + lp.rightMargin, lp.width);
int childHeightMeasureSpec = getChildMeasureSpec(heightMeasureSpec, int childHeightMeasureSpec = getChildMeasureSpec(heightMeasureSpec,
child.getPaddingTop() + child.getPaddingBottom() + lp.topMargin getPaddingTop() + getPaddingBottom() + lp.topMargin
+ lp.bottomMargin, childHeight); + lp.bottomMargin, childHeight);
child.measure(childWidthMeasureSpec, childHeightMeasureSpec); child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
childState = combineMeasuredStates(childState, child.getMeasuredState()); childState = combineMeasuredStates(childState, child.getMeasuredState());
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或