From b5867c148ec89d915e246f9e9500bd46a777480e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=89=BE=E7=AB=B9?= <akwkevin@126.com>
Date: Thu, 26 Jan 2023 18:42:58 +0800
Subject: [PATCH] =?UTF-8?q?marker.=E8=BF=98=E6=9C=89=E4=B8=80=E7=82=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/Links/MarkersViewModel.cs      | 24 +++++++++++++++++++
 .../UserControls/LineControl.xaml             | 14 +++++------
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/AIStudio.Wpf.DiagramDesigner.Demo/ViewModels/Links/MarkersViewModel.cs b/AIStudio.Wpf.DiagramDesigner.Demo/ViewModels/Links/MarkersViewModel.cs
index df7e37a..6efab81 100644
--- a/AIStudio.Wpf.DiagramDesigner.Demo/ViewModels/Links/MarkersViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner.Demo/ViewModels/Links/MarkersViewModel.cs
@@ -54,6 +54,30 @@ namespace AIStudio.Wpf.DiagramDesigner.Demo.ViewModels
             connector1.AddLabel("Square");
             DiagramViewModel.DirectAddItemCommand.Execute(connector1);
 
+            node1 = new DefaultDesignerItemViewModel() { Left = 50, Top = 380, Text = "1" };
+            DiagramViewModel.DirectAddItemCommand.Execute(node1);
+
+            node2 = new DefaultDesignerItemViewModel() { Left = 400, Top = 380, Text = "2" };
+            DiagramViewModel.DirectAddItemCommand.Execute(node2);
+
+            connector1 = new ConnectionViewModel(node1.RightConnector, node2.LeftConnector);
+            connector1.ShapeViewModel.SourceMarker = LinkMarker.NewRectangle(10, 20);
+            connector1.ShapeViewModel.SinkMarker = LinkMarker.NewArrow(20, 10);
+            connector1.AddLabel("Factory");
+            DiagramViewModel.DirectAddItemCommand.Execute(connector1);
+
+            node1 = new DefaultDesignerItemViewModel() { Left = 50, Top = 490, Text = "1" };
+            DiagramViewModel.DirectAddItemCommand.Execute(node1);
+
+            node2 = new DefaultDesignerItemViewModel() { Left = 400, Top = 490, Text = "2" };
+            DiagramViewModel.DirectAddItemCommand.Execute(node2);
+
+            connector1 = new ConnectionViewModel(node1.RightConnector, node2.LeftConnector);
+            connector1.ShapeViewModel.SourceMarker = new LinkMarker("M 0 -8 L 3 -8 3 8 0 8 z M 4 -8 7 -8 7 8 4 8 z M 8 -8 16 0 8 8 z", 16, ArrowPathStyle.Arrow, ArrowSizeStyle.ExtraLarge);
+            connector1.ShapeViewModel.SinkMarker = new LinkMarker("M 0 -8 L 8 -8 4 0 8 8 0 8 4 0 z", 8, ArrowPathStyle.Arrow, ArrowSizeStyle.Small);
+            connector1.AddLabel("Custom");
+            DiagramViewModel.DirectAddItemCommand.Execute(connector1);
+
         }
     }
 }
diff --git a/AIStudio.Wpf.DiagramDesigner/UserControls/LineControl.xaml b/AIStudio.Wpf.DiagramDesigner/UserControls/LineControl.xaml
index b8d39a5..d39c732 100644
--- a/AIStudio.Wpf.DiagramDesigner/UserControls/LineControl.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/UserControls/LineControl.xaml
@@ -21,11 +21,11 @@
             </Style.Triggers>
         </Style>
         <Style x:Key="ArrowStyle" TargetType="Path">
-            <Setter Property="Stroke" Value="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}"/>
+            <!--<Setter Property="Stroke" Value="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}"/>-->
             <Setter Property="Fill" Value="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}"/>
             <Style.Triggers>
                 <DataTrigger Value="True" Binding="{Binding IsSelected}">
-                    <Setter Property="Stroke" Value="Black"/>
+                    <!--<Setter Property="Stroke" Value="Black"/>-->
                     <Setter Property="Fill" Value="Black"/>
                 </DataTrigger>
             </Style.Triggers>
@@ -46,9 +46,8 @@
             <Path x:Name="rightarrow" 
                 Data="{Binding ShapeViewModel.SinkMarker.Path}"
                 Visibility="{Binding Path=IsFullConnection, Converter={x:Static s:BoolToVisibilityConverter.Instance}}"
-                Height="{Binding GetSinkMarkerWidth()}"
-                Width="{Binding GetSinkMarkerWidth()}"
-                Stretch="Fill"   
+                Width="{Binding ShapeViewModel.SinkMarker.Width}"
+                Stretch="UniformToFill"   
                 HorizontalAlignment="Left"
                 VerticalAlignment="Top"    
                 RenderTransformOrigin="0.5,0.5"
@@ -63,12 +62,11 @@
 
             <Path x:Name="leftarrow" 
                 Data="{Binding ShapeViewModel.SourceMarker.Path}"
-                Visibility="{Binding Path=IsFullConnection, Converter={x:Static s:BoolToVisibilityConverter.Instance}}"                                                
-                Height="{Binding ShapeViewModel.SourceMarker.Width}"
+                Visibility="{Binding Path=IsFullConnection, Converter={x:Static s:BoolToVisibilityConverter.Instance}}"                                                       
                 Width="{Binding ShapeViewModel.SourceMarker.Width}"
                 Canvas.Left="{Binding StartPoint.X}"
                 Canvas.Top="{Binding StartPoint.Y}"
-                Stretch="Fill"
+                Stretch="UniformToFill"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Top"                                                    
                 RenderTransformOrigin="0.5,0.5"