Skip to content

* fix Container min-height produces incorrect size when flex-wrap and… #1493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cattenblue wants to merge 6 commits into from
Closed

* fix Container min-height produces incorrect size when flex-wrap and… #1493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7d5eb75
* fix Container min-height produces incorrect size when flex-wrap and…
Dec 4, 2023
0fa3d81
fix gcc test error
Dec 5, 2023
189613e
Merge branch 'main' into main
cattenblue Dec 5, 2023
83fbfab
Merge branch 'main' into main
cattenblue Dec 6, 2023
b2ffdd5
fix the error that implicit conversion changes signedness: 'int' to '…
Dec 7, 2023
a86fef3
Merge branch 'main' of https://github.com/cattenblue/yoga
Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 99 additions & 0 deletions tests/generated/YGMinMaxDimensionTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1352,3 +1352,102 @@ TEST(YogaTest, min_max_percent_no_width_height) {

YGConfigFree(config);
}
TEST(YogaTest, Auto_Height_Min_Height) {
YGNodeRef node = nullptr;
YGNodeRef root = nullptr;
YGConfigRef config = nullptr;
config = YGConfigNew();
root = YGNodeNewWithConfig(config);
YGNodeStyleSetFlexDirection(root, YGFlexDirectionRow);
YGNodeStyleSetFlexWrap(root, YGWrapWrap);
YGNodeStyleSetWidth(root, 200);
YGNodeStyleSetHeightAuto(root);
YGNodeStyleSetMinHeight(root, 120);
YGNodeStyleSetMaxHeight(root, 240);
YGNodeStyleSetFlexBasisAuto(root);
YGNodeStyleSetJustifyContent(root, YGJustifyFlexStart);
YGNodeStyleSetAlignItems(root, YGAlignFlexStart);
YGNodeStyleSetAlignContent(root, YGAlignFlexStart);
for (size_t i = 0; i < 3; i++) {
node = YGNodeNewWithConfig(config);
YGNodeStyleSetWidth(node, 100);
YGNodeStyleSetHeight(node, 100);
YGNodeInsertChild(root, node, i); // index start from 0
}
YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root));
ASSERT_FLOAT_EQ(200, YGNodeLayoutGetWidth(root));
ASSERT_FLOAT_EQ(200, YGNodeLayoutGetHeight(root));
YGNodeFreeRecursive(root);
YGConfigFree(config);
}
TEST(YogaTest, Auto_Width_Min_Width) {
YGNodeRef node = nullptr;
YGNodeRef root = nullptr;
YGConfigRef config = nullptr;
config = YGConfigNew();
root = YGNodeNewWithConfig(config);
YGNodeStyleSetFlexDirection(root, YGFlexDirectionColumn);
YGNodeStyleSetFlexWrap(root, YGWrapWrap);
YGNodeStyleSetWidthAuto(root);
YGNodeStyleSetHeight(root, 200);
YGNodeStyleSetMinWidth(root, 120);
YGNodeStyleSetFlexBasisAuto(root);
YGNodeStyleSetJustifyContent(root, YGJustifyFlexStart);
YGNodeStyleSetAlignItems(root, YGAlignFlexStart);
YGNodeStyleSetAlignContent(root, YGAlignFlexStart);
for (size_t i = 0; i < 3; i++) {
node = YGNodeNewWithConfig(config);
YGNodeStyleSetWidth(node, 100);
YGNodeStyleSetHeight(node, 100);
YGNodeInsertChild(root, node, i); // index start from 0
}
YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root));
ASSERT_FLOAT_EQ(200, YGNodeLayoutGetWidth(root));
ASSERT_FLOAT_EQ(200, YGNodeLayoutGetHeight(root));
YGNodeFreeRecursive(root);
YGConfigFree(config);
}
TEST(YogaTest, Child_Auto_Width_Min_Width) {
YGNodeRef node = nullptr;
YGNodeRef root = nullptr;
YGConfigRef config = nullptr;
config = YGConfigNew();
root = YGNodeNewWithConfig(config);
YGNodeStyleSetFlexDirection(root, YGFlexDirectionRow);
YGNodeStyleSetFlexWrap(root, YGWrapWrap);
YGNodeStyleSetWidth(root, 500);
YGNodeStyleSetHeight(root, 500);
YGNodeStyleSetFlexBasisAuto(root);
YGNodeStyleSetJustifyContent(root, YGJustifyFlexStart);
YGNodeStyleSetAlignItems(root, YGAlignFlexStart);
YGNodeStyleSetAlignContent(root, YGAlignFlexStart);
for (size_t i = 0; i < 2; i++) {
node = YGNodeNewWithConfig(config);
YGNodeStyleSetWidth(node, 100);
YGNodeStyleSetHeight(node, 100);
YGNodeInsertChild(root, node, i); // index start from 0
}
node = YGNodeNewWithConfig(config);
YGNodeStyleSetWidthAuto(node);
YGNodeStyleSetHeight(node, 200);
YGNodeStyleSetMinWidth(node, 120);
YGNodeInsertChild(root, node, 2); // index start from 0
YGNodeStyleSetFlexDirection(node, YGFlexDirectionColumn);
YGNodeStyleSetFlexWrap(node, YGWrapWrap);
for (size_t i = 0; i < 3; i++) {
YGNodeRef node1 = YGNodeNewWithConfig(config);
YGNodeStyleSetWidth(node1, 100);
YGNodeStyleSetHeight(node1, 100);
YGNodeInsertChild(node, node1, i); // index start from 0
}
YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
node = YGNodeGetChild(root, 2);
ASSERT_FLOAT_EQ(200, YGNodeLayoutGetWidth(node));
ASSERT_FLOAT_EQ(200, YGNodeLayoutGetHeight(node));
YGNodeFreeRecursive(root);
YGConfigFree(config);
}
7 changes: 2 additions & 5 deletions yoga/algorithm/CalculateLayout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1571,12 +1571,9 @@ static void calculateLayoutImpl(

// Clamp to the min/max size specified on the container.
flexLine.layout.crossDim =
boundAxis(
node,
crossAxis,
yoga::maxOrDefined(
flexLine.layout.crossDim + paddingAndBorderAxisCross,
crossAxisownerSize,
ownerWidth) -
paddingAndBorderForAxis(node, crossAxis, ownerWidth)) -
paddingAndBorderAxisCross;

// STEP 7: CROSS-AXIS ALIGNMENT
Expand Down