Skip to content

Commit 83c2a02

Browse files
committed
PR fixes
1 parent 8c6ac35 commit 83c2a02

File tree

5 files changed

+10
-15
lines changed

5 files changed

+10
-15
lines changed

Assets/com.alelievr.NodeGraphProcessor/Editor/Logic/EdgeConnectorListener.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace GraphProcessor
1212
/// </summary>
1313
public class BaseEdgeConnectorListener : IEdgeConnectorListener
1414
{
15-
protected readonly BaseGraphView graphView;
15+
public readonly BaseGraphView graphView;
1616

1717
Dictionary< Edge, PortView > edgeInputPorts = new Dictionary< Edge, PortView >();
1818
Dictionary< Edge, PortView > edgeOutputPorts = new Dictionary< Edge, PortView >();

Assets/com.alelievr.NodeGraphProcessor/Editor/Utils/BaseEdgeConnector.cs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,18 @@ public class BaseEdgeConnector : EdgeConnector
1313
Edge edgeCandidate;
1414
protected bool active;
1515
Vector2 mouseDownPosition;
16+
protected BaseGraphView graphView;
1617

1718
internal const float k_ConnectionDistanceTreshold = 10f;
1819

1920
public BaseEdgeConnector(IEdgeConnectorListener listener) : base()
2021
{
22+
graphView = (listener as BaseEdgeConnectorListener)?.graphView;
2123
active = false;
22-
initEdgeConnector(listener);
24+
InitEdgeConnector(listener);
2325
}
2426

25-
protected virtual void initEdgeConnector(IEdgeConnectorListener listener)
27+
protected virtual void InitEdgeConnector(IEdgeConnectorListener listener)
2628
{
2729
dragHelper = new BaseEdgeDragHelper(listener);
2830
activators.Add(new ManipulatorActivationFilter { button = MouseButton.LeftMouse });
@@ -68,7 +70,7 @@ protected virtual void OnMouseDown(MouseDownEvent e)
6870

6971
mouseDownPosition = e.localMousePosition;
7072

71-
edgeCandidate = CreateEdgeView();
73+
edgeCandidate = graphView != null ? graphView.CreateEdgeView() : new EdgeView();
7274
edgeDragHelper.draggedPort = graphElement;
7375
edgeDragHelper.edgeCandidate = edgeCandidate;
7476

@@ -86,11 +88,6 @@ protected virtual void OnMouseDown(MouseDownEvent e)
8688
}
8789
}
8890

89-
protected virtual EdgeView CreateEdgeView()
90-
{
91-
return new EdgeView();
92-
}
93-
9491
void OnCaptureOut(MouseCaptureOutEvent e)
9592
{
9693
active = false;

Assets/com.alelievr.NodeGraphProcessor/Editor/Views/BaseGraphView.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ void UnserializeAndPasteCallback(string operationName, string serializedData)
299299
}
300300
}
301301

302-
protected virtual EdgeView CreateEdgeView()
302+
public virtual EdgeView CreateEdgeView()
303303
{
304304
return new EdgeView();
305305
}

Assets/com.alelievr.NodeGraphProcessor/Editor/Views/BaseNodeView.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -318,10 +318,8 @@ public PortView AddPort(FieldInfo fieldInfo, Direction direction, BaseEdgeConnec
318318
return p;
319319
}
320320

321-
protected virtual PortView CreatePortView(Orientation horizontal, Direction direction, FieldInfo fieldInfo, PortData portData, BaseEdgeConnectorListener listener)
322-
{
323-
return PortView.CreatePV(horizontal, direction, fieldInfo, portData, listener);
324-
}
321+
protected virtual PortView CreatePortView(Direction direction, FieldInfo fieldInfo, PortData portData, BaseEdgeConnectorListener listener)
322+
=> PortView.CreatePortView(direction, fieldInfo, portData, listener);
325323

326324
public void InsertPort(PortView portView, int index)
327325
{

Assets/com.alelievr.NodeGraphProcessor/Editor/Views/PortView.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected PortView(Direction direction, FieldInfo fieldInfo, PortData portData,
5353
this.tooltip = portData.tooltip;
5454
}
5555

56-
public static PortView CreatePV(Direction direction, FieldInfo fieldInfo, PortData portData, BaseEdgeConnectorListener edgeConnectorListener)
56+
public static PortView CreatePortView(Direction direction, FieldInfo fieldInfo, PortData portData, BaseEdgeConnectorListener edgeConnectorListener)
5757
{
5858
var pv = new PortView(direction, fieldInfo, portData, edgeConnectorListener);
5959
pv.m_EdgeConnector = new BaseEdgeConnector(edgeConnectorListener);

0 commit comments

Comments
 (0)