582533dbc6
Summary: This extracts the core changes from https://github.com/facebook/yoga/pull/1116, to support gap/row-gap/column-gap, mostly identical, apart from the rename of gaps -> gutters. The core functionality in this PR looks to be well tested from the fixtures added. I am not an expert in the internals of Yoga, but I am seeing everything that I would expect to. The space for the gap is accounted for in line-breaking, and the accumulated gaps limit the available line-length, before sizing flexible children, so items are sized correctly as to accommodate the gap. Then the gap is used for spacing during main axis and cross-axis justification. Changelog: [Genral][Added] - Implement gap/row-gap/column-gap (within the yoga C ABI) Reviewed By: javache Differential Revision: D39922410 fbshipit-source-id: 5850f22032169028bd8383b49dd240b335c11d3d
57 lines
2.3 KiB
C++
57 lines
2.3 KiB
C++
/*
|
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
*
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
*/
|
|
|
|
#include "YGStyle.h"
|
|
#include "Utils.h"
|
|
|
|
// Yoga specific properties, not compatible with flexbox specification
|
|
bool operator==(const YGStyle& lhs, const YGStyle& rhs) {
|
|
bool areNonFloatValuesEqual = lhs.direction() == rhs.direction() &&
|
|
lhs.flexDirection() == rhs.flexDirection() &&
|
|
lhs.justifyContent() == rhs.justifyContent() &&
|
|
lhs.alignContent() == rhs.alignContent() &&
|
|
lhs.alignItems() == rhs.alignItems() &&
|
|
lhs.alignSelf() == rhs.alignSelf() &&
|
|
lhs.positionType() == rhs.positionType() &&
|
|
lhs.flexWrap() == rhs.flexWrap() && lhs.overflow() == rhs.overflow() &&
|
|
lhs.display() == rhs.display() &&
|
|
YGValueEqual(lhs.flexBasis(), rhs.flexBasis()) &&
|
|
lhs.margin() == rhs.margin() && lhs.position() == rhs.position() &&
|
|
lhs.padding() == rhs.padding() && lhs.border() == rhs.border() &&
|
|
lhs.gap() == rhs.gap() && lhs.dimensions() == rhs.dimensions() &&
|
|
lhs.minDimensions() == rhs.minDimensions() &&
|
|
lhs.maxDimensions() == rhs.maxDimensions();
|
|
|
|
areNonFloatValuesEqual = areNonFloatValuesEqual &&
|
|
lhs.flex().isUndefined() == rhs.flex().isUndefined();
|
|
if (areNonFloatValuesEqual && !lhs.flex().isUndefined() &&
|
|
!rhs.flex().isUndefined()) {
|
|
areNonFloatValuesEqual = areNonFloatValuesEqual && lhs.flex() == rhs.flex();
|
|
}
|
|
|
|
areNonFloatValuesEqual = areNonFloatValuesEqual &&
|
|
lhs.flexGrow().isUndefined() == rhs.flexGrow().isUndefined();
|
|
if (areNonFloatValuesEqual && !lhs.flexGrow().isUndefined()) {
|
|
areNonFloatValuesEqual =
|
|
areNonFloatValuesEqual && lhs.flexGrow() == rhs.flexGrow();
|
|
}
|
|
|
|
areNonFloatValuesEqual = areNonFloatValuesEqual &&
|
|
lhs.flexShrink().isUndefined() == rhs.flexShrink().isUndefined();
|
|
if (areNonFloatValuesEqual && !rhs.flexShrink().isUndefined()) {
|
|
areNonFloatValuesEqual =
|
|
areNonFloatValuesEqual && lhs.flexShrink() == rhs.flexShrink();
|
|
}
|
|
|
|
if (!(lhs.aspectRatio().isUndefined() && rhs.aspectRatio().isUndefined())) {
|
|
areNonFloatValuesEqual =
|
|
areNonFloatValuesEqual && lhs.aspectRatio() == rhs.aspectRatio();
|
|
}
|
|
|
|
return areNonFloatValuesEqual;
|
|
}
|