Resolve merge conflicts

AvaloniaUI · Nov 6, 2019 · 86ff828 · 86ff828
1 parent 12e418b
commit 86ff828
Show file tree

Hide file tree

Showing 17 changed files with 270 additions and 383 deletions.
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
@@ -50,7 +50,6 @@
       <TabItem Header="TabControl"><pages:TabControlPage/></TabItem>
       <TabItem Header="TabStrip"><pages:TabStripPage/></TabItem>
       <TabItem Header="TextBox"><pages:TextBoxPage/></TabItem>
-      <TabItem Header="GlyphRun"><pages:GlyphRunPage/></TabItem>
       <TabItem Header="ToolTip"><pages:ToolTipPage/></TabItem>
       <TabItem Header="TreeView"><pages:TreeViewPage/></TabItem>
       <TabItem Header="Viewbox"><pages:ViewboxPage/></TabItem>

diff --git a/samples/ControlCatalog/Pages/GlyphRunPage.xaml b/samples/ControlCatalog/Pages/GlyphRunPage.xaml
diff --git a/samples/ControlCatalog/Pages/GlyphRunPage.xaml.cs b/samples/ControlCatalog/Pages/GlyphRunPage.xaml.cs
diff --git a/src/Avalonia.Visuals/Media/FormattedTextStyleSpan.cs b/src/Avalonia.Visuals/Media/FormattedTextStyleSpan.cs
@@ -7,8 +7,6 @@ namespace Avalonia.Media
     /// </summary>
     public class FormattedTextStyleSpan
     {
-        private static readonly IFontManager s_fontManager = AvaloniaLocator.Current.GetService<IFontManager>();
-
         /// <summary>
         /// Initializes a new instance of the <see cref="FormattedTextStyleSpan"/> class.
         /// </summary>
@@ -82,7 +80,7 @@ private static Typeface GetTypeface(FontFamily fontFamily, FontWeight? fontWeigh
                 fontStyle = FontStyle.Normal;
             }
 
-            return s_fontManager.GetTypeface(fontFamily, fontWeight.Value, fontStyle.Value);
+            return FontManager.Default.GetCachedTypeface(fontFamily, fontWeight.Value, fontStyle.Value);
         }
     }
 }
diff --git a/src/Avalonia.Visuals/Platform/IFontManager.cs b/src/Avalonia.Visuals/Platform/IFontManager.cs
diff --git a/src/Skia/Avalonia.Skia/FontManager.cs b/src/Skia/Avalonia.Skia/FontManager.cs
diff --git a/src/Skia/Avalonia.Skia/TextRunIterator.cs b/src/Skia/Avalonia.Skia/TextRunIterator.cs
@@ -5,15 +5,12 @@
 using Avalonia.Media;
 using Avalonia.Media.Text;
 using Avalonia.Media.Text.Unicode;
-using Avalonia.Platform;
 using HarfBuzzSharp;
 
 namespace Avalonia.Skia
 {
     internal static class TextRunIterator
     {
-        private static readonly IFontManager s_fontManager = AvaloniaLocator.Current.GetService<IFontManager>();
-
         /// <summary>
         ///     Creates a list of text runs with unique properties.
         /// </summary>
@@ -35,7 +32,7 @@ public static List<TextRunProperties> Create(ReadOnlySlice<char> text, Typeface
 
                     //ToDo: Fix FontFamily fallback
                     currentTypeface =
-                        s_fontManager.MatchCharacter(codepoint, defaultTypeface.Weight, defaultTypeface.Style);
+                        FontManager.Default.MatchCharacter(codepoint, defaultTypeface.Weight, defaultTypeface.Style);
 
                     if (currentTypeface == null || !TryGetRunProperties(text, currentTypeface, defaultTypeface, out count))
                     {

diff --git a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
@@ -9,6 +9,7 @@
 using Avalonia.Controls.Platform.Surfaces;
 using Avalonia.Direct2D1.Media;
 using Avalonia.Direct2D1.Media.Imaging;
+using Avalonia.Media;
 using Avalonia.Platform;
 using SharpDX.DirectWrite;
 using GlyphRun = Avalonia.Media.GlyphRun;
@@ -31,6 +32,7 @@ public class Direct2D1Platform : IPlatformRenderInterface
     {
         private readonly ConcurrentDictionary<Typeface, GlyphTypefaceImpl> _glyphTypefaceCache =
             new ConcurrentDictionary<Typeface, GlyphTypefaceImpl>();
+
         private static readonly Direct2D1Platform s_instance = new Direct2D1Platform();
 
         public static SharpDX.Direct3D11.Device Direct3D11Device { get; private set; }
@@ -177,6 +179,11 @@ public IBitmapImpl LoadBitmap(PixelFormat format, IntPtr data, PixelSize size, V
             return new WicBitmapImpl(format, data, size, dpi, stride);
         }
 
+        public IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface)
+        {
+            return _glyphTypefaceCache.GetOrAdd(typeface, new GlyphTypefaceImpl(typeface));
+        }
+
         public IGlyphRunImpl CreateGlyphRun(GlyphRun glyphRun, out double width)
         {
             var glyphTypeface = (GlyphTypefaceImpl)glyphRun.GlyphTypeface.PlatformImpl;