Merge branch 'glyphstore-characterglyph' into spritetext-textbuilder

osu.Framework.Tests/IO/FontStoreTest.cs

···
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.IO.Stores;
+using osu.Framework.Text;
 
 namespace osu.Framework.Tests.IO
 {
···
 
             fontStore.AddStore(nestedFontStore);
 
-            var normalGlyph = (FontStore.TexturedCharacterGlyph)fontStore.Get("OpenSans", 'a');
-            var boldGlyph = (FontStore.TexturedCharacterGlyph)fontStore.Get("OpenSans-Bold", 'a');
+            var normalGlyph = (TexturedCharacterGlyph)fontStore.Get("OpenSans", 'a');
+            var boldGlyph = (TexturedCharacterGlyph)fontStore.Get("OpenSans-Bold", 'a');
 
-            Assert.That(normalGlyph.ScaleAdjustment, Is.EqualTo(1f / 100));
-            Assert.That(boldGlyph.ScaleAdjustment, Is.EqualTo(1f / 10));
+            Assert.That(normalGlyph.Scale, Is.EqualTo(1f / 100));
+            Assert.That(boldGlyph.Scale, Is.EqualTo(1f / 10));
         }
 
         [OneTimeTearDown]

osu.Framework/Graphics/Sprites/SpriteIcon.cs

···
 
             if (Equals(loadableIcon, loadedIcon)) return;
 
-            var texture = store.Get(loadableIcon.FontName, Icon.Icon).Texture;
+            var glyph = store.Get(loadableIcon.FontName, Icon.Icon);
 
-            spriteMain.Texture = texture;
-            spriteShadow.Texture = texture;
+            if (glyph != null)
+            {
+                spriteMain.Texture = glyph.Texture;
+                spriteShadow.Texture = glyph.Texture;
 
-            if (Size == Vector2.Zero)
-                Size = new Vector2(texture?.DisplayWidth ?? 0, texture?.DisplayHeight ?? 0);
+                if (Size == Vector2.Zero)
+                    Size = new Vector2(glyph.Width, glyph.Height);
+            }
 
             loadedIcon = loadableIcon;
         }

osu.Framework/IO/Stores/FontStore.cs

···
 using System.Threading.Tasks;
 using osu.Framework.Logging;
 using System.Collections.Concurrent;
-using System.Runtime.CompilerServices;
 using osu.Framework.Platform;
 using osu.Framework.Text;
 
···
         {
             base.Dispose(disposing);
             glyphStores.ForEach(g => g.Dispose());
-        }
-
-        internal sealed class TexturedCharacterGlyph : ITexturedCharacterGlyph
-        {
-            public Texture Texture { get; }
-
-            public float XOffset => glyph.XOffset * ScaleAdjustment;
-            public float YOffset => glyph.YOffset * ScaleAdjustment;
-            public float XAdvance => glyph.XAdvance * ScaleAdjustment;
-            public char Character => glyph.Character;
-            public float Width => Texture.Width * ScaleAdjustment;
-            public float Height => Texture.Height * ScaleAdjustment;
-
-            public readonly float ScaleAdjustment;
-            private readonly CharacterGlyph glyph;
-
-            public TexturedCharacterGlyph(CharacterGlyph glyph, Texture texture, float scaleAdjustment)
-            {
-                this.glyph = glyph;
-                this.ScaleAdjustment = scaleAdjustment;
-
-                Texture = texture;
-            }
-
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public float GetKerning<T>(T lastGlyph)
-                where T : ICharacterGlyph
-                => glyph.GetKerning(lastGlyph) * ScaleAdjustment;
         }
     }
 }

osu.Framework/Text/TexturedCharacterGlyph.cs

···
+// Copyright (c) ppy Pty Ltd <[e-mail]>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Runtime.CompilerServices;
+using osu.Framework.Graphics.Textures;
+
+namespace osu.Framework.Text
+{
+    public sealed class TexturedCharacterGlyph : ITexturedCharacterGlyph
+    {
+        public Texture Texture { get; }
+
+        public float XOffset => glyph.XOffset * Scale;
+        public float YOffset => glyph.YOffset * Scale;
+        public float XAdvance => glyph.XAdvance * Scale;
+        public char Character => glyph.Character;
+        public float Width => Texture.Width * Scale;
+        public float Height => Texture.Height * Scale;
+
+        /// <summary>
+        /// An adjustment factor in scale. This is applied to all other returned metric properties.
+        /// </summary>
+        public readonly float Scale;
+
+        private readonly CharacterGlyph glyph;
+
+        /// <summary>
+        /// Create a new <see cref="TexturedCharacterGlyph"/> instance.
+        /// </summary>
+        /// <param name="glyph">The glyph.</param>
+        /// <param name="texture">The texture.</param>
+        /// <param name="scale">A scale factor to apply to exposed glyph metrics.</param>
+        public TexturedCharacterGlyph(CharacterGlyph glyph, Texture texture, float scale = 1)
+        {
+            this.glyph = glyph;
+            Scale = scale;
+            Texture = texture;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public float GetKerning<T>(T lastGlyph)
+            where T : ICharacterGlyph
+            => glyph.GetKerning(lastGlyph) * Scale;
+    }
+}