Fix disabled node appearance.

Author: kovacsv

Sources/BuiltInNodes/BI_BuiltInFeatures.cpp

@@ -157,7 +157,7 @@ void EnableDisableFeature::DrawInplace (NUIE::NodeUIDrawingEnvironment& env, con
 	if (nodeEnabled) {
 		drawer (env);
 	} else {
-		NUIE::ColorBlenderContextDecorator disabledContext (env.GetDrawingContext (), env.GetSkinParams ().GetBackgroundColor ());
+		NUIE::ColorBlenderContextDecorator disabledContext (env.GetDrawingContext (), env.GetSkinParams ().GetBackgroundColor (), 1, 1);
 		NUIE::NodeUIDrawingEnvironmentContextDecorator disabledEnv (env, disabledContext);
 		drawer (disabledEnv);
 	}

Sources/NodeUIEngine/NUIE_ContextDecorators.cpp

@@ -91,19 +91,21 @@ Pen ColorChangerContextDecorator::GetChangedPen (const Pen& origPen)
 	return Pen (GetChangedColor (origPen.GetColor ()), origPen.GetThickness ());
 }
 
-ColorBlenderContextDecorator::ColorBlenderContextDecorator (DrawingContext& decorated, const Color& blendColor) :
+ColorBlenderContextDecorator::ColorBlenderContextDecorator (DrawingContext& decorated, const Color& blendColor, unsigned int origRatio, unsigned int blendRatio) :
 	ColorChangerContextDecorator (decorated),
-	blendColor (blendColor)
+	blendColor (blendColor),
+	origRatio (origRatio),
+	blendRatio (blendRatio)
 {
 
 }
 
 Color ColorBlenderContextDecorator::GetChangedColor (const Color& origColor)
 {
 	return Color (
-		(unsigned char) ((4 * origColor.GetR () + blendColor.GetR ()) / 5.0),
-		(unsigned char) ((4 * origColor.GetG () + blendColor.GetG ()) / 5.0),
-		(unsigned char) ((4 * origColor.GetB () + blendColor.GetB ()) / 5.0)
+		(unsigned char) ((origRatio * (unsigned int) origColor.GetR () + blendRatio * (unsigned int) blendColor.GetR ()) / (origRatio + blendRatio)),
+		(unsigned char) ((origRatio * (unsigned int) origColor.GetG () + blendRatio * (unsigned int) blendColor.GetG ()) / (origRatio + blendRatio)),
+		(unsigned char) ((origRatio * (unsigned int) origColor.GetB () + blendRatio * (unsigned int) blendColor.GetB ()) / (origRatio + blendRatio))
 	);
 }
 

Sources/NodeUIEngine/NUIE_ContextDecorators.hpp

@@ -47,12 +47,15 @@ class ColorChangerContextDecorator : public DrawingContextDecorator
 class ColorBlenderContextDecorator : public ColorChangerContextDecorator
 {
 public:
-	ColorBlenderContextDecorator (DrawingContext& decorated, const Color& blendColor);
+	ColorBlenderContextDecorator (DrawingContext& decorated, const Color& blendColor, unsigned int origRatio, unsigned int blendRatio);
 
 private:
 	virtual Color	GetChangedColor (const Color& origColor) override;
 
-	Color blendColor;
+	Color			blendColor;
+	unsigned int	origRatio;
+	unsigned int	blendRatio;
+
 };
 
 class TextSkipperContextDecorator : public DrawingContextDecorator

Sources/NodeUIEngine/NUIE_NodeUIManagerDrawer.cpp

@@ -173,7 +173,7 @@ void NodeUIManagerDrawer::DrawNode (NodeUIDrawingEnvironment& env, const UINode*
 
 	if (uiManager.GetSelectedNodes ().Contains (uiNode->GetId ())) {
 		env.GetDrawingContext ().FillRect (selectionRect, env.GetSkinParams ().GetNodeSelectionRectPen ().GetColor ());
-		ColorBlenderContextDecorator selectionContext (env.GetDrawingContext (), env.GetSkinParams ().GetSelectionBlendColor ());
+		ColorBlenderContextDecorator selectionContext (env.GetDrawingContext (), env.GetSkinParams ().GetSelectionBlendColor (), 4, 1);
 		NodeUIDrawingEnvironmentContextDecorator selectionEnv (env, selectionContext);
 		uiNode->Draw (selectionEnv);
 	} else {