rubenwardy
/
TGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added new ChatBox propery to widget files

0.8
Bruno Van de Velde 2016-01-29 13:39:47 +01:00
parent c221dd7cc3
commit 2b5066c8e2
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/TGUI/Loading/WidgetLoader.cpp
View File

@ -254,14 +254,6 @@ namespace tgui
if (node->propertyValuePairs["textcolor"])
chatBox->setTextColor(Deserializer::deserialize(ObjectConverter::Type::Color, node->propertyValuePairs["textcolor"]->value).getColor());
if (node->propertyValuePairs["linesstartfromtop"])
{
if (parseBoolean(node->propertyValuePairs["linesstartfromtop"]->value))
chatBox->setLinesStartFromTop(true);
else
chatBox->setLinesStartFromTop(false);
}
for (auto& childNode : node->children)
{
if (toLower(childNode->name) == "scrollbar")
@ -291,6 +283,13 @@ namespace tgui
}
REMOVE_CHILD("line");
if (node->propertyValuePairs["linesstartfromtop"])
chatBox->setLinesStartFromTop(parseBoolean(node->propertyValuePairs["linesstartfromtop"]->value));
// This has to be parsed after the lines have been added
if (node->propertyValuePairs["newlinesbelowothers"])
chatBox->setNewLinesBelowOthers(parseBoolean(node->propertyValuePairs["newlinesbelowothers"]->value));
return chatBox;
}

5
src/TGUI/Loading/WidgetSaver.cpp
View File

@ -159,6 +159,11 @@ namespace tgui
else
SET_PROPERTY("LinesStartFromTop", "false");
if (chatBox->getNewLinesBelowOthers())
SET_PROPERTY("NewLinesBelowOthers", "true");
else
SET_PROPERTY("NewLinesBelowOthers", "false");
for (std::size_t i = 0; i < chatBox->getLineAmount(); ++i)
{
unsigned int lineTextSize = chatBox->getLineTextSize(i);

14
tests/Widgets/ChatBox.cpp
View File

@ -240,8 +240,10 @@ TEST_CASE("[ChatBox]") {
chatBox->setOpacity(0.8f);
chatBox->setTextColor(sf::Color::White);
chatBox->setTextSize(34);
chatBox->addLine("L4");
chatBox->addLine("L2", 32);
chatBox->setLinesStartFromTop(true);
chatBox->setNewLinesBelowOthers(false);
chatBox->addLine("L2");
chatBox->addLine("L4", 32);
chatBox->addLine("L3", sf::Color::Magenta);
chatBox->addLine("L1", sf::Color::Cyan, 36);
@ -254,10 +256,10 @@ TEST_CASE("[ChatBox]") {
REQUIRE(compareFiles("WidgetFileChatBox1.txt", "WidgetFileChatBox2.txt"));
// Make sure that the lines are still in the correct order
REQUIRE(chatBox->getLine(0) == "L4");
REQUIRE(chatBox->getLine(1) == "L2");
REQUIRE(chatBox->getLine(2) == "L3");
REQUIRE(chatBox->getLine(3) == "L1");
REQUIRE(chatBox->getLine(0) == "L1");
REQUIRE(chatBox->getLine(1) == "L3");
REQUIRE(chatBox->getLine(2) == "L4");
REQUIRE(chatBox->getLine(3) == "L2");
SECTION("Copying widget") {
tgui::ChatBox temp;