Refactor to use Fonts TextOptions (non-compiling)

Author: JimBobSquarePants

ImageSharp.Drawing.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28902.138
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_root", "_root", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}"
 	ProjectSection(SolutionItems) = preProject
@@ -333,9 +333,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{5286
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrawShapesWithImageSharp", "samples\DrawShapesWithImageSharp\DrawShapesWithImageSharp.csproj", "{5493F024-0A3F-420C-AC2D-05B77A36025B}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SixLabors.Fonts", "..\Fonts\src\SixLabors.Fonts\SixLabors.Fonts.csproj", "{36EAD456-7859-4C52-A745-E8BFBA0BC239}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{2e33181e-6e28-4662-a801-e2e7dc206029}*SharedItemsImports = 5
+		..\Fonts\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{36ead456-7859-4c52-a745-e8bfba0bc239}*SharedItemsImports = 5
 		shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{68a8cc40-6aed-4e96-b524-31b1158fdeea}*SharedItemsImports = 13
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -359,6 +362,10 @@ Global
 		{5493F024-0A3F-420C-AC2D-05B77A36025B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5493F024-0A3F-420C-AC2D-05B77A36025B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5493F024-0A3F-420C-AC2D-05B77A36025B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36EAD456-7859-4C52-A745-E8BFBA0BC239}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36EAD456-7859-4C52-A745-E8BFBA0BC239}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36EAD456-7859-4C52-A745-E8BFBA0BC239}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36EAD456-7859-4C52-A745-E8BFBA0BC239}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

samples/DrawShapesWithImageSharp/Program.cs

@@ -65,8 +65,8 @@ private static void DrawText(string text)
         {
             FontFamily fam = SystemFonts.Get("Arial");
             var font = new Font(fam, 30);
-            var style = new RendererOptions(font, 72);
-            IPathCollection glyphs = TextBuilder.GenerateGlyphs(text, style);
+            TextOptions textOptions = new(font);
+            IPathCollection glyphs = TextBuilder.GenerateGlyphs(text, textOptions);
 
             glyphs.SaveImage("Text", text + ".png");
         }
@@ -75,13 +75,13 @@ private static void DrawText(string text, IPath path)
         {
             FontFamily fam = SystemFonts.Get("Arial");
             var font = new Font(fam, 30);
-            var style = new RendererOptions(font, 72)
+            TextOptions textOptions = new(font)
             {
-                WrappingWidth = path.ComputeLength(),
+                WrappingLength = path.ComputeLength(),
                 VerticalAlignment = VerticalAlignment.Top,
                 HorizontalAlignment = HorizontalAlignment.Center,
             };
-            IPathCollection glyphs = TextBuilder.GenerateGlyphs(text, path, style);
+            IPathCollection glyphs = TextBuilder.GenerateGlyphs(text, path, textOptions);
 
             glyphs.SaveImage("Text-Path", text + ".png");
         }

src/ImageSharp.Drawing/ImageSharp.Drawing.csproj

@@ -20,10 +20,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta15.15" />
+    <!--<PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta15.15" />-->
     <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Fonts\src\SixLabors.Fonts\SixLabors.Fonts.csproj" />
+  </ItemGroup>
+
   <Import Project="..\..\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems" Label="Shared" />
 
 </Project>

src/ImageSharp.Drawing/Processing/DrawingOptions.cs

@@ -12,7 +12,6 @@ public class DrawingOptions
     {
         private GraphicsOptions graphicsOptions;
         private ShapeOptions shapeOptions;
-        private TextOptions textOptions;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DrawingOptions"/> class.
@@ -21,23 +20,19 @@ public DrawingOptions()
         {
             this.graphicsOptions = new GraphicsOptions();
             this.shapeOptions = new ShapeOptions();
-            this.textOptions = new TextOptions();
             this.Transform = Matrix3x2.Identity;
         }
 
         internal DrawingOptions(
             GraphicsOptions graphicsOptions,
             ShapeOptions shapeOptions,
-            TextOptions textOptions,
             Matrix3x2 transform)
         {
             DebugGuard.NotNull(graphicsOptions, nameof(graphicsOptions));
             DebugGuard.NotNull(shapeOptions, nameof(shapeOptions));
-            DebugGuard.NotNull(textOptions, nameof(textOptions));
 
             this.graphicsOptions = graphicsOptions;
             this.shapeOptions = shapeOptions;
-            this.textOptions = textOptions;
             this.Transform = transform;
         }
 
@@ -67,19 +62,6 @@ public ShapeOptions ShapeOptions
             }
         }
 
