Fixed the markup extension for the SymbolIcon and FontIcon class not …

…working at all.
m0lDaViA · Apr 22, 2024 · d33ecf3 · d33ecf3
1 parent d88b815
commit d33ecf3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/src/Wpf.Ui/Markup/FontIconExtension.cs b/src/Wpf.Ui/Markup/FontIconExtension.cs
@@ -32,29 +32,31 @@ namespace Wpf.Ui.Markup;
 [MarkupExtensionReturnType(typeof(FontIcon))]
 public class FontIconExtension : MarkupExtension
 {
-    public FontIconExtension(string glyph)
+    public FontIconExtension()
     {
-        Glyph = glyph;
-        FontFamily = new FontFamily("FluentSystemIcons");
     }
 
-    public FontIconExtension(string glyph, FontFamily fontFamily)
-        : this(glyph)
+    public FontIconExtension(string glyph)
     {
-        FontFamily = fontFamily;
+        Glyph = glyph;
     }
 
     [ConstructorArgument("glyph")]
-    public string Glyph { get; set; }
+    public string? Glyph { get; set; }
 
     [ConstructorArgument("fontFamily")]
-    public FontFamily FontFamily { get; set; }
+    public FontFamily FontFamily { get; set; } = new("FluentSystemIcons");
 
     public double FontSize { get; set; }
 
     public override object ProvideValue(IServiceProvider serviceProvider)
     {
-        var fontIcon = new FontIcon { Glyph = Glyph, FontFamily = FontFamily };
+        if (serviceProvider.GetService(typeof(IProvideValueTarget)) is IProvideValueTarget { TargetObject: Setter })
+        {
+            return this;
+        }
+
+        FontIcon fontIcon = new() { Glyph = Glyph, FontFamily = FontFamily };
 
         if (FontSize > 0)
         {
@@ -63,4 +65,4 @@ public override object ProvideValue(IServiceProvider serviceProvider)
 
         return fontIcon;
     }
-}
+}
diff --git a/src/Wpf.Ui/Markup/SymbolIconExtension.cs b/src/Wpf.Ui/Markup/SymbolIconExtension.cs
@@ -32,6 +32,11 @@ namespace Wpf.Ui.Markup;
 [MarkupExtensionReturnType(typeof(SymbolIcon))]
 public class SymbolIconExtension : MarkupExtension
 {
+
+    public SymbolIconExtension()
+    {
+    }
+
     public SymbolIconExtension(SymbolRegular symbol)
     {
         Symbol = symbol;
@@ -58,7 +63,12 @@ public SymbolIconExtension(SymbolRegular symbol, bool filled)
 
     public override object ProvideValue(IServiceProvider serviceProvider)
     {
-        var symbolIcon = new SymbolIcon { Symbol = Symbol, Filled = Filled };
+        if (serviceProvider.GetService(typeof(IProvideValueTarget)) is IProvideValueTarget { TargetObject: Setter })
+        {
+            return this;
+        }
+
+        SymbolIcon symbolIcon = new() { Symbol = Symbol, Filled = Filled };
 
         if (FontSize > 0)
         {