Merge branch 'develop'

Author: punker76

src/MahApps.Metro.IconPacks.FeatherIcons/PackIconFeatherIconsImageExtension.cs

@@ -34,30 +34,5 @@ protected override string GetPathData(object iconKind)
             }
             return data;
         }
-
-        /// <inheritdoc />
-        protected override DrawingGroup GetDrawingGroup(object iconKind, Brush foregroundBrush, string path)
-        {
-            var geometryDrawing = new GeometryDrawing
-            {
-                Geometry = Geometry.Parse(path)
-            };
-
-            var pen = new Pen(foregroundBrush, 2d)
-            {
-                StartLineCap = PenLineCap.Round,
-                EndLineCap = PenLineCap.Round,
-                LineJoin = PenLineJoin.Round
-            };
-            geometryDrawing.Pen = pen;
-
-            var drawingGroup = new DrawingGroup
-            {
-                Children = { geometryDrawing },
-                Transform = this.GetTransformGroup(iconKind)
-            };
-
-            return drawingGroup;
-        }
     }
 }

src/MahApps.Metro.IconPacks.FeatherIcons/PackIconFeatherIconsKindToImageConverter.cs

@@ -1,6 +1,4 @@
-using System.Windows.Media;
-
-namespace MahApps.Metro.IconPacks.Converter
+namespace MahApps.Metro.IconPacks.Converter
 {
     public class PackIconFeatherIconsKindToImageConverter : PackIconKindToImageConverterBase
     {
@@ -14,30 +12,5 @@ protected override string GetPathData(object iconKind)
             }
             return data;
         }
-
-        /// <inheritdoc />
-        protected override DrawingGroup GetDrawingGroup(object iconKind, Brush foregroundBrush, string path)
-        {
-            var geometryDrawing = new GeometryDrawing
-            {
-                Geometry = Geometry.Parse(path)
-            };
-
-            var pen = new Pen(foregroundBrush, 2d)
-            {
-                StartLineCap = PenLineCap.Round,
-                EndLineCap = PenLineCap.Round,
-                LineJoin = PenLineJoin.Round
-            };
-            geometryDrawing.Pen = pen;
-
-            var drawingGroup = new DrawingGroup
-            {
-                Children = { geometryDrawing },
-                Transform = this.GetTransformGroup(iconKind)
-            };
-
-            return drawingGroup;
-        }
     }
 }

src/MahApps.Metro.IconPacks.FeatherIcons/Resources/Icons.json

@@ -21,15 +21,9 @@
                     </TransformGroup>
                 </Grid.RenderTransform>
                 <Viewbox Margin="{TemplateBinding Padding}">
-                    <Path Width="24"
-                          Height="24"
-                          Data="{Binding Data, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={converter:NullToUnsetValueConverter}}"
+                    <Path Data="{Binding Data, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={converter:NullToUnsetValueConverter}}"
+                          Fill="{TemplateBinding Foreground}"
                           Stretch="Uniform"
-                          Stroke="{TemplateBinding Foreground}"
-                          StrokeEndLineCap="Round"
-                          StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeThickness="2"
                           UseLayoutRounding="False" />
                 </Viewbox>
             </Grid>

src/MahApps.Metro.IconPacks.FeatherIcons/Themes/UAP/PackIconFeatherIcons.xaml

@@ -22,16 +22,10 @@
                     </TransformGroup>
                 </Grid.RenderTransform>
                 <Viewbox Margin="{TemplateBinding Padding}">
-                    <Path Width="24"
-                          Height="24"
-                          Data="{Binding Data, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={converter:NullToUnsetValueConverter}}"
+                    <Path Data="{Binding Data, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={converter:NullToUnsetValueConverter}}"
+                          Fill="{TemplateBinding Foreground}"
                           SnapsToDevicePixels="False"
                           Stretch="Uniform"
-                          Stroke="{TemplateBinding Foreground}"
-                          StrokeEndLineCap="Round"
-                          StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeThickness="2"
                           UseLayoutRounding="False" />
                 </Viewbox>
             </Grid>

src/MahApps.Metro.IconPacks.FeatherIcons/Themes/WPF/PackIconFeatherIcons.xaml

@@ -75,16 +75,6 @@
                     </Setter.Value>
                 </Setter>
             </DataTrigger>
-            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Kind, Converter={converter:DataTypeValueConverter}}" Value="{x:Type iconPacks:PackIconFeatherIconsKind}">
-                <Setter TargetName="PART_IconPath" Property="Fill" Value="{x:Null}" />
-                <Setter TargetName="PART_IconPath" Property="Height" Value="24" />
-                <Setter TargetName="PART_IconPath" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Foreground, Mode=OneWay}" />
-                <Setter TargetName="PART_IconPath" Property="StrokeEndLineCap" Value="Round" />
-                <Setter TargetName="PART_IconPath" Property="StrokeLineJoin" Value="Round" />
-                <Setter TargetName="PART_IconPath" Property="StrokeStartLineCap" Value="Round" />
-                <Setter TargetName="PART_IconPath" Property="StrokeThickness" Value="2" />
-                <Setter TargetName="PART_IconPath" Property="Width" Value="24" />
-            </DataTrigger>
             <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Kind, Converter={converter:DataTypeValueConverter}}" Value="{x:Type iconPacks:PackIconFileIconsKind}">
                 <Setter TargetName="PART_IconPath" Property="LayoutTransform">
                     <Setter.Value>