处理退出线位置更新问题
This commit is contained in:
@@ -46,6 +46,7 @@ namespace Deedy.Activity
|
|||||||
{
|
{
|
||||||
ToolTipService.SetInitialShowDelay(this, 0);
|
ToolTipService.SetInitialShowDelay(this, 0);
|
||||||
ToolTipService.SetBetweenShowDelay(this, 0);
|
ToolTipService.SetBetweenShowDelay(this, 0);
|
||||||
|
this.LogInfos = new LogInfoCollection();
|
||||||
}
|
}
|
||||||
public override void OnApplyTemplate()
|
public override void OnApplyTemplate()
|
||||||
{
|
{
|
||||||
@@ -244,6 +245,7 @@ namespace Deedy.Activity
|
|||||||
{
|
{
|
||||||
this.ToolTip = logInfo.ToString();
|
this.ToolTip = logInfo.ToString();
|
||||||
//TODO:更新消息显示图标
|
//TODO:更新消息显示图标
|
||||||
|
this.LogInfos.Add(logInfo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -570,8 +572,26 @@ namespace Deedy.Activity
|
|||||||
{
|
{
|
||||||
if ((exitlinemanageable.ExitlinePosition & ExitlinePosition.LeftLower) == ExitlinePosition.LeftLower)
|
if ((exitlinemanageable.ExitlinePosition & ExitlinePosition.LeftLower) == ExitlinePosition.LeftLower)
|
||||||
this.ShowLeftExitline = Visibility.Visible;
|
this.ShowLeftExitline = Visibility.Visible;
|
||||||
if ((exitlinemanageable.ExitlinePosition & ExitlinePosition.Rightlower) == ExitlinePosition.Rightlower)
|
else if ((exitlinemanageable.ExitlinePosition & ExitlinePosition.Rightlower) == ExitlinePosition.Rightlower)
|
||||||
this.ShowRightExitline = Visibility.Visible;
|
this.ShowRightExitline = Visibility.Visible;
|
||||||
|
else if ((exitlinemanageable.ExitlinePosition & ExitlinePosition.Underline) == ExitlinePosition.Underline)
|
||||||
|
{
|
||||||
|
this.ShowLeftExitline = Visibility.Visible;
|
||||||
|
this.ShowRightExitline = Visibility.Visible;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (exitlinemanageable.ExitlinePosition == ExitlinePosition.LeftLower || exitlinemanageable.ExitlinePosition == ExitlinePosition.Rightlower)
|
||||||
|
{
|
||||||
|
//TODO:根据退出线方向是否相同的设置项调整子节点的退出线位置
|
||||||
|
if (exitlinemanageable.IsExitlineAtSamePosition == true)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
if (exitlinemanageable.IsExitlineAtSamePosition == false)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (newValue is ILogicController logicController)
|
if (newValue is ILogicController logicController)
|
||||||
{
|
{
|
||||||
@@ -608,6 +628,8 @@ namespace Deedy.Activity
|
|||||||
case nameof(IActionElement.InstantInfo):
|
case nameof(IActionElement.InstantInfo):
|
||||||
this.InstantInfo = this.ActionElement.InstantInfo;
|
this.InstantInfo = this.ActionElement.InstantInfo;
|
||||||
break;
|
break;
|
||||||
|
case nameof(IExitlineManageable):
|
||||||
|
break;
|
||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,5 +9,6 @@ namespace Deedy.Activity
|
|||||||
{
|
{
|
||||||
public class LogInfoCollection : ObservableCollection<LogInfo>
|
public class LogInfoCollection : ObservableCollection<LogInfo>
|
||||||
{
|
{
|
||||||
|
public LogInfoCollection(int limt = 50) { }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,5 +9,6 @@ namespace Deedy.Activity
|
|||||||
public interface IExitlineManageable
|
public interface IExitlineManageable
|
||||||
{
|
{
|
||||||
ExitlinePosition ExitlinePosition { get; set; }
|
ExitlinePosition ExitlinePosition { get; set; }
|
||||||
|
bool? IsExitlineAtSamePosition { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user