@@ -144,25 +144,27 @@ float YGNode::getLeadingMargin(
144144 const float widthSize) const {
145145 if (YGFlexDirectionIsRow (axis) &&
146146 style_.margin [YGEdgeStart].unit != YGUnitUndefined) {
147- return YGResolveValueMargin (style_.margin [YGEdgeStart], widthSize);
147+ return YGUnwrapFloatOptional (
148+ YGResolveValueMargin (style_.margin [YGEdgeStart], widthSize));
148149 }
149150
150- return YGResolveValueMargin (
151+ return YGUnwrapFloatOptional ( YGResolveValueMargin (
151152 *YGComputedEdgeValue (style_.margin , leading[axis], &YGValueZero),
152- widthSize);
153+ widthSize)) ;
153154}
154155
155156float YGNode::getTrailingMargin (
156157 const YGFlexDirection axis,
157158 const float widthSize) const {
158159 if (YGFlexDirectionIsRow (axis) &&
159160 style_.margin [YGEdgeEnd].unit != YGUnitUndefined) {
160- return YGResolveValueMargin (style_.margin [YGEdgeEnd], widthSize);
161+ return YGUnwrapFloatOptional (
162+ YGResolveValueMargin (style_.margin [YGEdgeEnd], widthSize));
161163 }
162164
163- return YGResolveValueMargin (
165+ return YGUnwrapFloatOptional ( YGResolveValueMargin (
164166 *YGComputedEdgeValue (style_.margin , trailing[axis], &YGValueZero),
165- widthSize);
167+ widthSize)) ;
166168}
167169
168170float YGNode::getMarginForAxis (
0 commit comments