Fix flex formatting test and minor include/comment fixups

mikke89 · Feb 16, 2025 · 679aab8 · 679aab8
1 parent 9363a12
commit 679aab8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -117,7 +117,7 @@ UniquePtr<LayoutBox> 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<FlexContainer>(element, &root);

diff --git 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 <RmlUi/Core/Mesh.h>
 #include <RmlUi/Core/TypeConverter.h>
 #include <RmlUi/Core/Types.h>
 #include <RmlUi/Core/Variant.h>
+#include <RmlUi/Core/Vertex.h>
 #include <doctest.h>
 #include <ostream>
 

diff --git 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();