Add triangle shape

miroiu · Jun 22, 2024 · 8a83457 · 8a83457
1 parent 42fc155
commit 8a83457
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
@@ -64,6 +64,15 @@
                                Opacity="0.8" />
                 </DataTemplate>
 
+                <DataTemplate DataType="{x:Type local:TriangleViewModel}">
+                    <Polygon Points="0,100 50,0 100,100"
+                             Stretch="Fill"
+                             Fill="{Binding Color, Converter={StaticResource ColorToSolidColorBrushConverter}}"
+                             Stroke="{Binding BorderColor, Converter={StaticResource ColorToSolidColorBrushConverter}}"
+                             StrokeThickness="2"
+                             Opacity="0.8" />
+                </DataTemplate>
+
                 <DataTemplate DataType="{x:Type local:ShapeToolbarViewModel}">
                     <Canvas Visibility="{Binding Shape, Converter={StaticResource BooleanToVisibilityConverter}}">
                         <shared:Swatches SelectedColor="{Binding Shape.Color}"
@@ -479,9 +488,6 @@
                 Margin="0 0 50 50"
                 Height="38"
                 CornerRadius="3">
-            <Border.Effect>
-                <DropShadowEffect ShadowDepth="1" />
-            </Border.Effect>
 
             <ItemsControl ItemsSource="{Binding Cursors}">
                 <ItemsControl.ItemsPanel>
@@ -498,6 +504,9 @@
                                 Margin="-3"
                                 Background="{Binding Color, Converter={StaticResource ColorToSolidColorBrushConverter}}"
                                 Padding="6 2">
+                            <Border.Effect>
+                                <DropShadowEffect ShadowDepth="1" />
+                            </Border.Effect>
                             <Button Command="{x:Static nodify:EditorCommands.BringIntoView}"
                                     CommandParameter="{Binding Location}"
                                     CommandTarget="{Binding ElementName=Editor}"

diff --git a/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs b/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
@@ -146,11 +146,16 @@ private void FillCanvasWithShapes()
             };
             Shapes.Add(rectangle2);
 
-            Connections.Add(new ConnectionViewModel(ellipse2.BottomConnector, rectangle2.TopConnector));
+            var triangle = new TriangleViewModel
+            {
+                Location = new Point(800, 200)
+            };
+            Shapes.Add(triangle);
 
+            Connections.Add(new ConnectionViewModel(ellipse2.BottomConnector, rectangle2.TopConnector));
             Connections.Add(new ConnectionViewModel(rectangle.RightConnector, rectangle2.RightConnector));
 
-            SelectedShapes.Add(rectangle);
+            SelectedShapes.Add(triangle);
 
             Decorators.Add(ShapeToolbar);
             Decorators.AddRange(Cursors);

diff --git a/Examples/Nodify.Shapes/Canvas/Shapes/TriangleViewModel.cs b/Examples/Nodify.Shapes/Canvas/Shapes/TriangleViewModel.cs
@@ -0,0 +1,13 @@
+using System.Windows.Media;
+
+namespace Nodify.Shapes.Canvas
+{
+    public class TriangleViewModel : ShapeViewModel
+    {
+        public TriangleViewModel()
+        {
+            Color = Color.FromRgb(235, 195, 71);
+            Text = "Triangle";
+        }
+    }
+}