Mark hidden connections with filled marker.

kovacsv · kovacsv · commit 30e653dde096 · 2020-12-28T10:33:08.000+01:00
diff --git a/Sources/BuiltInNodes/BI_UINodePanels.cpp b/Sources/BuiltInNodes/BI_UINodePanels.cpp
@@ -286,10 +286,9 @@ void NodeUISlotPanel::Draw (NUIE::NodeUIDrawingEnvironment& env, const NUIE::Rec
 			NUIE::Rect markerRect = NUIE::Rect::FromCenterAndSize (slotRect.GetLeftCenter (), skinParams.GetSlotMarkerSize ());
 			drawingImage.AddItem (NUIE::DrawingItemConstPtr (new NUIE::DrawingFillEllipse (markerRect, skinParams.GetSlotTextBackgroundColor ())), NUIE::DrawingContext::ItemPreviewMode::HideInPreview);
 			drawingImage.AddItem (NUIE::DrawingItemConstPtr (new NUIE::DrawingEllipse (markerRect, skinParams.GetConnectionLinePen ())), NUIE::DrawingContext::ItemPreviewMode::HideInPreview);
-		} else if (slotMarker == NUIE::SkinParams::SlotMarker::Rectangle) {
+		} else if (slotMarker == NUIE::SkinParams::SlotMarker::FilledCircle) {
 			NUIE::Rect markerRect = NUIE::Rect::FromCenterAndSize (slotRect.GetLeftCenter (), skinParams.GetSlotMarkerSize ());
-			drawingImage.AddItem (NUIE::DrawingItemConstPtr (new NUIE::DrawingFillRect (markerRect, skinParams.GetSlotTextBackgroundColor ())), NUIE::DrawingContext::ItemPreviewMode::HideInPreview);
-			drawingImage.AddItem (NUIE::DrawingItemConstPtr (new NUIE::DrawingRect (markerRect, skinParams.GetConnectionLinePen ())), NUIE::DrawingContext::ItemPreviewMode::HideInPreview);
+			drawingImage.AddItem (NUIE::DrawingItemConstPtr (new NUIE::DrawingFillEllipse (markerRect, skinParams.GetConnectionLinePen ().GetColor ())), NUIE::DrawingContext::ItemPreviewMode::HideInPreview);
 		}
 
 		drawingImage.AddItem (NUIE::DrawingItemConstPtr (new NUIE::DrawingFillRect (slotRect, skinParams.GetSlotTextBackgroundColor ())));
diff --git a/Sources/MacOSEmbeddingDemo/Application.mm b/Sources/MacOSEmbeddingDemo/Application.mm
@@ -127,7 +127,7 @@ - (void) windowDidResize : (NSNotification *) notification
 		/*slotTextColor*/ NUIE::Color (0, 0, 0),
 		/*slotTextBackgroundColor*/ NUIE::Color (246, 246, 246),
 		/*slotMarker*/ NUIE::SkinParams::SlotMarker::Circle,
-		/*hiddenSlotMarker*/ NUIE::SkinParams::SlotMarker::Rectangle,
+		/*hiddenSlotMarker*/ NUIE::SkinParams::SlotMarker::FilledCircle,
 		/*slotMarkerSize*/ NUIE::Size (8.0, 8.0),
 		/*selectionBlendColor*/ NUIE::BlendColor (NUIE::Color (41, 127, 255), 0.25),
 		/*disabledBlendColor*/ NUIE::BlendColor (NUIE::Color (0, 138, 184), 0.2),
diff --git a/Sources/NodeEngineTest/NodeEditorVisualTest.cpp b/Sources/NodeEngineTest/NodeEditorVisualTest.cpp
@@ -1,6 +1,7 @@
 #include "SimpleTest.hpp"
 #include "NUIE_NodeEditor.hpp"
 #include "NUIE_NodeCommonMenuCommands.hpp"
