Add text panel colors colors to skin params to make it easy to change by client application.

Author: kovacsv

Sources/BuiltInNodes/BI_UINodePanels.cpp

@@ -184,12 +184,12 @@ void NodeUIMultiLineTextPanel::Draw (NUIE::NodeUIDrawingEnvironment& env, const
 
 NUIE::Color NodeUIMultiLineTextPanel::GetTextColor (NUIE::NodeUIDrawingEnvironment& env) const
 {
-	return env.GetSkinParams ().GetNodeContentTextColor ();
+	return env.GetSkinParams ().GetTextPanelTextColor ();
 }
 
 NUIE::Color NodeUIMultiLineTextPanel::GetBackgroundColor (NUIE::NodeUIDrawingEnvironment& env) const
 {
-	return env.GetSkinParams ().GetNodeContentBackgroundColor ();
+	return env.GetSkinParams ().GetTextPanelBackgroundColor ();
 }
 
 NodeUISlotPanel::NodeUISlotPanel (const NUIE::UINode& node, NUIE::NodeUIDrawingEnvironment& env) :

Sources/BuiltInNodes/BI_ViewerUINodes.cpp

@@ -107,22 +107,6 @@ bool MultiLineViewerNode::IsForceCalculated () const
 
 void MultiLineViewerNode::UpdateNodeDrawingImage (NUIE::NodeUIDrawingEnvironment& env, NUIE::NodeDrawingImage& drawingImage) const
 {
-	class NodeUIMultiLineTextViewerPanel : public NodeUIMultiLineTextPanel
-	{
-	public:
-		NodeUIMultiLineTextViewerPanel (const std::vector<std::wstring>& nodeTexts, NUIE::NodeUIDrawingEnvironment& env, size_t textsPerPage) :
-			NodeUIMultiLineTextPanel (nodeTexts, env, textsPerPage)
-		{
-		
-		}
-
-	private:
-		virtual NUIE::Color GetBackgroundColor (NUIE::NodeUIDrawingEnvironment&) const override
-		{
-			return NUIE::Color (255, 255, 100);
-		}
-	};
-
 	std::vector<std::wstring> nodeTexts;
 	if (HasCalculatedValue ()) {
 		NE::ValueConstPtr nodeValue = GetCalculatedValue ();
@@ -154,7 +138,7 @@ void MultiLineViewerNode::UpdateNodeDrawingImage (NUIE::NodeUIDrawingEnvironment
 	NUIE::NodePanelDrawer drawer;
 	drawer.AddPanel (NUIE::NodeUIPanelPtr (new NodeUIHeaderPanel (GetNodeName ())));
 	drawer.AddPanel (NUIE::NodeUIPanelPtr (new NodeUISlotPanel (*this, env)));
-	drawer.AddPanel (NUIE::NodeUIPanelPtr (new NodeUIMultiLineTextViewerPanel (nodeTextsToShow, env, textsPerPage)));
+	drawer.AddPanel (NUIE::NodeUIPanelPtr (new NodeUIMultiLineTextPanel (nodeTextsToShow, env, textsPerPage)));
 	if (textCount > textsPerPage) {
 		drawer.AddPanel (NUIE::NodeUIPanelPtr (new NodeUILeftRightButtonsPanel ("minus", L"<", "plus", L">", std::to_wstring (currentPage) + L" / " + std::to_wstring (pageCount) + L" (" + std::to_wstring (textCount) + L")", env)));
 	}

Sources/NodeUIEngine/NUIE_SkinParams.cpp

@@ -27,11 +27,13 @@ DefaultSkinParams::DefaultSkinParams () :
 	slotTextBackgroundColor (225, 225, 225),
 	selectionBlendColor (0, 255, 0),
 	selectionRectPen (Color (0, 138, 184), 1.0),
-	hasValueStatusColor (Color (0, 255, 0)),
-	hasNoValueStatusColor (Color (255, 0, 0)),
+	hasValueStatusColor (0, 255, 0),
+	hasNoValueStatusColor (255, 0, 0),
 	buttonBorderPen (Color (50, 75, 100), 1.0),
 	buttonBackgroundColor (150, 175, 200),
 	selectedButtonBackgroundColor (190, 215, 240),
+	textPanelTextColor (0, 0, 0),
+	textPanelBackgroundColor (255, 255, 100),
 	groupNameFont (L"Arial", 18.0),
 	groupNameColor (Color (0, 0, 0)),
 	groupBackgroundColor (Color (160, 200, 240)),
@@ -135,6 +137,16 @@ const Color& DefaultSkinParams::GetSelectedButtonBackgroundColor () const
 	return selectedButtonBackgroundColor;
 }
 
+const Color& DefaultSkinParams::GetTextPanelTextColor () const
+{
+	return textPanelTextColor;
+}
+
+const Color& DefaultSkinParams::GetTextPanelBackgroundColor () const
+{
+	return textPanelBackgroundColor;
+}
+
 const Font& DefaultSkinParams::GetGroupNameFont () const
 {
 	return groupNameFont;

Sources/NodeUIEngine/NUIE_SkinParams.hpp

@@ -37,6 +37,9 @@ class SkinParams
 	virtual const Color&	GetButtonBackgroundColor () const = 0;
 	virtual const Color&	GetSelectedButtonBackgroundColor () const = 0;
 
+	virtual const Color&	GetTextPanelTextColor () const = 0;
+	virtual const Color&	GetTextPanelBackgroundColor () const = 0;
+
 	virtual const Font&		GetGroupNameFont () const = 0;
 	virtual const Color&	GetGroupNameColor () const = 0;
 	virtual const Color&	GetGroupBackgroundColor () const = 0;
@@ -73,6 +76,9 @@ class DefaultSkinParams : public SkinParams
 	virtual const Color&	GetButtonBackgroundColor () const override;
 	virtual const Color&	GetSelectedButtonBackgroundColor () const override;
 
+	virtual const Color&	GetTextPanelTextColor () const override;
+	virtual const Color&	GetTextPanelBackgroundColor () const override;
+
 	virtual const Font&		GetGroupNameFont () const override;
 	virtual const Color&	GetGroupNameColor () const override;
 	virtual const Color&	GetGroupBackgroundColor () const override;
@@ -103,6 +109,9 @@ class DefaultSkinParams : public SkinParams
 	Color	buttonBackgroundColor;
 	Color	selectedButtonBackgroundColor;
 
+	Color	textPanelTextColor;
+	Color	textPanelBackgroundColor;
+
 	Font	groupNameFont;
 	Color	groupNameColor;
 	Color	groupBackgroundColor;