Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Radix Icons to v1.3.0 #331

Merged
merged 1 commit into from
May 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ This `IconPacks` library contains controls, markup extensions and converters to
| [Primer Octicons (GitHub)](https://github.com/primer/octicons) | 19.9.0 | 604 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.Octicons/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.Octicons.svg?style=flat-square&&label=Octicons"></a> |
| [PICOL Icons](https://github.com/PicolSigns/Icons) | 1.1.0 | 549 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.PicolIcons/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.PicolIcons.svg?style=flat-square&&label=PicolIcons"></a> |
| [Pixelarticons Free](https://pixelarticons.com/) | 1.8.1 | 486 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.PixelartIcons/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.PixelartIcons.svg?style=flat-square&&label=PixelartIcons"></a> |
| [Radix Icons](https://icons.modulz.app/) | 1.0.3 | 312 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.RadixIcons/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.RadixIcons.svg?style=flat-square&&label=RadixIcons"></a> |
| [Radix Icons](https://github.com/radix-ui/icons) | 1.3.0 | 324 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.RadixIcons/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.RadixIcons.svg?style=flat-square&&label=RadixIcons"></a> |
| [Remix Icon](https://remixicon.com/) | 4.2.0 | 2850 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.RemixIcon/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.RemixIcon.svg?style=flat-square&&label=RemixIcon"></a> |
| [RPG Awesome](https://nagoshiashumari.github.io/Rpg-Awesome/) | 0.2.0 | 495 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.RPGAwesome/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.RPGAwesome.svg?style=flat-square&&label=RPGAwesome"></a> |
| [Simple Icons](https://simpleicons.org/) | 7.14.0 | 2379 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.SimpleIcons/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.SimpleIcons.svg?style=flat-square&&label=SimpleIcons"></a> |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
namespace MahApps.Metro.IconPacks
{
/// <summary>
/// RadixIcons licensed under the MIT License <see><cref>https://github.com/modulz/radix-icons/blob/master/LICENSE</cref></see>
/// Contributions, corrections and requests can be made on GitHub <see><cref>https://github.com/modulz/radix-icons</cref></see>.
/// RadixIcons licensed under the MIT License <see><cref>https://github.com/radix-ui/icons?tab=MIT-1-ov-file#readme</cref></see>
/// Contributions, corrections and requests can be made on GitHub <see><cref>https://github.com/radix-ui/icons</cref></see>.
/// </summary>
[MetaData("Radix Icons", "https://icons.modulz.app/", "https://github.com/modulz/radix-icons/blob/master/LICENSE")]
[MetaData("Radix Icons", "https://github.com/radix-ui/icons", "https://github.com/radix-ui/icons?tab=MIT-1-ov-file#readme")]
public class PackIconRadixIcons : PackIconControlBase
{
public static readonly DependencyProperty KindProperty
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,5 @@ protected override string GetPathData(object iconKind)
}
return data;
}

/// <inheritdoc />
protected override ScaleTransform GetScaleTransform(object iconKind)
{
return new ScaleTransform(1, -1);
}
}
}
640 changes: 326 additions & 314 deletions src/MahApps.Metro.IconPacks/Icons/RadixIcons/PackIconRadixIconsKind.cs

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System.Windows.Media;

namespace MahApps.Metro.IconPacks.Converter
namespace MahApps.Metro.IconPacks.Converter
{
public class PackIconRadixIconsKindToImageConverter : PackIconKindToImageConverterBase
{
Expand All @@ -14,11 +12,5 @@ protected override string GetPathData(object iconKind)
}
return data;
}

/// <inheritdoc />
protected override ScaleTransform GetScaleTransform(object iconKind)
{
return new ScaleTransform(1, -1);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
namespace MahApps.Metro.IconPacks
{
/// <summary>
/// RadixIcons licensed under the MIT License <see><cref>https://github.com/modulz/radix-icons/blob/master/LICENSE</cref></see>
/// Contributions, corrections and requests can be made on GitHub <see><cref>https://github.com/modulz/radix-icons</cref></see>.
/// RadixIcons licensed under the MIT License <see><cref>https://github.com/radix-ui/icons?tab=MIT-1-ov-file#readme</cref></see>
/// Contributions, corrections and requests can be made on GitHub <see><cref>https://github.com/radix-ui/icons</cref></see>.
/// </summary>
[MetaData("Radix Icons", "https://icons.modulz.app/", "https://github.com/modulz/radix-icons/blob/master/LICENSE")]
[MetaData("Radix Icons", "https://github.com/radix-ui/icons", "https://github.com/radix-ui/icons?tab=MIT-1-ov-file#readme")]
public class PathIconRadixIcons : PathIconControlBase
{
public static readonly DependencyProperty KindProperty
Expand All @@ -36,9 +36,6 @@ public PackIconRadixIconsKind Kind

public PathIconRadixIcons()
{
var transformGroup = this.RenderTransform as TransformGroup ?? new TransformGroup();
var scaleTransform = new ScaleTransform() {ScaleY = -1};
transformGroup.Children.Insert(0, scaleTransform);
}

protected override void UpdateData()
Expand Down
1 change: 0 additions & 1 deletion src/MahApps.Metro.IconPacks/PackIconImageExtension.cs
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ protected override ScaleTransform GetScaleTransform(object iconKind)
case PackIconFontistoKind _:
case PackIconForkAwesomeKind _:
case PackIconJamIconsKind _:
case PackIconRadixIconsKind _:
case PackIconRPGAwesomeKind _:
case PackIconTypiconsKind _:
case PackIconVaadinIconsKind _:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ protected override ScaleTransform GetScaleTransform(object iconKind)
case PackIconFontistoKind _:
case PackIconForkAwesomeKind _:
case PackIconJamIconsKind _:
case PackIconRadixIconsKind _:
case PackIconRPGAwesomeKind _:
case PackIconTypiconsKind _:
case PackIconVaadinIconsKind _:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,7 @@
<Path Fill="{TemplateBinding Foreground}"
Stretch="Uniform"
Data="{Binding Data, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={converter:NullToUnsetValueConverter}}"
RenderTransformOrigin="0.5 0.5"
UseLayoutRounding="False">
<Path.RenderTransform>
<ScaleTransform ScaleY="-1" />
</Path.RenderTransform>
</Path>
UseLayoutRounding="False" />
</Viewbox>
</Grid>
</Grid>
Expand Down
7 changes: 0 additions & 7 deletions src/MahApps.Metro.IconPacks/Themes/WPF/PackIconControl.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,6 @@
</Setter.Value>
</Setter>
</DataTrigger>
<DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Kind, Converter={converter:DataTypeValueConverter}}" Value="{x:Type iconPacks:PackIconRadixIconsKind}">
<Setter TargetName="PART_IconPath" Property="LayoutTransform">
<Setter.Value>
<ScaleTransform ScaleY="-1" />
</Setter.Value>
</Setter>
</DataTrigger>
<DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Kind, Converter={converter:DataTypeValueConverter}}" Value="{x:Type iconPacks:PackIconRPGAwesomeKind}">
<Setter TargetName="PART_IconPath" Property="LayoutTransform">
<Setter.Value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@
Stretch="Uniform"
Data="{Binding Data, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={converter:NullToUnsetValueConverter}}"
SnapsToDevicePixels="False"
UseLayoutRounding="False">
<Path.LayoutTransform>
<ScaleTransform ScaleY="-1" />
</Path.LayoutTransform>
</Path>
UseLayoutRounding="False" />
</Viewbox>
</Grid>
</Grid>
Expand Down
Loading