Skip to content

Commit c9be4ed

Browse files
committed
Add tests for connection hiding.
1 parent 8c391a2 commit c9be4ed

5 files changed

Lines changed: 273 additions & 4 deletions

File tree

Sources/BuiltInNodes/BI_UINodePanels.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,10 +274,10 @@ void NodeUISlotPanel::Draw (NUIE::NodeUIDrawingEnvironment& env, const NUIE::Rec
274274
drawingImage.AddInputSlotConnPosition (slotId, slotRect.GetLeftCenter ());
275275
drawingImage.AddInputSlotRect (slotId, slotRect);
276276
if (skinParams.GetSlotMarker () == NUIE::SkinParams::SlotMarker::Circle) {
277-
if (uiSlot->GetConnectionDisplayMode () == NUIE::ConnectionDisplayMode::Hidden && node.IsInputSlotConnected (uiSlot->GetId ())) {
278-
NUIE::Size slotMarkerHiddenConnectionSize = skinParams.GetSlotMarkerSize () + NUIE::Size (3.0, 3.0);
279-
NUIE::Rect bigConnCircleRect = NUIE::Rect::FromCenterAndSize (slotRect.GetLeftCenter (), slotMarkerHiddenConnectionSize);
280-
NUIE::Rect smallConnCircleRect = NUIE::Rect::FromCenterAndSize (slotRect.GetLeftCenter (), slotMarkerHiddenConnectionSize - NUIE::Size (5.0, 5.0));
277+
bool drawHiddenConnectionMarker = uiSlot->GetConnectionDisplayMode () == NUIE::ConnectionDisplayMode::Hidden && node.IsInputSlotConnected (uiSlot->GetId ());
278+
if (drawHiddenConnectionMarker) {
279+
NUIE::Rect bigConnCircleRect = NUIE::Rect::FromCenterAndSize (slotRect.GetLeftCenter (), skinParams.GetHiddenConnectionMarkerBigSize ());
280+
NUIE::Rect smallConnCircleRect = NUIE::Rect::FromCenterAndSize (slotRect.GetLeftCenter (), skinParams.GetHiddenConnectionMarkerSmallSize ());
281281
drawingImage.AddItem (NUIE::DrawingItemConstPtr (new NUIE::DrawingFillEllipse (bigConnCircleRect, skinParams.GetSlotTextBackgroundColor ())), NUIE::DrawingContext::ItemPreviewMode::HideInPreview);
282282
drawingImage.AddItem (NUIE::DrawingItemConstPtr (new NUIE::DrawingEllipse (bigConnCircleRect, skinParams.GetConnectionLinePen ())), NUIE::DrawingContext::ItemPreviewMode::HideInPreview);
283283
drawingImage.AddItem (NUIE::DrawingItemConstPtr (new NUIE::DrawingEllipse (smallConnCircleRect, skinParams.GetConnectionLinePen ())), NUIE::DrawingContext::ItemPreviewMode::HideInPreview);

Sources/NodeEngineTest/NodeEditorVisualTest.cpp

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -638,4 +638,22 @@ TEST (AlignNodesTest)
638638
}
639639
}
640640

641+
TEST (HideConnectionsTest)
642+
{
643+
SimpleNodeEditorTestEnvWithConnections env (GetSkinParamsWithMarkers ());
644+
645+
ASSERT (env.CheckReference (L"HideConnectionsTest_Initial.svg"));
646+
647+
{ // hide input connections for viewer 2
648+
env.SetNextCommandName (L"Hidden");
649+
env.RightClick (env.viewer2InputSlotRect.GetCenter ());
650+
ASSERT (env.CheckReference (L"HideConnectionsTest_ConnectionHidden.svg"));
651+
}
652+
653+
{ // select viewer 2
654+
env.Click (env.viewer2HeaderPoint);
655+
ASSERT (env.CheckReference (L"HideConnectionsTest_Viewer2Selected.svg"));
656+
}
657+
}
658+
641659
}
Lines changed: 83 additions & 0 deletions
Loading
Lines changed: 83 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)