Consistency

nimbletools · Aug 5, 2017 · e3a982e · e3a982e
1 parent 8fce166
commit e3a982e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/content/example.xml b/content/example.xml
@@ -11,6 +11,6 @@
 	</vbox>
 
 	<hbox id="container" wrapping="true" anchor="fill" margin="5">
-		<text font="content/Roboto.ttf" width="400" height="26" />
+		<text font="content/Roboto.ttf" fontsize="20" width="100" height="26" />
 	</hbox>
 </hbox>
diff --git a/include/nimble/widgets/text.h b/include/nimble/widgets/text.h
@@ -14,7 +14,7 @@ namespace na
 	private:
 		s2::string m_text;
 		Font* m_font = nullptr;
-		float m_fontSize = 20.0f;
+		float m_fontSize = 16.0f;
 		glm::ivec2 m_size;
 		glm::vec4 m_color = glm::vec4(0, 0, 0, 1);
 		glm::vec4 m_colorText = glm::vec4(1, 1, 1, 1);

diff --git a/src/nimble/widgets/text.cpp b/src/nimble/widgets/text.cpp
@@ -114,6 +114,7 @@ void na::TextWidget::Load(ContentNode &node)
 
 	SetColor(node.GetColor("color", false, m_color));
 	SetTextColor(node.GetColor("textcolor", false, m_colorText));
+	SetSelectionColor(node.GetColor("selectioncolor", false, m_colorSelection));
 
 	SetMultiline(node.GetBool("multiline", false, m_multiline));