Merge pull request #26 from williamgarner/master

Feature - Override Stroke Width

Author: jogibear9988

Source/SVGImage/SVG/SVGImage.cs

@@ -103,6 +103,29 @@ public Color? OverrideColor
         public static readonly DependencyProperty OverrideColorProperty =
             DependencyProperty.Register("OverrideColor", typeof(Color?), typeof(SVGImage), new PropertyMetadata(null));
 
+        public double? OverrideStrokeWidth
+        {
+            get { return (double?)GetValue(OverrideStrokeWidthProperty); }
+            set { SetValue(OverrideStrokeWidthProperty, value); }
+        }
+
+        public static readonly DependencyProperty OverrideStrokeWidthProperty =
+           DependencyProperty.Register(nameof(OverrideStrokeWidth),
+               typeof(double?),
+               typeof(SVGImage),
+               new FrameworkPropertyMetadata(default, FrameworkPropertyMetadataOptions.AffectsRender, OverrideStrokeWidthPropertyChanged));
+
+        private static void OverrideStrokeWidthPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is SVGImage svgImage && e.NewValue is double newStrokeWidth && svgImage._render != null)
+            {
+                svgImage._render.OverrideStrokeWidth = newStrokeWidth;
+                svgImage.InvalidateVisual();
+                svgImage.ReRenderSvg();
+            }
+        }
+
+
         public Dictionary<string, Brush> CustomBrushes
         {
             get { return (Dictionary<string, Brush>)GetValue(CustomBrushesProperty); }
@@ -183,6 +206,7 @@ public void SetImage(string svgFilename)
                 _render.UseAnimations = false;
                 _render.OverrideColor = OverrideColor;
                 _render.CustomBrushes = CustomBrushes;
+                _render.OverrideStrokeWidth = OverrideStrokeWidth;
                 loadImage(_render);
                 loadImage = null;
             }
@@ -215,6 +239,7 @@ public void SetImage(Stream stream)
                 _render.ExternalFileLoader = this.ExternalFileLoader;
                 _render.OverrideColor = OverrideColor;
                 _render.CustomBrushes = CustomBrushes;
+                _render.OverrideStrokeWidth = OverrideStrokeWidth;
                 _render.UseAnimations = false;
                 loadImage(_render);
                 loadImage = null;
@@ -232,6 +257,7 @@ protected override void OnInitialized(EventArgs e)
                 _render.ExternalFileLoader = this.ExternalFileLoader;
                 _render.OverrideColor = OverrideColor;
                 _render.CustomBrushes = CustomBrushes;
+                _render.OverrideStrokeWidth = OverrideStrokeWidth;
                 _render.UseAnimations = this.UseAnimations;
                 loadImage(_render);
                 loadImage = null;

Source/SVGImage/SVG/SVGRender.cs

@@ -30,6 +30,8 @@ public SVGRender()
         public bool UseAnimations { get; set; }
 
         public Color? OverrideColor { get; set; }
+       
+        public double? OverrideStrokeWidth { get; set; }
 
         private Dictionary<string, Brush> m_customBrushes;
 
@@ -102,6 +104,10 @@ private GeometryDrawing NewDrawingItem(Shape shape, Geometry geometry)
             Stroke stroke = shape.Stroke;
             if (stroke != null)
             {
+                if(OverrideStrokeWidth.HasValue)
+                {
+                    stroke.Width = OverrideStrokeWidth.Value;
+                }
                 var brush = stroke.StrokeBrush(this.SVG, this, shape, shape.Opacity, geometry.Bounds);
                 if (OverrideColor != null)
                     brush = new SolidColorBrush(Color.FromArgb((byte)(255 * shape.Opacity), OverrideColor.Value.R, OverrideColor.Value.G, OverrideColor.Value.B));

appveyor.yml

@@ -1,4 +1,4 @@
-version: 4.0.{build}
+version: 4.1.{build}
 
 image: Visual Studio 2019