fixes

MartinTopfstedt · May 29, 2022 · 531ebe0 · 531ebe0
1 parent a2437a7
commit 531ebe0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "Font-Awesome"]
 	path = Font-Awesome
 	url = https://github.com/FortAwesome/Font-Awesome.git
+	branch = 6.x
diff --git a/Font-Awesome b/Font-Awesome
diff --git a/src/FontAwesome6.Fonts.Net/Extensions/EFontAwesomeIconExtensions.cs b/src/FontAwesome6.Fonts.Net/Extensions/EFontAwesomeIconExtensions.cs
@@ -1,10 +1,7 @@
 using FontAwesome6.Extensions;
 
-using System.Collections.Generic;
 using System.Globalization;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
 using System.Windows.Media;
 
 namespace FontAwesome6.Fonts.Extensions
@@ -110,12 +107,12 @@ public static Drawing CreateDrawing(this EFontAwesomeIcon icon, Brush primary, B
                 }
                 else
                 {
-                    var primaryGlyph = CreateFormattedText(info.Item1, typeface, primary, emSize);
-                    drawingContext.DrawGeometry(primary, null, primaryGlyph.BuildGeometry(new Point(0, 0)));
+                    var primaryFormattedText = CreateFormattedText(info.Item1, typeface, primary, emSize);
+                    drawingContext.DrawText(primaryFormattedText, new Point(0, 0));
                 }
 #else
-                var primaryGlyph = CreateFormattedText(info.Item1, typeface, primary, emSize);
-                drawingContext.DrawGeometry(primary, null, primaryGlyph.BuildGeometry(new Point(0, 0)));
+                var primaryFormattedText = CreateFormattedText(info.Item1, typeface, primary, emSize);
+                drawingContext.DrawText(primaryFormattedText, new Point(0, 0));
 #endif
             }
             return visual.Drawing;

diff --git a/src/FontAwesome6.Fonts.Net/FontAwesome.cs b/src/FontAwesome6.Fonts.Net/FontAwesome.cs
@@ -91,18 +91,14 @@ private static void OnIconPropertyChanged(DependencyObject d, DependencyProperty
                 return;
             }
 
-            var icon = (EFontAwesomeIcon)d.GetValue(IconProperty);            
+            var icon = (EFontAwesomeIcon)d.GetValue(IconProperty);
 
 #if FontAwesomePro
             if (icon.IsDuotone())
             {
                 return;
             }
 #endif
-
-#if NET40
-            d.SetValue(TextOptions.TextRenderingModeProperty, TextRenderingMode.ClearType);
-#endif            
             d.SetValue(FontFamilyProperty, icon.GetFontFamily() ?? fontAwesome._initialFontFamily);
             d.SetValue(TextProperty, icon.GetUnicode());
             d.SetValue(TextAlignmentProperty, TextAlignment.Center);