Rename NodeUIScaleIndependentData to SelectionParams.

kovacsv · kovacsv · commit 2cc85519008b · 2020-12-31T10:53:03.000+01:00
diff --git a/Sources/NodeUIEngine/NUIE_NodeUIManagerDrawer.cpp b/Sources/NodeUIEngine/NUIE_NodeUIManagerDrawer.cpp
@@ -16,19 +16,19 @@ static void GetBezierControlPoints (const Point& beg, const Point& end, Point& c
 	controlPoint2 = end - bezierOffset;
 }
 
-NodeUIScaleIndependentData::NodeUIScaleIndependentData (const NodeUIManager& uiManager, const SkinParams& skinParams) :
-	selectionThickness (0.0)
+SelectionParams::SelectionParams (const NodeUIManager& uiManager, const SkinParams& skinParams) :
+	thickness (0.0)
 {
 	double scale = uiManager.GetViewBox ().GetScale ();
-	selectionThickness = skinParams.GetNodeSelectionRectPen ().GetThickness ();
+	thickness = skinParams.GetNodeSelectionRectPen ().GetThickness ();
 	if (scale < 1.0) {
-		selectionThickness /= scale;
+		thickness /= scale;
 	}
 }
 
-double NodeUIScaleIndependentData::GetSelectionThickness () const
+double SelectionParams::GetThickness () const
 {
-	return selectionThickness;
+	return thickness;
 }
 
 NodeUIManagerDrawer::NodeUIManagerDrawer (const NodeUIManager& uiManager) :
@@ -45,14 +45,14 @@ void NodeUIManagerDrawer::Draw (NodeUIDrawingEnvironment& drawingEnv, const Node
 	DrawBackground (drawingEnv);
 
 	{
-		NodeUIScaleIndependentData scaleIndependentData (uiManager, drawingEnv.GetSkinParams ());
+		SelectionParams selectionParams (uiManager, drawingEnv.GetSkinParams ());
 		PreviewContextDecorator textSkipperContext (drawingContext, uiManager.IsPreviewMode ());
 		ViewBoxContextDecorator viewBoxContext (textSkipperContext, uiManager.GetViewBox ());
 		DrawingEnvironmentContextDecorator drawEnv (drawingEnv, viewBoxContext);
 		
 		DrawGroups (drawEnv, drawModifier);
-		DrawConnections (drawEnv, scaleIndependentData, drawModifier);
-		DrawNodes (drawEnv, scaleIndependentData, drawModifier);
+		DrawConnections (drawEnv, selectionParams, drawModifier);
+		DrawNodes (drawEnv, selectionParams, drawModifier);
 	}
 
 	DrawSelectionRect (drawingEnv, drawModifier);
@@ -103,11 +103,11 @@ void NodeUIManagerDrawer::DrawGroups (NodeUIDrawingEnvironment& drawingEnv, cons
 	});
 }
 
