Ana Sayfa Keşfet Yardım
Giriş Yap
cpp
/
RmlUi
şunun yansıması https://github.com/mikke89/RmlUi.git
2
0
Çatalla 0
Dosyalar Sorunlar 0 Wiki
Kaynağa Gözat

Fixup flexbox shrink-to-fit benchmarks and unit test

Michael Ragazzon 5 ay önce
ebeveyn
dcfbde799e
işleme
e6545aa71b
2 değiştirilmiş dosya ile 105 ekleme ve 9 silme
Birleşik Görünüm Farklılık Durumunu Göster
  1. 10 9
      Tests/Source/Benchmarks/Flexbox.cpp
  2. 95 0
      Tests/Source/UnitTests/FlexFormatting.cpp

+ 10 - 9
Tests/Source/Benchmarks/Flexbox.cpp
Dosyayı Görüntüle 

@@ -602,7 +602,7 @@ static const String rml_flexbox_shrink_to_fit = R"(
 
 	</style>
 
 	</style>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
-<div id="basic" class="shrink-to-fit" style="display: none">
 
+<div id="basic" class="shrink-to-fit">
 
 	Before
 
 	Before
 
 	<div class="outer">
 
 	<div class="outer">
 
 		<div class="inner">Flex</div>
 
 		<div class="inner">Flex</div>
 
@@ -611,9 +611,15 @@ static const String rml_flexbox_shrink_to_fit = R"(
 
 </div>
 
 </div>
 
 <div id="nested" class="shrink-to-fit">
 
 <div id="nested" class="shrink-to-fit">
 
 	Before
 
 	Before
 
-	<div class="outer" id="outer">
 
-		<div class="inner" id="inner">
 
-			Flex
 
+	<div class="outer">
 
+		<div class="inner">
 
+			<div class="outer">
 
+				<div class="inner">
 
+					<div class="outer">
 
+						<div class="inner">Flex</div>
 
+					</div>
 
+				</div>
 
+			</div>
 
 		</div>
 
 		</div>
 
 	</div>
 
 	</div>
 
 	After
 
 	After
 
@@ -638,11 +644,6 @@ TEST_CASE("flexbox.shrink-to-fit")
 
 	document->Show();
 
 	document->Show();
 
 	TestsShell::RenderLoop();
 
 	TestsShell::RenderLoop();
 
 
 
-	{
 
-		document->Close();
 
-		return;
 
-	}
 
-
 
 	basic->SetProperty(PropertyId::Display, Style::Display::None);
 
 	basic->SetProperty(PropertyId::Display, Style::Display::None);
 
 	nested->SetProperty(PropertyId::Display, Style::Display::None);
 
 	nested->SetProperty(PropertyId::Display, Style::Display::None);

+ 95 - 0
Tests/Source/UnitTests/FlexFormatting.cpp
Dosyayı Görüntüle 

@@ -203,3 +203,98 @@ TEST_CASE("FlexFormatting.dp_ratio")
 
 
 
 	TestsShell::ShutdownShell();
 
 	TestsShell::ShutdownShell();
 
 }
 
 }
 
+
 
+static const String rml_flexbox_shrink_to_fit = R"(
 
+<rml>
 
+<head>
 
+    <title>Flex - Shrink-to-fit 01</title>
 
+    <link type="text/rcss" href="/../Tests/Data/style.rcss"/>
 
+	<style>
 
+		body { width: 1000px; }
 
+		.shrink-to-fit {
 
+			float: left;
 
+			clear: both;
 
+			margin: 10px 0;
 
+			border: 2px #e8e8e8;
 
+		}
 
+		.outer {
 
+			border: 1px red;
 
+			padding: 30px;
 
+		}
 
+		#basic .outer {
 
+			display: flex;
 
+		}
 
+		#nested .outer, #deep .outer {
 
+			display: inline-flex;
 
+		}
 
+		.inner {
 
+			border: 1px blue;
 
+			padding: 30px;
 
+		}
 
+		.hidden {
 
+			display: none;
 
+		}
 
+	</style>
 
+</head>
 
+<body>
 
+<div id="basic" class="shrink-to-fit hidden">
 
+	Before
 
+	<div class="outer">
 
+		<div class="inner">Flex</div>
 
+	</div>
 
+	After
 
+</div>
 
+<div id="nested" class="shrink-to-fit hidden">
 
+	Before
 
+	<div class="outer" id="outer">
 
+		<div class="inner" id="inner">
 
+			Flex
 
+		</div>
 
+	</div>
 
+	After
 
+</div>
 
+<div id="deep" class="shrink-to-fit hidden">
 
+	Before
 
+	<div class="outer" id="main">
 
+		<div class="inner">
 
+			<div class="outer">
 
+				<div class="inner">
 
+					<div class="outer">
 
+						<div class="inner">Flex</div>
 
+					</div>
 
+				</div>
 
+			</div>
 
+		</div>
 
+	</div>
 
+	After
 
+</div>
 
+</body>
 
+</rml>
 
+)";
 
+
 
+TEST_CASE("FlexFormatting.shrink-to-fit")
 
+{
 
+	Context* context = TestsShell::GetContext();
 
+	REQUIRE(context);
 
+
 
+	ElementDocument* document = context->LoadDocumentFromMemory(rml_flexbox_shrink_to_fit);
 
+
 
+	SUBCASE("basic")
 
+	{
 
+		document->GetElementById("basic")->SetClass("hidden", false);
 
+	}
 
+	SUBCASE("nested")
 
+	{
 
+		document->GetElementById("nested")->SetClass("hidden", false);
 
+	}
 
+	SUBCASE("deep")
 
+	{
 
+		document->GetElementById("deep")->SetClass("hidden", false);
 
+	}
 
+
 
+	document->Show();
 
+	TestsShell::RenderLoop();
 
+
 
+	document->Close();
 
+	TestsShell::ShutdownShell();
 
+}