将private访问性改为protected internal访问性
This commit is contained in:
@@ -580,18 +580,7 @@ namespace Deedy.Activity
|
|||||||
this.ShowRightExitline = Visibility.Visible;
|
this.ShowRightExitline = Visibility.Visible;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (exitlinemanageable.ExitlinePosition == ExitlinePosition.LeftLower || exitlinemanageable.ExitlinePosition == ExitlinePosition.Rightlower)
|
this.ActionElement.AdjustExitlinePosition();
|
||||||
{
|
|
||||||
//TODO:根据退出线方向是否相同的设置项调整子节点的退出线位置
|
|
||||||
if (exitlinemanageable.IsExitlineAtSamePosition == true)
|
|
||||||
{
|
|
||||||
//TODO:同向退出线控制
|
|
||||||
}
|
|
||||||
if (exitlinemanageable.IsExitlineAtSamePosition == false)
|
|
||||||
{
|
|
||||||
//TODO:对向退出线控制
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (newValue is ILogicController logicController)
|
if (newValue is ILogicController logicController)
|
||||||
{
|
{
|
||||||
@@ -629,6 +618,7 @@ namespace Deedy.Activity
|
|||||||
this.InstantInfo = this.ActionElement.InstantInfo;
|
this.InstantInfo = this.ActionElement.InstantInfo;
|
||||||
break;
|
break;
|
||||||
case nameof(IExitlineManageable):
|
case nameof(IExitlineManageable):
|
||||||
|
this.ActionElement.AdjustExitlinePosition();
|
||||||
break;
|
break;
|
||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
@@ -713,9 +703,9 @@ namespace Deedy.Activity
|
|||||||
|
|
||||||
base.OnDragLeave(e);
|
base.OnDragLeave(e);
|
||||||
}
|
}
|
||||||
private bool _CanDropInParent = false;
|
protected internal bool _CanDropInParent = false;
|
||||||
private bool _CanDropChild = false;
|
protected internal bool _CanDropChild = false;
|
||||||
private DropPlacement _DropPlacement = DropPlacement.Uncertain;
|
protected internal DropPlacement _DropPlacement = DropPlacement.Uncertain;
|
||||||
protected override void OnDragOver(DragEventArgs e)
|
protected override void OnDragOver(DragEventArgs e)
|
||||||
{
|
{
|
||||||
if (this.IsEventNeedToHandle(e.OriginalSource))
|
if (this.IsEventNeedToHandle(e.OriginalSource))
|
||||||
@@ -818,8 +808,8 @@ namespace Deedy.Activity
|
|||||||
ToolTipService.SetVerticalOffset(this, position.Y + 16);
|
ToolTipService.SetVerticalOffset(this, position.Y + 16);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private readonly object _DragLock = new();
|
protected internal readonly object _DragLock = new();
|
||||||
private Point? _DragStartPoint = null;
|
protected internal Point? _DragStartPoint = null;
|
||||||
|
|
||||||
protected override void OnPreviewMouseMove(MouseEventArgs e)
|
protected override void OnPreviewMouseMove(MouseEventArgs e)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ namespace Deedy.Activity
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 如果类型上没有组装规则,则认为不允许组装,否则按照组装规则处理
|
/// 如果类型上没有组装规则,则认为不允许组装,否则按照组装规则处理
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="unit">要进行组装检查的单元实例</param>
|
/// <param name="element">要进行组装检查的单元实例</param>
|
||||||
/// <returns>是否允许组装</returns>
|
/// <returns>是否允许组装</returns>
|
||||||
public bool CombineChecking(IElement element, out DragDropEffects effects)
|
public bool CombineChecking(IElement element, out DragDropEffects effects)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -212,5 +212,22 @@ namespace Deedy.Activity
|
|||||||
|
|
||||||
return default;
|
return default;
|
||||||
}
|
}
|
||||||
|
public static void AdjustExitlinePosition(this IActionElement element)
|
||||||
|
{
|
||||||
|
if (element is IExitlineManageable exitlineManageable
|
||||||
|
&& (exitlineManageable.ExitlinePosition == ExitlinePosition.LeftLower
|
||||||
|
|| exitlineManageable.ExitlinePosition == ExitlinePosition.Rightlower))
|
||||||
|
{
|
||||||
|
//TODO:根据退出线方向是否相同的设置项调整子节点的退出线位置
|
||||||
|
if (exitlineManageable.IsExitlineAtSamePosition == true)
|
||||||
|
{
|
||||||
|
//TODO:同向退出线控制
|
||||||
|
}
|
||||||
|
if (exitlineManageable.IsExitlineAtSamePosition == false)
|
||||||
|
{
|
||||||
|
//TODO:对向退出线控制
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user