-        /// <summary>
-        /// Gets or sets the Text Options.
-        /// </summary>
-        public TextOptions TextOptions
-        {
-            get => this.textOptions;
-            set
-            {
-                Guard.NotNull(value, nameof(this.TextOptions));
-                this.textOptions = value;
-            }
-        }
-
         /// <summary>
         /// Gets or sets the Transform to apply during rasterization.
         /// </summary>

src/ImageSharp.Drawing/Processing/DrawingOptionsDefaultsExtensions.cs

@@ -19,7 +19,7 @@ public static class DrawingOptionsDefaultsExtensions
         /// <param name="context">The image processing context to retrieve defaults from.</param>
         /// <returns>The globally configured default options.</returns>
         public static DrawingOptions GetDrawingOptions(this IImageProcessingContext context)
-            => new DrawingOptions(context.GetGraphicsOptions(), context.GetShapeOptions(), context.GetTextOptions(), context.GetDrawingTransform());
+            => new(context.GetGraphicsOptions(), context.GetShapeOptions(), context.GetDrawingTransform());
 
         /// <summary>
         /// Sets the 2D transformation matrix to be used during rasterization when drawing shapes or text.
@@ -39,9 +39,7 @@ public static IImageProcessingContext SetDrawingTransform(this IImageProcessingC
         /// <param name="configuration">The configuration to store default against.</param>
         /// <param name="matrix">The default matrix to use.</param>
         public static void SetDrawingTransform(this Configuration configuration, Matrix3x2 matrix)
-        {
-            configuration.Properties[DrawingTransformMatrixKey] = matrix;
-        }
+            => configuration.Properties[DrawingTransformMatrixKey] = matrix;
 
         /// <summary>
         /// Gets the default 2D transformation matrix to be used during rasterization when drawing shapes or text.
@@ -50,16 +48,14 @@ public static void SetDrawingTransform(this Configuration configuration, Matrix3
         /// <returns>The matrix.</returns>
         public static Matrix3x2 GetDrawingTransform(this IImageProcessingContext context)
         {
-            if (context.Properties.TryGetValue(DrawingTransformMatrixKey, out var options) && options is Matrix3x2 go)
+            if (context.Properties.TryGetValue(DrawingTransformMatrixKey, out object options) && options is Matrix3x2 go)
             {
                 return go;
             }
 
-            Matrix3x2 matrix = context.Configuration.GetDrawingTransform();
-
             // do not cache the fall back to config into the processing context
             // in case someone want to change the value on the config and expects it re-flow thru.
-            return matrix;
+            return context.Configuration.GetDrawingTransform();
         }
 
         /// <summary>
@@ -69,7 +65,7 @@ public static Matrix3x2 GetDrawingTransform(this IImageProcessingContext context
         /// <returns>The globally configured default matrix.</returns>
         public static Matrix3x2 GetDrawingTransform(this Configuration configuration)
         {
-            if (configuration.Properties.TryGetValue(DrawingTransformMatrixKey, out var options) && options is Matrix3x2 go)
+            if (configuration.Properties.TryGetValue(DrawingTransformMatrixKey, out object options) && options is Matrix3x2 go)
             {
                 return go;
             }

src/ImageSharp.Drawing/Processing/Extensions/ClearExtensions.cs

@@ -60,7 +60,7 @@ internal static DrawingOptions CloneForClearOperation(this DrawingOptions drawin
             options.AlphaCompositionMode = PixelFormats.PixelAlphaCompositionMode.Src;
             options.BlendPercentage = 1F;
 
-            return new DrawingOptions(options, drawingOptions.ShapeOptions, drawingOptions.TextOptions, drawingOptions.Transform);
+            return new DrawingOptions(options, drawingOptions.ShapeOptions, drawingOptions.Transform);
         }
     }
 }