Merge pull request #3 from dotnetprojects/master

Updating to Master

Author: paulushub

Samples/Example/Example.csproj

@@ -29,13 +29,17 @@
     <DefineConstants Condition="$(TargetFramework.StartsWith('net48'))">$(DefineConstants);DOTNET48;NETFULL</DefineConstants>
     <DefineConstants Condition="$(TargetFramework.StartsWith('netcore'))">$(DefineConstants);NETCORE</DefineConstants>
   </PropertyGroup>
+  <ItemGroup>
+    <None Remove="Images\rect.svg" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Source\SVGImage\DotNetProjects.SVGImage.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\brush.svg" />
     <Resource Include="Images\error.svg" />
     <Resource Include="Images\example radgrad01.svg" />
+    <Resource Include="Images\rect.svg" />
     <Resource Include="Images\test_3.svg" />
     <Resource Include="Images\tombigel_green_router.svg" />
     <Resource Include="Images\Soccer_ball_animated.svg" />

Samples/Example/Images/rect.svg

@@ -107,6 +107,7 @@
                 <svg1:SVGImage Source="/Example;component/Images/3.svg" RenderTransformOrigin="0.5,0.5" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Margin="3" />
                 <svg1:SVGImage Source="/Example;component/Images/4.svg" RenderTransformOrigin="0.5,0.5" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Margin="3" />
                 <svg1:SVGImage Source="/Example;component/Images/5.svg" RenderTransformOrigin="0.5,0.5" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Margin="3" />
+                <svg1:SVGImage Source="/Example;component/Images/rect.svg" RenderTransformOrigin="0.5,0.5" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Margin="3" OverrideColor="Black" x:Name="OverrideColorTest" MouseDoubleClick="SVGImage_MouseDoubleClick" />
             </UniformGrid>
         </TabItem>
         <TabItem Header="Animation/Clipping" Height="40" Width="245" x:Name="tabAnimation" Style="{DynamicResource TabItem.Style.TopTabStripPlacement}">

Samples/Example/MainWindow.xaml

@@ -139,5 +139,15 @@ private void EnsureIcons()
             }
 #endif
         }
+
+        private void SVGImage_MouseDoubleClick(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        {
+            var rnd = new Random().Next(0, 3);
+
+            OverrideColorTest.OverrideColor =
+                rnd == 0 ? System.Windows.Media.Colors.White :
+                rnd == 1 ? System.Windows.Media.Colors.Magenta :
+                System.Windows.Media.Colors.Black;
+        }
     }
 }

Samples/Example/MainWindow.xaml.cs

@@ -88,8 +88,11 @@ public enum eSizeType
                typeof(double?), typeof(SVGImage), new FrameworkPropertyMetadata(default,
                    FrameworkPropertyMetadataOptions.AffectsRender, OverrideStrokeWidthPropertyChanged));
 
-        public static readonly DependencyProperty OverrideColorProperty = DependencyProperty.Register("OverrideColor",
-            typeof(Color?), typeof(SVGImage), new PropertyMetadata(null));
+        public static readonly DependencyProperty OverrideColorProperty =
+            DependencyProperty.Register("OverrideColor",
+                typeof(Color?),
+                typeof(SVGImage),
+                new FrameworkPropertyMetadata(default, FrameworkPropertyMetadataOptions.AffectsRender, OverrideColorPropertyChanged));
 
         public static readonly DependencyProperty CustomBrushesProperty = DependencyProperty.Register(nameof(CustomBrushes),
                 typeof(Dictionary<string, Brush>), typeof(SVGImage), new FrameworkPropertyMetadata(default,
@@ -725,8 +728,8 @@ static void OnSizeTypeChanged(DependencyObject d, DependencyPropertyChangedEvent
 
         static void OnSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            StreamResourceInfo resource = Application.GetResourceStream(new Uri(e.NewValue.ToString(), UriKind.Relative));
-            ((SVGImage)d).SetImage(resource.Stream);
+            StreamResourceInfo resource = e.NewValue != null ? Application.GetResourceStream(new Uri(e.NewValue.ToString(), UriKind.Relative)) : null;
+            ((SVGImage)d).SetImage(resource != null ? resource.Stream : null);
         }
 
         static void OnFileSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -739,6 +742,16 @@ static void OnImageSourceChanged(DependencyObject d, DependencyPropertyChangedEv
             ((SVGImage)d).SetImage(e.NewValue as Drawing);
         }
 
+        private static void OverrideColorPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is SVGImage svgImage && e.NewValue is Color newColor && svgImage._render != null)
+            {
+                svgImage._render.OverrideColor = newColor;
+                svgImage.InvalidateVisual();
+                svgImage.ReRenderSvg();
+            }
+        }
+
         private static void OverrideStrokeWidthPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             if (d is SVGImage svgImage && e.NewValue is double newStrokeWidth && svgImage._render != null)

Source/SVGImage/SVG/SVGImage.cs

@@ -132,7 +132,7 @@ private GeometryDrawing NewDrawingItem(Shape shape, Geometry geometry)
                     item.Pen.DashCap = PenLineCap.Flat;
                     DashStyle ds = new DashStyle();
                     double scale = 1 / stroke.Width;
-                    foreach (int dash in stroke.StrokeArray) ds.Dashes.Add(dash * scale);
+                    foreach (var dash in stroke.StrokeArray) ds.Dashes.Add(dash * scale);
                     item.Pen.DashStyle = ds;
                 }
                 switch (stroke.LineCap)