Merge pull request #35 from MahApps/fix/feathericons

Use fill path for Feather Icons

Author: punker76

src/IconPacks.Avalonia.Core/PackIconControlBase.axaml

@@ -13,7 +13,6 @@
             <Grid x:Name="PART_InnerGrid">
                 <Viewbox x:Name="PART_ViewBox">
                     <Path x:Name="PART_IconPath"
-                          Fill="{TemplateBinding Foreground}"
                           Data="{TemplateBinding Data}"
                           Stretch="Uniform"
                           UseLayoutRounding="False" />
@@ -46,6 +45,7 @@
             <Setter Property="StrokeJoin" Value="Round" />
             <Setter Property="Width" Value="24" />
             <Setter Property="Height" Value="24" />
+            <Setter Property="Margin" Value="1" />
         </Style>
 
         <!-- flipped icon data -->

src/IconPacks.Avalonia.FeatherIcons/PackIconFeatherIcons.cs

@@ -14,7 +14,7 @@ public class PackIconFeatherIcons : PackIconControlBase
     {
         public PackIconFeatherIcons()
         {
-            UpdateIconPseudoClasses(false, true, false);
+            UpdateIconPseudoClasses(true, false, false);
         }
 
         public static readonly StyledProperty<PackIconFeatherIconsKind> KindProperty

src/IconPacks.Avalonia.FeatherIcons/Resources/Icons.json

@@ -1,4 +1,4 @@
-using Avalonia.Media;
+using Avalonia.Media;
 using IconPacks.Avalonia.Core;
 using IconPacks.Avalonia.Core.Converter;
 using IconPacks.Avalonia.BootstrapIcons;
@@ -212,39 +212,5 @@ protected override ScaleTransform GetScaleTransform(object iconKind)
                     return new ScaleTransform(1, 1);
             }
         }
-
-        /// <inheritdoc />
-        protected override DrawingGroup GetDrawingGroup(object iconKind, IBrush foregroundBrush, string path)
-        {
-            var geometryDrawing = new GeometryDrawing
-            {
-                Geometry = StreamGeometry.Parse(path)
-            };
-
-            switch (iconKind)
-            {
-                case PackIconFeatherIconsKind:
-                {
-                    var pen = new Pen(foregroundBrush, 2d)
-                    {
-                        LineCap = PenLineCap.Round,
-                        LineJoin = PenLineJoin.Round,
-                    };
-                    geometryDrawing.Pen = pen;
-                    break;
-                }
-                default:
-                    geometryDrawing.Brush = foregroundBrush;
-                    break;
-            }
-
-            var drawingGroup = new DrawingGroup
-            {
-                Children = { geometryDrawing },
-                Transform = this.GetTransformGroup(iconKind)
-            };
-
-            return drawingGroup;
-        }
     }
 }

src/IconPacks.Avalonia.Typicons/Resources/Icons.json

@@ -117,7 +117,7 @@ protected override void UpdateData()
                     break;
 
                 case PackIconFeatherIconsKind:
-                    UpdateIconPseudoClasses(false, true, false);
+                    UpdateIconPseudoClasses(true, false, false);
                     break;
 
                 case PackIconFileIconsKind:

src/IconPacks.Avalonia/Converter/PackIconKindToImageConverter.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using IconPacks.Avalonia.Core;
@@ -229,39 +229,5 @@ protected override ScaleTransform GetScaleTransform(object iconKind)
                     return new ScaleTransform(1, 1);
             }
         }
-
-        /// <inheritdoc />
-        protected override DrawingGroup GetDrawingGroup(object iconKind, IBrush foregroundBrush, string path)
-        {
-            var geometryDrawing = new GeometryDrawing
-            {
-                Geometry = StreamGeometry.Parse(path)
-            };
-
-            switch (iconKind)
-            {
-                case PackIconFeatherIconsKind:
-                {
-                    var pen = new Pen(foregroundBrush, 2d)
-                    {
-                        LineCap = PenLineCap.Round,
-                        LineJoin = PenLineJoin.Round,
-                    };
-                    geometryDrawing.Pen = pen;
-                    break;
-                }
-                default:
-                    geometryDrawing.Brush = foregroundBrush;
-                    break;
-            }
-
-            var drawingGroup = new DrawingGroup
-            {
-                Children = { geometryDrawing },
-                Transform = this.GetScaleTransform(iconKind)
-            };
-
-            return drawingGroup;
-        }
     }
 }