tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

android: flexconfig's maxWidth or maxHeight is not effected

Browse Source
This commit is contained in:
pengfei.zhou
2021-10-15 14:29:52 +08:00
committed by osborn
parent 0dadbd473e
commit 834d98cdb7
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
doric-android/doric/src/main/java/pub/doric/shader/flex/FlexNode.java
View File

@@ -64,7 +64,7 @@ public class FlexNode extends GroupNode<YogaLayout> {
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
for (int i = 0; i < getChildCount(); i++) { for (int i = 0; i < getChildCount(); i++) {
View child = getChildAt(i); View child = getChildAt(i);
ViewNode childNode = (ViewNode) child.getTag(R.id.doric_node); ViewNode<?> childNode = (ViewNode<?>) child.getTag(R.id.doric_node);
if (childNode != null) { if (childNode != null) {
ViewGroup.LayoutParams layoutParams = child.getLayoutParams(); ViewGroup.LayoutParams layoutParams = child.getLayoutParams();
int childWidthMeasureSpec; int childWidthMeasureSpec;
@@ -161,6 +161,19 @@ public class FlexNode extends GroupNode<YogaLayout> {
if (heightUnit == YogaUnit.AUTO) { if (heightUnit == YogaUnit.AUTO) {
getYogaNode().setHeightAuto(); getYogaNode().setHeightAuto();
} }
if (!(getParent() instanceof YogaLayout)) {
final int widthSize = MeasureSpec.getSize(widthMeasureSpec);
final int heightSize = MeasureSpec.getSize(heightMeasureSpec);
final int widthMode = MeasureSpec.getMode(widthMeasureSpec);
final int heightMode = MeasureSpec.getMode(heightMeasureSpec);
if (widthMode == MeasureSpec.AT_MOST) {
widthMeasureSpec = MeasureSpec.makeMeasureSpec(widthSize, MeasureSpec.UNSPECIFIED);
}
if (heightMode == MeasureSpec.AT_MOST) {
heightMeasureSpec = MeasureSpec.makeMeasureSpec(heightSize, MeasureSpec.UNSPECIFIED);
}
}
super.onMeasure(widthMeasureSpec, heightMeasureSpec); super.onMeasure(widthMeasureSpec, heightMeasureSpec);
} }
}; };