From 679aab8abc164cc934095e979fdf1db7dac53c10 Mon Sep 17 00:00:00 2001 From: Michael Ragazzon Date: Sun, 16 Feb 2025 23:14:10 +0100 Subject: [PATCH] Fix flex formatting test and minor include/comment fixups --- Source/Core/ElementHandle.cpp | 2 +- Source/Core/Layout/FlexFormattingContext.cpp | 2 +- Tests/Source/Common/TypesToString.h | 2 ++ Tests/Source/UnitTests/FlexFormatting.cpp | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Source/Core/ElementHandle.cpp b/Source/Core/ElementHandle.cpp index 29f7d4ef8..79e89b8e2 100644 --- a/Source/Core/ElementHandle.cpp +++ b/Source/Core/ElementHandle.cpp @@ -300,7 +300,7 @@ void ElementHandle::ProcessDefaultAction(Event& event) { HandleEdgeMarginParser parser; if (!parser.Parse(edge_margin_str, edge_margin)) - Log::Message(Log::LT_WARNING, "Failed to parse 'edge-constraints' attribute for element '%s'.", GetAddress().c_str()); + Log::Message(Log::LT_WARNING, "Failed to parse 'edge_margin' attribute for element '%s'.", GetAddress().c_str()); } initialised = true; diff --git a/Source/Core/Layout/FlexFormattingContext.cpp b/Source/Core/Layout/FlexFormattingContext.cpp index 1e7cb2626..a15bfd9b9 100644 --- a/Source/Core/Layout/FlexFormattingContext.cpp +++ b/Source/Core/Layout/FlexFormattingContext.cpp @@ -117,7 +117,7 @@ UniquePtr FlexFormattingContext::Format(ContainerBox* parent_containe Vector2f FlexFormattingContext::GetMaxContentSize(Element* element) { - // A large but finite number is used here, since layouting doesn't always work well infinities. + // A large but finite number is used here, since layouting doesn't always work well with infinities. const Vector2f infinity(10000.0f, 10000.0f); RootBox root(infinity); auto flex_container_box = MakeUnique(element, &root); diff --git a/Tests/Source/Common/TypesToString.h b/Tests/Source/Common/TypesToString.h index 612a4c2dc..1f301f436 100644 --- a/Tests/Source/Common/TypesToString.h +++ b/Tests/Source/Common/TypesToString.h @@ -29,9 +29,11 @@ #ifndef RMLUI_TESTS_COMMON_TYPESTOSTRING_H #define RMLUI_TESTS_COMMON_TYPESTOSTRING_H +#include #include #include #include +#include #include #include diff --git a/Tests/Source/UnitTests/FlexFormatting.cpp b/Tests/Source/UnitTests/FlexFormatting.cpp index f2ee3eaf8..0d1e28639 100644 --- a/Tests/Source/UnitTests/FlexFormatting.cpp +++ b/Tests/Source/UnitTests/FlexFormatting.cpp @@ -99,7 +99,8 @@ TEST_CASE("FlexFormatting") CAPTURE(test_case.align_items); CAPTURE(test_case.flex_direction); - CHECK(checkbox->GetBox().GetSize() == test_case.expected_size); + CHECK(checkbox->GetBox().GetSize().x == doctest::Approx(test_case.expected_size.x)); + CHECK(checkbox->GetBox().GetSize().y == doctest::Approx(test_case.expected_size.y)); } document->Close();