-void NodeUIManagerDrawer::DrawConnections (NodeUIDrawingEnvironment& drawingEnv, const NodeUIScaleIndependentData& scaleIndependentData, const NodeDrawingModifier* drawModifier) const
+void NodeUIManagerDrawer::DrawConnections (NodeUIDrawingEnvironment& drawingEnv, const SelectionParams& selectionParams, const NodeDrawingModifier* drawModifier) const
 {
 	const SkinParams& skinParams = drawingEnv.GetSkinParams ();
-	const Pen& pen = skinParams.GetConnectionLinePen ();
-	Pen selectionPen (skinParams.GetNodeSelectionRectPen ().GetColor (), scaleIndependentData.GetSelectionThickness ());
+	const Pen& normalPen = skinParams.GetConnectionLinePen ();
+	Pen selectionPen (skinParams.GetNodeSelectionRectPen ().GetColor (), selectionParams.GetThickness ());
 
 	const Selection& selection = uiManager.GetSelection ();
 	const NE::NodeCollection& selectedNodes = selection.GetNodes ();
@@ -125,13 +125,14 @@ void NodeUIManagerDrawer::DrawConnections (NodeUIDrawingEnvironment& drawingEnv,
 				}
 				bool endSelected = selectedNodes.Contains (endNode->GetId ());
 				Point end = GetInputSlotConnPosition (drawingEnv, drawModifier, endNode, inputSlot->GetId ());
-				if (IsConnectionVisible (drawingEnv, beg, end)) {
-					if (begSelected || endSelected) {
-						DrawConnection (drawingEnv, selectionPen, beg, end);
-					} else {
-						if (inputSlot->GetConnectionDisplayMode () == ConnectionDisplayMode::Normal) {
-							DrawConnection (drawingEnv, pen, beg, end);
-						}
+				if (!IsConnectionVisible (drawingEnv, beg, end)) {
+					return;
+				}
+				if (begSelected || endSelected) {
+					DrawConnection (drawingEnv, selectionPen, beg, end);
+				} else {
+					if (inputSlot->GetConnectionDisplayMode () == ConnectionDisplayMode::Normal) {
+						DrawConnection (drawingEnv, normalPen, beg, end);
 					}
 				}
 			});
@@ -143,7 +144,7 @@ void NodeUIManagerDrawer::DrawConnections (NodeUIDrawingEnvironment& drawingEnv,
 	if (drawModifier != nullptr) {
 		drawModifier->EnumerateTemporaryConnections ([&] (const Point& beg, const Point& end, NodeDrawingModifier::Direction dir) {
 			if (IsConnectionVisible (drawingEnv, beg, end)) {
-				DrawTemporaryConnection (drawingEnv, pen, beg, end, dir);
+				DrawTemporaryConnection (drawingEnv, normalPen, beg, end, dir);
 			}
 		});
 	}
@@ -177,10 +178,10 @@ void NodeUIManagerDrawer::DrawTemporaryConnection (NodeUIDrawingEnvironment& dra
 	}
 }
 
-void NodeUIManagerDrawer::DrawNodes (NodeUIDrawingEnvironment& drawingEnv, const NodeUIScaleIndependentData& scaleIndependentData, const NodeDrawingModifier* drawModifier) const
+void NodeUIManagerDrawer::DrawNodes (NodeUIDrawingEnvironment& drawingEnv, const SelectionParams& selectionParams, const NodeDrawingModifier* drawModifier) const
 {
 	uiManager.EnumerateNodes ([&] (UINodeConstPtr uiNode) {
-		if (!IsNodeVisible (drawingEnv, scaleIndependentData, drawModifier, uiNode)) {
+		if (!IsNodeVisible (drawingEnv, selectionParams, drawModifier, uiNode)) {
 			return true;
 		}
 		
@@ -190,7 +191,7 @@ void NodeUIManagerDrawer::DrawNodes (NodeUIDrawingEnvironment& drawingEnv, const
 		}
 
 		Point nodeOffset = drawModifier->GetNodeOffset (uiNode->GetId ());
-		DrawNode (drawingEnv, scaleIndependentData, nodeOffset, selectionMode, uiNode);
+		DrawNode (drawingEnv, selectionParams, nodeOffset, selectionMode, uiNode);
 		return true;
 	});
 
@@ -202,24 +203,24 @@ void NodeUIManagerDrawer::DrawNodes (NodeUIDrawingEnvironment& drawingEnv, const
 		for (const auto& duplicatedNode : duplicatedNodes) {
 			UINodeConstPtr uiNode = uiManager.GetNode (duplicatedNode.first);
 			Point nodeOffset = drawModifier->GetNodeOffset (uiNode->GetId ());
-			DrawNode (drawingEnv, scaleIndependentData, nodeOffset + duplicatedNode.second, SelectionMode::NotSelected, uiNode);
+			DrawNode (drawingEnv, selectionParams, nodeOffset + duplicatedNode.second, SelectionMode::NotSelected, uiNode);
 		}
 	}
 }
 
-void NodeUIManagerDrawer::DrawNode (NodeUIDrawingEnvironment& drawingEnv, const NodeUIScaleIndependentData& scaleIndependentData, const Point& offset, SelectionMode selectionMode, const UINodeConstPtr& uiNode) const
+void NodeUIManagerDrawer::DrawNode (NodeUIDrawingEnvironment& drawingEnv, const SelectionParams& selectionParams, const Point& offset, SelectionMode selectionMode, const UINodeConstPtr& uiNode) const
 {
 	ViewBox offsetViewBox (offset, 1.0);
 	ViewBoxContextDecorator offsetContext (drawingEnv.GetDrawingContext (), offsetViewBox);
 	DrawingEnvironmentContextDecorator offsetEnv (drawingEnv, offsetContext);
-	DrawNode (offsetEnv, scaleIndependentData, selectionMode, uiNode);
+	DrawNode (offsetEnv, selectionParams, selectionMode, uiNode);
 }
 
-void NodeUIManagerDrawer::DrawNode (NodeUIDrawingEnvironment& drawingEnv, const NodeUIScaleIndependentData& scaleIndependentData, SelectionMode selectionMode, const UINodeConstPtr& uiNode) const
+void NodeUIManagerDrawer::DrawNode (NodeUIDrawingEnvironment& drawingEnv, const SelectionParams& selectionParams, SelectionMode selectionMode, const UINodeConstPtr& uiNode) const
 {
 	if (selectionMode == SelectionMode::Selected) {
 		Rect nodeRect = uiNode->GetRect (drawingEnv);
-		double selectionThickness = scaleIndependentData.GetSelectionThickness ();
+		double selectionThickness = selectionParams.GetThickness ();
 		Rect selectionRect = nodeRect.Expand (Size (selectionThickness * 2.0, selectionThickness * 2.0));
 		drawingEnv.GetDrawingContext ().FillRect (selectionRect, drawingEnv.GetSkinParams ().GetNodeSelectionRectPen ().GetColor ());
 		ColorBlenderContextDecorator selectionContext (drawingEnv.GetDrawingContext (), drawingEnv.GetSkinParams ().GetSelectionBlendColor ());
@@ -247,11 +248,11 @@ bool NodeUIManagerDrawer::IsConnectionVisible (NodeUIDrawingEnvironment& drawing
 	return IsRectVisible (drawingEnv, boundingRect);
 }
 
-bool NodeUIManagerDrawer::IsNodeVisible (NodeUIDrawingEnvironment& drawingEnv, const NodeUIScaleIndependentData& scaleIndependentData, const NodeDrawingModifier* drawModifier, const UINodeConstPtr& uiNode) const
+bool NodeUIManagerDrawer::IsNodeVisible (NodeUIDrawingEnvironment& drawingEnv, const SelectionParams& selectionParams, const NodeDrawingModifier* drawModifier, const UINodeConstPtr& uiNode) const
 {
 	Rect boundingRect = GetExtendedNodeRect (drawingEnv, drawModifier, uiNode);
 
-	double selectionThickness = scaleIndependentData.GetSelectionThickness ();
+	double selectionThickness = selectionParams.GetThickness ();
 	boundingRect = boundingRect.Expand (Size (selectionThickness * 2.0, selectionThickness * 2.0));
 
 	return IsRectVisible (drawingEnv, boundingRect);
diff --git a/Sources/NodeUIEngine/NUIE_NodeUIManagerDrawer.hpp b/Sources/NodeUIEngine/NUIE_NodeUIManagerDrawer.hpp
@@ -7,15 +7,15 @@
 namespace NUIE
 {
 
-class NodeUIScaleIndependentData
+class SelectionParams
 {
 public:
-	NodeUIScaleIndependentData (const NodeUIManager& uiManager, const SkinParams& skinParams);
+	SelectionParams (const NodeUIManager& uiManager, const SkinParams& skinParams);
 
-	double	GetSelectionThickness () const;
+	double	GetThickness () const;
 
 private:
-	double selectionThickness;
+	double	thickness;
 };
 
 class NodeUIManagerDrawer
@@ -32,24 +32,24 @@ class NodeUIManagerDrawer
 		NotSelected
 	};
 
-	void					DrawBackground (NodeUIDrawingEnvironment& drawingEnv) const;
-	void					DrawGroups (NodeUIDrawingEnvironment& drawingEnv, const NodeDrawingModifier* drawModifier) const;
-	void					DrawConnections (NodeUIDrawingEnvironment& drawingEnv, const NodeUIScaleIndependentData& scaleIndependentData, const NodeDrawingModifier* drawModifier) const;
-	void					DrawConnection (NodeUIDrawingEnvironment& drawingEnv, const Pen& pen, const Point& beg, const Point& end) const;
-	void					DrawTemporaryConnection (NodeUIDrawingEnvironment& drawingEnv, const Pen& pen, const Point& beg, const Point& end, NodeDrawingModifier::Direction dir) const;
-	void					DrawNodes (NodeUIDrawingEnvironment& drawingEnv, const NodeUIScaleIndependentData& scaleIndependentData, const NodeDrawingModifier* drawModifier) const;
-	void					DrawNode (NodeUIDrawingEnvironment& drawingEnv, const NodeUIScaleIndependentData& scaleIndependentData, const Point& offset, SelectionMode selectionMode, const UINodeConstPtr& uiNode) const;
-	void					DrawNode (NodeUIDrawingEnvironment& drawingEnv, const NodeUIScaleIndependentData& scaleIndependentData, SelectionMode selectionMode, const UINodeConstPtr& uiNode) const;
-	void					DrawSelectionRect (NodeUIDrawingEnvironment& drawingEnv, const NodeDrawingModifier* drawModifier) const;
-
-	bool					IsConnectionVisible (NodeUIDrawingEnvironment& drawingEnv, const Point& beg, const Point& end) const;
-	bool					IsNodeVisible (NodeUIDrawingEnvironment& drawingEnv, const NodeUIScaleIndependentData& scaleIndependentData, const NodeDrawingModifier* drawModifier, const UINodeConstPtr& uiNode) const;
-	bool					IsRectVisible (NodeUIDrawingEnvironment& drawingEnv, const Rect& rect) const;
-
-	Rect					GetNodeRect (NodeUIDrawingEnvironment& drawingEnv, const NodeDrawingModifier* drawModifier, const UINodeConstPtr& uiNode) const;
-	Rect					GetExtendedNodeRect (NodeUIDrawingEnvironment& drawingEnv, const NodeDrawingModifier* drawModifier, const UINodeConstPtr& uiNode) const;
-	Point					GetOutputSlotConnPosition (NodeUIDrawingEnvironment& drawingEnv, const NodeDrawingModifier* drawModifier, const UINodeConstPtr& uiNode, const NE::SlotId& slotId) const;
-	Point					GetInputSlotConnPosition (NodeUIDrawingEnvironment& drawingEnv, const NodeDrawingModifier* drawModifier, const UINodeConstPtr& uiNode, const NE::SlotId& slotId) const;
+	void	DrawBackground (NodeUIDrawingEnvironment& drawingEnv) const;
+	void	DrawGroups (NodeUIDrawingEnvironment& drawingEnv, const NodeDrawingModifier* drawModifier) const;
+	void	DrawConnections (NodeUIDrawingEnvironment& drawingEnv, const SelectionParams& selectionParams, const NodeDrawingModifier* drawModifier) const;
+	void	DrawConnection (NodeUIDrawingEnvironment& drawingEnv, const Pen& pen, const Point& beg, const Point& end) const;
+	void	DrawTemporaryConnection (NodeUIDrawingEnvironment& drawingEnv, const Pen& pen, const Point& beg, const Point& end, NodeDrawingModifier::Direction dir) const;
+	void	DrawNodes (NodeUIDrawingEnvironment& drawingEnv, const SelectionParams& selectionParams, const NodeDrawingModifier* drawModifier) const;
+	void	DrawNode (NodeUIDrawingEnvironment& drawingEnv, const SelectionParams& selectionParams, const Point& offset, SelectionMode selectionMode, const UINodeConstPtr& uiNode) const;
+	void	DrawNode (NodeUIDrawingEnvironment& drawingEnv, const SelectionParams& selectionParams, SelectionMode selectionMode, const UINodeConstPtr& uiNode) const;
+	void	DrawSelectionRect (NodeUIDrawingEnvironment& drawingEnv, const NodeDrawingModifier* drawModifier) const;
+
+	bool	IsConnectionVisible (NodeUIDrawingEnvironment& drawingEnv, const Point& beg, const Point& end) const;
+	bool	IsNodeVisible (NodeUIDrawingEnvironment& drawingEnv, const SelectionParams& selectionParams, const NodeDrawingModifier* drawModifier, const UINodeConstPtr& uiNode) const;
+	bool	IsRectVisible (NodeUIDrawingEnvironment& drawingEnv, const Rect& rect) const;
+
+	Rect	GetNodeRect (NodeUIDrawingEnvironment& drawingEnv, const NodeDrawingModifier* drawModifier, const UINodeConstPtr& uiNode) const;
+	Rect	GetExtendedNodeRect (NodeUIDrawingEnvironment& drawingEnv, const NodeDrawingModifier* drawModifier, const UINodeConstPtr& uiNode) const;
+	Point	GetOutputSlotConnPosition (NodeUIDrawingEnvironment& drawingEnv, const NodeDrawingModifier* drawModifier, const UINodeConstPtr& uiNode, const NE::SlotId& slotId) const;
+	Point	GetInputSlotConnPosition (NodeUIDrawingEnvironment& drawingEnv, const NodeDrawingModifier* drawModifier, const UINodeConstPtr& uiNode, const NE::SlotId& slotId) const;
 
 	const NodeUIManager&	uiManager;
 };

Original file line number	Diff line number	Diff line change
`@@ -16,19 +16,19 @@ static void GetBezierControlPoints (const Point& beg, const Point& end, Point& c`
`16`	`16`	`controlPoint2 = end - bezierOffset;`
`17`	`17`	`}`
`18`	`18`
`19`		`-NodeUIScaleIndependentData::NodeUIScaleIndependentData (const NodeUIManager& uiManager, const SkinParams& skinParams) :`
`20`		`- selectionThickness (0.0)`
	`19`	`+SelectionParams::SelectionParams (const NodeUIManager& uiManager, const SkinParams& skinParams) :`
	`20`	`+ thickness (0.0)`
`21`	`21`	`{`
`22`	`22`	`double scale = uiManager.GetViewBox ().GetScale ();`
`23`		`- selectionThickness = skinParams.GetNodeSelectionRectPen ().GetThickness ();`
	`23`	`+ thickness = skinParams.GetNodeSelectionRectPen ().GetThickness ();`
`24`	`24`	`if (scale < 1.0) {`
`25`		`- selectionThickness /= scale;`
	`25`	`+ thickness /= scale;`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`-double NodeUIScaleIndependentData::GetSelectionThickness () const`
	`29`	`+double SelectionParams::GetThickness () const`
`30`	`30`	`{`
`31`		`- return selectionThickness;`
	`31`	`+ return thickness;`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`NodeUIManagerDrawer::NodeUIManagerDrawer (const NodeUIManager& uiManager) :`
`@@ -45,14 +45,14 @@ void NodeUIManagerDrawer::Draw (NodeUIDrawingEnvironment& drawingEnv, const Node`
`45`	`45`	`DrawBackground (drawingEnv);`
`46`	`46`
`47`	`47`	`{`
`48`		`- NodeUIScaleIndependentData scaleIndependentData (uiManager, drawingEnv.GetSkinParams ());`
	`48`	`+ SelectionParams selectionParams (uiManager, drawingEnv.GetSkinParams ());`
`49`	`49`	`PreviewContextDecorator textSkipperContext (drawingContext, uiManager.IsPreviewMode ());`
`50`	`50`	`ViewBoxContextDecorator viewBoxContext (textSkipperContext, uiManager.GetViewBox ());`
`51`	`51`	`DrawingEnvironmentContextDecorator drawEnv (drawingEnv, viewBoxContext);`
`52`	`52`
`53`	`53`	`DrawGroups (drawEnv, drawModifier);`
`54`		`- DrawConnections (drawEnv, scaleIndependentData, drawModifier);`
`55`		`- DrawNodes (drawEnv, scaleIndependentData, drawModifier);`
	`54`	`+ DrawConnections (drawEnv, selectionParams, drawModifier);`
	`55`	`+ DrawNodes (drawEnv, selectionParams, drawModifier);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`DrawSelectionRect (drawingEnv, drawModifier);`
`@@ -103,11 +103,11 @@ void NodeUIManagerDrawer::DrawGroups (NodeUIDrawingEnvironment& drawingEnv, cons`
`103`	`103`	`});`
`104`	`104`	`}`
`105`	`105`
`106`		`-void NodeUIManagerDrawer::DrawConnections (NodeUIDrawingEnvironment& drawingEnv, const NodeUIScaleIndependentData& scaleIndependentData, const NodeDrawingModifier* drawModifier) const`
	`106`	`+void NodeUIManagerDrawer::DrawConnections (NodeUIDrawingEnvironment& drawingEnv, const SelectionParams& selectionParams, const NodeDrawingModifier* drawModifier) const`
`107`	`107`	`{`
`108`	`108`	`const SkinParams& skinParams = drawingEnv.GetSkinParams ();`
`109`		`- const Pen& pen = skinParams.GetConnectionLinePen ();`
`110`		`- Pen selectionPen (skinParams.GetNodeSelectionRectPen ().GetColor (), scaleIndependentData.GetSelectionThickness ());`
	`109`	`+ const Pen& normalPen = skinParams.GetConnectionLinePen ();`
	`110`	`+ Pen selectionPen (skinParams.GetNodeSelectionRectPen ().GetColor (), selectionParams.GetThickness ());`
`111`	`111`
`112`	`112`	`const Selection& selection = uiManager.GetSelection ();`
`113`	`113`	`const NE::NodeCollection& selectedNodes = selection.GetNodes ();`
`@@ -125,13 +125,14 @@ void NodeUIManagerDrawer::DrawConnections (NodeUIDrawingEnvironment& drawingEnv,`
`125`	`125`	`}`
`126`	`126`	`bool endSelected = selectedNodes.Contains (endNode->GetId ());`
`127`	`127`	`Point end = GetInputSlotConnPosition (drawingEnv, drawModifier, endNode, inputSlot->GetId ());`
`128`		`- if (IsConnectionVisible (drawingEnv, beg, end)) {`
`129`		`- if (begSelected \|\| endSelected) {`
`130`		`- DrawConnection (drawingEnv, selectionPen, beg, end);`
`131`		`- } else {`
`132`		`- if (inputSlot->GetConnectionDisplayMode () == ConnectionDisplayMode::Normal) {`
`133`		`- DrawConnection (drawingEnv, pen, beg, end);`
`134`		`- }`
	`128`	`+ if (!IsConnectionVisible (drawingEnv, beg, end)) {`
	`129`	`+ return;`
	`130`	`+ }`
	`131`	`+ if (begSelected \|\| endSelected) {`
	`132`	`+ DrawConnection (drawingEnv, selectionPen, beg, end);`
	`133`	`+ } else {`
	`134`	`+ if (inputSlot->GetConnectionDisplayMode () == ConnectionDisplayMode::Normal) {`
	`135`	`+ DrawConnection (drawingEnv, normalPen, beg, end);`
`135`	`136`	`}`
`136`	`137`	`}`
`137`	`138`	`});`
`@@ -143,7 +144,7 @@ void NodeUIManagerDrawer::DrawConnections (NodeUIDrawingEnvironment& drawingEnv,`
`143`	`144`	`if (drawModifier != nullptr) {`
`144`	`145`	`drawModifier->EnumerateTemporaryConnections ([&] (const Point& beg, const Point& end, NodeDrawingModifier::Direction dir) {`
`145`	`146`	`if (IsConnectionVisible (drawingEnv, beg, end)) {`
`146`		`- DrawTemporaryConnection (drawingEnv, pen, beg, end, dir);`
	`147`	`+ DrawTemporaryConnection (drawingEnv, normalPen, beg, end, dir);`
`147`	`148`	`}`
`148`	`149`	`});`
`149`	`150`	`}`
`@@ -177,10 +178,10 @@ void NodeUIManagerDrawer::DrawTemporaryConnection (NodeUIDrawingEnvironment& dra`
`177`	`178`	`}`
`178`	`179`	`}`
`179`	`180`
`180`		`-void NodeUIManagerDrawer::DrawNodes (NodeUIDrawingEnvironment& drawingEnv, const NodeUIScaleIndependentData& scaleIndependentData, const NodeDrawingModifier* drawModifier) const`
	`181`	`+void NodeUIManagerDrawer::DrawNodes (NodeUIDrawingEnvironment& drawingEnv, const SelectionParams& selectionParams, const NodeDrawingModifier* drawModifier) const`
`181`	`182`	`{`
`182`	`183`	`uiManager.EnumerateNodes ([&] (UINodeConstPtr uiNode) {`
`183`		`- if (!IsNodeVisible (drawingEnv, scaleIndependentData, drawModifier, uiNode)) {`
	`184`	`+ if (!IsNodeVisible (drawingEnv, selectionParams, drawModifier, uiNode)) {`
`184`	`185`	`return true;`
`185`	`186`	`}`
`186`	`187`
`@@ -190,7 +191,7 @@ void NodeUIManagerDrawer::DrawNodes (NodeUIDrawingEnvironment& drawingEnv, const`
`190`	`191`	`}`
`191`	`192`
`192`	`193`	`Point nodeOffset = drawModifier->GetNodeOffset (uiNode->GetId ());`
`193`		`- DrawNode (drawingEnv, scaleIndependentData, nodeOffset, selectionMode, uiNode);`
	`194`	`+ DrawNode (drawingEnv, selectionParams, nodeOffset, selectionMode, uiNode);`
`194`	`195`	`return true;`
`195`	`196`	`});`
`196`	`197`
`@@ -202,24 +203,24 @@ void NodeUIManagerDrawer::DrawNodes (NodeUIDrawingEnvironment& drawingEnv, const`
`202`	`203`	`for (const auto& duplicatedNode : duplicatedNodes) {`
`203`	`204`	`UINodeConstPtr uiNode = uiManager.GetNode (duplicatedNode.first);`
`204`	`205`	`Point nodeOffset = drawModifier->GetNodeOffset (uiNode->GetId ());`
`205`		`- DrawNode (drawingEnv, scaleIndependentData, nodeOffset + duplicatedNode.second, SelectionMode::NotSelected, uiNode);`
	`206`	`+ DrawNode (drawingEnv, selectionParams, nodeOffset + duplicatedNode.second, SelectionMode::NotSelected, uiNode);`
`206`	`207`	`}`
`207`	`208`	`}`
`208`	`209`	`}`
`209`	`210`
`210`		`-void NodeUIManagerDrawer::DrawNode (NodeUIDrawingEnvironment& drawingEnv, const NodeUIScaleIndependentData& scaleIndependentData, const Point& offset, SelectionMode selectionMode, const UINodeConstPtr& uiNode) const`
	`211`	`+void NodeUIManagerDrawer::DrawNode (NodeUIDrawingEnvironment& drawingEnv, const SelectionParams& selectionParams, const Point& offset, SelectionMode selectionMode, const UINodeConstPtr& uiNode) const`
`211`	`212`	`{`
`212`	`213`	`ViewBox offsetViewBox (offset, 1.0);`
`213`	`214`	`ViewBoxContextDecorator offsetContext (drawingEnv.GetDrawingContext (), offsetViewBox);`
`214`	`215`	`DrawingEnvironmentContextDecorator offsetEnv (drawingEnv, offsetContext);`
`215`		`- DrawNode (offsetEnv, scaleIndependentData, selectionMode, uiNode);`
	`216`	`+ DrawNode (offsetEnv, selectionParams, selectionMode, uiNode);`
`216`	`217`	`}`
`217`	`218`
`218`		`-void NodeUIManagerDrawer::DrawNode (NodeUIDrawingEnvironment& drawingEnv, const NodeUIScaleIndependentData& scaleIndependentData, SelectionMode selectionMode, const UINodeConstPtr& uiNode) const`
	`219`	`+void NodeUIManagerDrawer::DrawNode (NodeUIDrawingEnvironment& drawingEnv, const SelectionParams& selectionParams, SelectionMode selectionMode, const UINodeConstPtr& uiNode) const`
`219`	`220`	`{`
`220`	`221`	`if (selectionMode == SelectionMode::Selected) {`
`221`	`222`	`Rect nodeRect = uiNode->GetRect (drawingEnv);`
`222`		`- double selectionThickness = scaleIndependentData.GetSelectionThickness ();`
	`223`	`+ double selectionThickness = selectionParams.GetThickness ();`
`223`	`224`	`Rect selectionRect = nodeRect.Expand (Size (selectionThickness * 2.0, selectionThickness * 2.0));`
`224`	`225`	`drawingEnv.GetDrawingContext ().FillRect (selectionRect, drawingEnv.GetSkinParams ().GetNodeSelectionRectPen ().GetColor ());`
`225`	`226`	`ColorBlenderContextDecorator selectionContext (drawingEnv.GetDrawingContext (), drawingEnv.GetSkinParams ().GetSelectionBlendColor ());`
`@@ -247,11 +248,11 @@ bool NodeUIManagerDrawer::IsConnectionVisible (NodeUIDrawingEnvironment& drawing`
`247`	`248`	`return IsRectVisible (drawingEnv, boundingRect);`
`248`	`249`	`}`
`249`	`250`
`250`		`-bool NodeUIManagerDrawer::IsNodeVisible (NodeUIDrawingEnvironment& drawingEnv, const NodeUIScaleIndependentData& scaleIndependentData, const NodeDrawingModifier* drawModifier, const UINodeConstPtr& uiNode) const`
	`251`	`+bool NodeUIManagerDrawer::IsNodeVisible (NodeUIDrawingEnvironment& drawingEnv, const SelectionParams& selectionParams, const NodeDrawingModifier* drawModifier, const UINodeConstPtr& uiNode) const`
`251`	`252`	`{`
`252`	`253`	`Rect boundingRect = GetExtendedNodeRect (drawingEnv, drawModifier, uiNode);`
`253`	`254`
`254`		`- double selectionThickness = scaleIndependentData.GetSelectionThickness ();`
	`255`	`+ double selectionThickness = selectionParams.GetThickness ();`
`255`	`256`	`boundingRect = boundingRect.Expand (Size (selectionThickness * 2.0, selectionThickness * 2.0));`
`256`	`257`
`257`	`258`	`return IsRectVisible (drawingEnv, boundingRect);`