Home Explore Help
Sign In
cpp
/
RmlUi
mirror of https://github.com/mikke89/RmlUi.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Fix crash when cloning elements with RML contents. See #135.

Michael Ragazzon 5 years ago
parent
9189b83c43
commit
9b81bd0065
4 changed files with 109 additions and 2 deletions
Unified View Show Diff Stats
  1. 2 1
      Source/Core/Factory.cpp
  2. 1 1
      Tests/CMakeLists.txt
  3. 105 0
      Tests/Source/UnitTests/Element.cpp
  4. 1 0
      Tests/Source/UnitTests/main.cpp

+ 2 - 1
Source/Core/Factory.cpp
View File 

@@ -413,7 +413,8 @@ bool Factory::InstanceElementText(Element* parent, const String& in_text)
 
 	{
 
 	{
 
 		RMLUI_ZoneScopedNC("InstanceStream", 0xDC143C);
 
 		RMLUI_ZoneScopedNC("InstanceStream", 0xDC143C);
 
 		auto stream = MakeUnique<StreamMemory>(text.size() + 32);
 
 		auto stream = MakeUnique<StreamMemory>(text.size() + 32);
 
-		String tag = parent->GetContext()->GetDocumentsBaseTag();
 
+		Context* context = parent->GetContext();
 
+		String tag = context ? context->GetDocumentsBaseTag() : "body";
 
 		String open_tag = "<" + tag + ">";
 
 		String open_tag = "<" + tag + ">";
 
 		String close_tag = "</" + tag + ">";
 
 		String close_tag = "</" + tag + ">";
 
 		stream->Write(open_tag.c_str(), open_tag.size());
 
 		stream->Write(open_tag.c_str(), open_tag.size());

+ 1 - 1
Tests/CMakeLists.txt
View File 

@@ -37,7 +37,7 @@ file(GLOB UnitTests_HDR_FILES ${CMAKE_CURRENT_SOURCE_DIR}/Source/UnitTests/*.h )
 
 file(GLOB UnitTests_SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/Source/UnitTests/*.cpp )
 
 file(GLOB UnitTests_SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/Source/UnitTests/*.cpp )
 
 
 
 add_executable(UnitTests ${UnitTests_HDR_FILES} ${UnitTests_SRC_FILES})
 
 add_executable(UnitTests ${UnitTests_HDR_FILES} ${UnitTests_SRC_FILES})
 
-target_link_libraries(UnitTests RmlCore doctest::doctest)
 
+target_link_libraries(UnitTests RmlCore doctest::doctest ${sample_LIBRARIES})
 
 set_target_properties(UnitTests PROPERTIES CXX_STANDARD 14)
 
 set_target_properties(UnitTests PROPERTIES CXX_STANDARD 14)
 
 
 
 add_common_target_options(UnitTests)
 
 add_common_target_options(UnitTests)

+ 105 - 0
Tests/Source/UnitTests/Element.cpp
View File 

@@ -0,0 +1,105 @@
 
+/*
 
+ * 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 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 <RmlUi/Core/Context.h>
 
+#include <RmlUi/Core/Element.h>
 
+#include <RmlUi/Core/ElementDocument.h>
 
+#include <doctest.h>
 
+
 
+using namespace Rml;
 
+
 
+static const String document_clone_rml = R"(
 
+<rml>
 
+<head>
 
+	<title>Test</title>
 
+	<link type="text/rcss" href="/assets/rml.rcss"/>
 
+	<link type="text/rcss" href="/assets/invader.rcss"/>
 
+	<style>
 
+		body
 
+		{
 
+			left: 0;
 
+			top: 0;
 
+			right: 0;
 
+			bottom: 0;
 
+		}
 
+		div {
 
+			drag: clone;
 
+			background: #ccc;
 
+			height: 100px;
 
+		}
 
+		span {
 
+			color: red;
 
+		}
 
+	</style>
 
+</head>
 
+
 
+<body>
 
+<div>This is a <span>sample</span>.</div>
 
+</body>
 
+</rml>
 
+)";
 
+
 
+
 
+TEST_CASE("element.clone")
 
+{
 
+	Context* context = TestsShell::GetContext();
 
+	REQUIRE(context);
 
+
 
+	ElementDocument* document = context->LoadDocumentFromMemory(document_clone_rml);
 
+	REQUIRE(document);
 
+	document->Show();
 
+
 
+	context->Update();
 
+	context->Render();
 
+
 
+	TestsShell::RenderLoop();
 
+
 
+	// Simulate input for mouse click and drag
 
+	context->ProcessMouseMove(10, 10, 0);
 
+
 
+	context->Update();
 
+	context->Render();
 
+
 
+	context->ProcessMouseButtonDown(0, 0);
 
+
 
+	context->Update();
 
+	context->Render();
 
+
 
+	// This should initiate a drag clone.
 
+	context->ProcessMouseMove(10, 11, 0);
 
+
 
+	context->Update();
 
+	context->Render();
 
+
 
+	context->ProcessMouseButtonUp(0, 0);
 
+
 
+	document->Close();
 
+
 
+	TestsShell::ShutdownShell();
 
+}

+ 1 - 0
Tests/Source/UnitTests/main.cpp
View File 

@@ -30,3 +30,4 @@
 
 #include <doctest.h>
 
 #include <doctest.h>
 
 
 
 #include "../Common/TestsInterface.cpp"
 
 #include "../Common/TestsInterface.cpp"
 
+#include "../Common/TestsShell.cpp"