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

Android:flexlayout fix cannot measure property when child is also flexlayout

Browse Source
This commit is contained in:
pengfei.zhou 2021-10-15 19:06:12 +08:00 committed by osborn
parent 3a1d07ecc4
commit 3e1051ed4e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import com.facebook.yoga.YogaAlign; import com.facebook.yoga.YogaAlign;
import com.facebook.yoga.YogaConstants;
import com.facebook.yoga.YogaDirection; import com.facebook.yoga.YogaDirection;
import com.facebook.yoga.YogaDisplay; import com.facebook.yoga.YogaDisplay;
import com.facebook.yoga.YogaEdge; import com.facebook.yoga.YogaEdge;
@ -75,7 +76,7 @@ public class FlexNode extends GroupNode<YogaLayout> {
MeasureSpec.AT_MOST); MeasureSpec.AT_MOST);
} else if (layoutParams.width == ViewGroup.LayoutParams.WRAP_CONTENT) { } else if (layoutParams.width == ViewGroup.LayoutParams.WRAP_CONTENT) {
childWidthMeasureSpec = MeasureSpec.makeMeasureSpec( childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(
getMeasuredHeight(), 0,
MeasureSpec.UNSPECIFIED); MeasureSpec.UNSPECIFIED);
} else { } else {
childWidthMeasureSpec = MeasureSpec.makeMeasureSpec( childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(
@ -85,7 +86,7 @@ public class FlexNode extends GroupNode<YogaLayout> {
if (layoutParams.height == ViewGroup.LayoutParams.MATCH_PARENT) { if (layoutParams.height == ViewGroup.LayoutParams.MATCH_PARENT) {
childHeightMeasureSpec = MeasureSpec.makeMeasureSpec( childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(
0, getMeasuredHeight(),
MeasureSpec.AT_MOST); MeasureSpec.AT_MOST);
} else if (layoutParams.height == ViewGroup.LayoutParams.WRAP_CONTENT) { } else if (layoutParams.height == ViewGroup.LayoutParams.WRAP_CONTENT) {
childHeightMeasureSpec = MeasureSpec.makeMeasureSpec( childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(
@ -98,7 +99,7 @@ public class FlexNode extends GroupNode<YogaLayout> {
} }
child.measure(childWidthMeasureSpec, childHeightMeasureSpec); child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
YogaNode node = getYogaNodeForView(child); YogaNode node = getYogaNodeForView(child);
if (node != null) { if (!(child instanceof YogaLayout) && node != null) {
JSObject flexConfig = childNode.getFlexConfig(); JSObject flexConfig = childNode.getFlexConfig();
YogaUnit widthUnit = YogaUnit.AUTO; YogaUnit widthUnit = YogaUnit.AUTO;
YogaUnit heightUnit = YogaUnit.AUTO; YogaUnit heightUnit = YogaUnit.AUTO;