diff --git a/Source/Core/Layout/FlexFormattingContext.cpp b/Source/Core/Layout/FlexFormattingContext.cpp index b90ef51b9..c260431c7 100644 --- a/Source/Core/Layout/FlexFormattingContext.cpp +++ b/Source/Core/Layout/FlexFormattingContext.cpp @@ -688,7 +688,7 @@ void FlexFormattingContext::Format(Vector2f& flex_resulting_content_size, Vector } else { - if (content_size.x < 0.0f || item.cross.auto_size) + if (content_size.x < 0.0f) { item.box.SetContent(Vector2f(content_size.x, used_main_size_inner)); item.hypothetical_cross_size = diff --git a/Source/Core/Layout/LayoutDetails.cpp b/Source/Core/Layout/LayoutDetails.cpp index 84a3f3a87..0378af350 100644 --- a/Source/Core/Layout/LayoutDetails.cpp +++ b/Source/Core/Layout/LayoutDetails.cpp @@ -252,6 +252,11 @@ float LayoutDetails::GetShrinkToFitWidth(Element* element, Vector2f containing_b LayoutDetails::BuildBox(box, containing_block, element, BuildBoxMode::UnalignedBlock); LayoutDetails::GetDefiniteMinMaxHeight(min_height, max_height, element->GetComputedValues(), box, containing_block.y); + if (box.GetSize().x >= 0.f) + { + return box.GetSize().x; + } + // Currently we don't support shrink-to-fit width for tables. Just return a zero-sized width. const Style::Display display = element->GetDisplay(); if (display == Style::Display::Table || display == Style::Display::InlineTable) diff --git a/Tests/Source/UnitTests/CMakeLists.txt b/Tests/Source/UnitTests/CMakeLists.txt index 5282be03d..68b098824 100644 --- a/Tests/Source/UnitTests/CMakeLists.txt +++ b/Tests/Source/UnitTests/CMakeLists.txt @@ -15,6 +15,7 @@ add_executable(${TARGET_NAME} ElementStyle.cpp EventListener.cpp Filter.cpp + FlexFormatting.cpp Layout.cpp Localization.cpp main.cpp diff --git a/Tests/Source/UnitTests/FlexFormatting.cpp b/Tests/Source/UnitTests/FlexFormatting.cpp new file mode 100644 index 000000000..2fb1e124d --- /dev/null +++ b/Tests/Source/UnitTests/FlexFormatting.cpp @@ -0,0 +1,108 @@ +/* + * This source file is part of RmlUi, the HTML/CSS Interface Middleware + * + * For the latest information, see http://github.com/mikke89/RmlUi + * + * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd + * Copyright (c) 2019-2023 The RmlUi Team, and contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + */ + +#include "../Common/TestsShell.h" +#include +#include +#include +#include +#include + +using namespace Rml; + +static const String document_flex_rml = R"( + + + + + + + +
+ +
+ + +)"; + +TEST_CASE("FlexFormatting") +{ + Context* context = TestsShell::GetContext(); + REQUIRE(context); + + ElementDocument* document = context->LoadDocumentFromMemory(document_flex_rml); + REQUIRE(document); + document->Show(); + + Element* checkbox = document->GetElementById("checkbox"); + Element* flex = document->GetElementById("flex"); + + struct TestCase { + String flex_direction; + String align_items; + Vector2f expected_size; + }; + TestCase test_cases[] = { + {"column", "stretch", Vector2f(248, 16)}, + {"column", "center", Vector2f(16, 16)}, + {"row", "stretch", Vector2f(16, 88)}, + {"row", "center", Vector2f(16, 16)}, + }; + + for (auto& test_case : test_cases) + { + flex->SetProperty("flex-direction", test_case.flex_direction); + flex->SetProperty("align-items", test_case.align_items); + + TestsShell::RenderLoop(); + + CAPTURE(test_case.align_items); + CAPTURE(test_case.flex_direction); + CHECK(checkbox->GetBox().GetSize() == test_case.expected_size); + } + + document->Close(); + + TestsShell::ShutdownShell(); +}