+#include "NUIE_FeatureSet.hpp"
 #include "BI_InputUINodes.hpp"
 #include "BI_ViewerUINodes.hpp"
 #include "VisualTestFramework.hpp"
@@ -32,7 +33,7 @@ const BasicSkinParams& GetSkinParamsWithMarkers ()
 		/*slotTextColor*/ NUIE::Color (0, 0, 0),
 		/*slotTextBackgroundColor*/ NUIE::Color (246, 246, 246),
 		/*slotMarker*/ SkinParams::SlotMarker::Circle,
-		/*hiddenSlotMarker*/ NUIE::SkinParams::SlotMarker::Rectangle,
+		/*hiddenSlotMarker*/ NUIE::SkinParams::SlotMarker::FilledCircle,
 		/*slotMarkerSize*/ NUIE::Size (8.0, 8.0),
 		/*selectionBlendColor*/ NUIE::BlendColor (NUIE::Color (41, 127, 255), 0.25),
 		/*disabledBlendColor*/ NUIE::BlendColor (NUIE::Color (0, 138, 184), 0.2),
@@ -638,6 +639,7 @@ TEST (AlignNodesTest)
 
 TEST (HideConnectionsTest)
 {
+	FeatureEnableGuard featureGuard ("HideConnections", true);
 	SimpleNodeEditorTestEnvWithConnections env (GetSkinParamsWithMarkers ());
 
 	ASSERT (env.CheckReference (L"HideConnectionsTest_Initial.svg"));
diff --git a/Sources/NodeEngineTest/VisualTestFiles/HideConnectionsTest_ConnectionHidden.svg b/Sources/NodeEngineTest/VisualTestFiles/HideConnectionsTest_ConnectionHidden.svg
@@ -56,8 +56,7 @@
 <rect x="496" y="277" width="208" height="34" style="fill:rgb(41,127,255);"/>
 <text x="600" y="294" dominant-baseline="central" text-anchor="middle" style="fill:rgb(250,250,250);font-family:Arial;font-size:16px;">Viewer 2</text>
 <rect x="496" y="311" width="208" height="36" style="fill:rgb(236,236,236);"/>
-<rect x="492" y="325" width="8" height="8" style="fill:rgb(246,246,246);"/>
-<rect x="492" y="325" width="8" height="8" style="fill:none;stroke-width:1px;stroke:rgb(38,50,56);"/>
+<ellipse cx="496" cy="329" rx="4" ry="4" style="fill:rgb(38,50,56);"/>
 <rect x="496" y="316" width="80" height="26" style="fill:rgb(246,246,246);"/>
 <text x="501" y="329" dominant-baseline="central" text-anchor="start" style="fill:rgb(0,0,0);font-family:Arial;font-size:14px;">Input</text>
 <ellipse cx="704" cy="329" rx="4" ry="4" style="fill:rgb(246,246,246);"/>
diff --git a/Sources/NodeEngineTest/VisualTestFiles/HideConnectionsTest_Viewer2Selected.svg b/Sources/NodeEngineTest/VisualTestFiles/HideConnectionsTest_Viewer2Selected.svg
@@ -58,8 +58,7 @@
 <rect x="496" y="277" width="208" height="34" style="fill:rgb(32,129,240);"/>
 <text x="600" y="294" dominant-baseline="central" text-anchor="middle" style="fill:rgb(200,227,236);font-family:Arial;font-size:16px;">Viewer 2</text>
 <rect x="496" y="311" width="208" height="36" style="fill:rgb(188,216,225);"/>
-<rect x="492" y="325" width="8" height="8" style="fill:rgb(196,224,233);"/>
-<rect x="492" y="325" width="8" height="8" style="fill:none;stroke-width:1px;stroke:rgb(30,67,81);"/>
+<ellipse cx="496" cy="329" rx="4" ry="4" style="fill:rgb(30,67,81);"/>
 <rect x="496" y="316" width="80" height="26" style="fill:rgb(196,224,233);"/>
 <text x="501" y="329" dominant-baseline="central" text-anchor="start" style="fill:rgb(0,27,36);font-family:Arial;font-size:14px;">Input</text>
 <ellipse cx="704" cy="329" rx="4" ry="4" style="fill:rgb(196,224,233);"/>
diff --git a/Sources/NodeEngineTest/main.cpp b/Sources/NodeEngineTest/main.cpp
@@ -2,12 +2,10 @@
 
 #include "SimpleTest.hpp"
 #include "NE_Debug.hpp"
-#include "NUIE_FeatureSet.hpp"
 
 int main (int, char* argv[])
 {
 	EnableLeakDetection ();
-	NUIE::EnableFeature ("HideConnections", true);
 
     std::string executablePath (argv[0]);
 	std::wstring wExecutablePath (executablePath.begin (), executablePath.end ());
diff --git a/Sources/NodeUIEngine/NUIE_FeatureSet.cpp b/Sources/NodeUIEngine/NUIE_FeatureSet.cpp
@@ -5,6 +5,18 @@
 namespace NUIE
 {
 
+FeatureEnableGuard::FeatureEnableGuard (const std::string& featureId, bool enabled) :
+	featureId (featureId),
+	oldEnabled (IsFeatureEnabled (featureId))
+{
+	EnableFeature (featureId, enabled);
+}
+
+FeatureEnableGuard::~FeatureEnableGuard ()
+{
+	EnableFeature (featureId, oldEnabled);
+}
+
 static std::unordered_map<std::string, bool> features;
 
 void EnableFeature (const std::string& featureId, bool enabled)
diff --git a/Sources/NodeUIEngine/NUIE_FeatureSet.hpp b/Sources/NodeUIEngine/NUIE_FeatureSet.hpp
@@ -6,6 +6,17 @@
 namespace NUIE
 {
 
+class FeatureEnableGuard
+{
+public:
+	FeatureEnableGuard (const std::string& featureId, bool enabled);
+	~FeatureEnableGuard ();
+
+private:
+	std::string		featureId;
+	bool			oldEnabled;
+};
+
 void	EnableFeature (const std::string& featureId, bool enabled);
 bool	IsFeatureEnabled (const std::string& featureId);
 
diff --git a/Sources/NodeUIEngine/NUIE_SkinParams.hpp b/Sources/NodeUIEngine/NUIE_SkinParams.hpp
@@ -39,7 +39,7 @@ class SkinParams
 	{
 		None,
 		Circle,
-		Rectangle
+		FilledCircle
 	};
 
 	SkinParams ();
diff --git a/Sources/WindowsReferenceApp/AppUIEnvironment.cpp b/Sources/WindowsReferenceApp/AppUIEnvironment.cpp
@@ -32,7 +32,7 @@ static const NUIE::BasicSkinParams& GetAppSkinParams ()
 		/*slotTextColor*/ NUIE::Color (0, 0, 0),
 		/*slotTextBackgroundColor*/ NUIE::Color (246, 246, 246),
 		/*slotMarker*/ NUIE::SkinParams::SlotMarker::Circle,
-		/*hiddenSlotMarker*/ NUIE::SkinParams::SlotMarker::Rectangle,
+		/*hiddenSlotMarker*/ NUIE::SkinParams::SlotMarker::FilledCircle,
 		/*slotMarkerSize*/ NUIE::Size (8.0, 8.0),
 		/*selectionBlendColor*/ NUIE::BlendColor (NUIE::Color (41, 127, 255), 0.25),
 		/*disabledBlendColor*/ NUIE::BlendColor (NUIE::Color (0, 138, 184), 0.2),

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class SkinParams`
`39`	`39`	`{`
`40`	`40`	`None,`
`41`	`41`	`Circle,`
`42`		`- Rectangle`
	`42`	`+ FilledCircle`
`43`	`43`	`};`
`44`	`44`
`45`	`45`	`SkinParams ();`