Align text center and right correctly (#126)

* Implemented center and right align correctly

* Update ReadMe as well

* -PositiveInfinity -> NegativeInfinity

* Update ReadMe as well 2

* Fix master tests

* Take duplicate code into a variable

Author: Happypig375

CSharpMath.Avalonia/Extensions.cs

@@ -33,25 +33,28 @@ public static SolidColorBrush ToSolidColorBrush(this CSharpMathColor color) =>
     class DrawVisual<TContent> : Visual where TContent : class {
       readonly Painter<AvaloniaCanvas, TContent, AvaloniaColor> painter;
       readonly System.Drawing.RectangleF measure;
+      readonly CSharpMathTextAlignment alignment;
       public DrawVisual(Painter<AvaloniaCanvas, TContent, AvaloniaColor> painter,
-        System.Drawing.RectangleF measure) {
+        System.Drawing.RectangleF measure, CSharpMathTextAlignment alignment) {
         this.painter = painter;
         this.measure = measure;
+        this.alignment = alignment;
       }
       public override void Render(DrawingContext context) {
         base.Render(context);
         var canvas = new AvaloniaCanvas(context, new Size(measure.Width, measure.Height));
-        painter.Draw(canvas, CSharpMathTextAlignment.TopLeft);
+        painter.Draw(canvas, alignment);
       }
     }
     public static void DrawAsPng<TContent>
       (this Painter<AvaloniaCanvas, TContent, AvaloniaColor> painter,
        System.IO.Stream target,
-       float textPainterCanvasWidth = TextPainter.DefaultCanvasWidth) where TContent : class {
+       float textPainterCanvasWidth = TextPainter.DefaultCanvasWidth,
+       CSharpMathTextAlignment alignment = CSharpMathTextAlignment.TopLeft) where TContent : class {
       if (!(painter.Measure(textPainterCanvasWidth) is { } size)) return;
       using var bitmap =
         new RenderTargetBitmap(new PixelSize((int)size.Width, (int)size.Height));
-      bitmap.Render(new DrawVisual<TContent>(painter, size));
+      bitmap.Render(new DrawVisual<TContent>(painter, size, alignment));
       bitmap.Save(target);
     }
   }

CSharpMath.Forms.Example/CSharpMath.Forms.Example/App.xaml.cs

@@ -5,8 +5,10 @@
 [assembly: XamlCompilation(XamlCompilationOptions.Compile)]
 namespace CSharpMath.Forms.Example {
   public partial class App : Application {
-    public static ObservableCollection<MathView> AllViews =
+    public static ObservableCollection<MathView> AllMathViews =
       new ObservableCollection<MathView>();
+    public static ObservableCollection<TextView> AllTextViews =
+      new ObservableCollection<TextView>();
     public App() => InitializeComponent();
     int index = -1;
     void Handle_ChildAdded(object sender, ElementEventArgs e) {

CSharpMath.Forms.Example/CSharpMath.Forms.Example/ExamplesPage.xaml

@@ -9,6 +9,6 @@
             <Label Text="Pan to view more!" HorizontalOptions="FillAndExpand"/>
             <Button Text="Reset pan" Clicked="Button_Clicked" HorizontalOptions="End"/>
         </StackLayout>
-        <math:MathView x:Name="View" EnableTouchEvents="true"/>
+        <math:MathView x:Name="View" EnableTouchEvents="true" EnablePanning="true"/>
     </StackLayout>
 </ContentPage>

CSharpMath.Forms.Example/CSharpMath.Forms.Example/ExamplesPage.xaml.cs

@@ -10,7 +10,7 @@ namespace CSharpMath.Forms.Example {
   public partial class ExamplesPage : ContentPage {
     public ExamplesPage() {
       InitializeComponent();
-      App.AllViews.Add(View);
+      App.AllMathViews.Add(View);
       View.FontSize = 30;
       View.LaTeX = latex;
     }

CSharpMath.Forms.Example/CSharpMath.Forms.Example/SelectPage.xaml.cs

@@ -9,7 +9,7 @@ namespace CSharpMath.Forms.Example {
   public partial class SelectPage : ContentPage {
     public SelectPage() {
       InitializeComponent();
-      App.AllViews.Add(View);
+      App.AllMathViews.Add(View);
       Size.ItemsSource = TryPage.FontSizes;
       Size.SelectedIndexChanged += (sender, e) =>
         View.FontSize = (float)Size.SelectedItem;

CSharpMath.Forms.Example/CSharpMath.Forms.Example/SettingsPage.xaml.cs

@@ -6,6 +6,8 @@
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 using CSharpMath.Rendering.FrontEnd;
+using System.Globalization;
+using System.Net;
 
 namespace CSharpMath.Forms.Example {
   [XamlCompilation(XamlCompilationOptions.Compile)]
@@ -16,7 +18,7 @@ public SettingsPage() {
       var values = typeof(Rendering.FrontEnd.TextAlignment).GetEnumValues();
       Array.Reverse(values);
       Alignment.ItemsSource = values;
-      Alignment.SelectedItem = Rendering.FrontEnd.TextAlignment.Center;
+      Alignment.SelectedItem = Rendering.FrontEnd.TextAlignment.Top;
 
       values = typeof(PaintStyle).GetEnumValues();
       PaintStyle.ItemsSource = values;
@@ -31,15 +33,18 @@ public SettingsPage() {
       HighlightColor_Completed(this, EventArgs.Empty);
       BackColor_Completed(this, EventArgs.Empty);
 
-      App.AllViews.CollectionChanged += CollectionChanged;
-      CollectionChanged(this, new Args(Action.Add, App.AllViews));
+      App.AllMathViews.CollectionChanged += CollectionChanged<SkiaSharp.MathPainter, Atom.MathList>;
+      CollectionChanged<SkiaSharp.MathPainter, Atom.MathList>(this, new Args(Action.Add, App.AllMathViews));
+      App.AllTextViews.CollectionChanged += CollectionChanged<SkiaSharp.TextPainter, Rendering.Text.TextAtom>;
+      CollectionChanged<SkiaSharp.TextPainter, Rendering.Text.TextAtom>(this, new Args(Action.Add, App.AllTextViews));
     }
 
     Color Parse(string color) => global::SkiaSharp.Views.Forms.Extensions.ToFormsColor
         (global::SkiaSharp.SKColor.TryParse(color, out var c) ? c : global::SkiaSharp.SKColors.Black);
 
-    private void CollectionChanged(object sender, Args e) {
-      if (e.NewItems != null) foreach (var v in e.NewItems.Cast<MathView>()) {
+    private void CollectionChanged<TPainter, TContent>(object sender, Args e)
+      where TPainter : Painter<global::SkiaSharp.SKCanvas, TContent, global::SkiaSharp.SKColor>, new() where TContent : class {
+      if (e.NewItems != null) foreach (var v in e.NewItems.Cast<BaseView<TPainter, TContent>>()) {
           v.GlyphBoxColor = DrawGlyphBoxes.On ? (Parse(GlyphBoxColor.Text), Parse(GlyphRunColor.Text)) : default((Color glyph, Color textRun)?);
           v.TextAlignment = (Rendering.FrontEnd.TextAlignment)Alignment.SelectedItem;
           v.TextColor = TextColor.LabelColor;
@@ -51,43 +56,63 @@ private void CollectionChanged(object sender, Args e) {
     }
 
     private void Alignment_SelectedIndexChanged(object sender, EventArgs e) {
-      foreach (var v in App.AllViews) {
+      foreach (var v in App.AllMathViews) {
+        v.TextAlignment = (Rendering.FrontEnd.TextAlignment)Alignment.SelectedItem;
+      }
+      foreach (var v in App.AllTextViews) {
         v.TextAlignment = (Rendering.FrontEnd.TextAlignment)Alignment.SelectedItem;
       }
     }
 
     private void TextColor_Completed(object sender, EventArgs e) {
       TextColor.LabelColor = Parse(TextColor.Text);
-      foreach (var v in App.AllViews) {
+      foreach (var v in App.AllMathViews) {
+        v.TextColor = TextColor.LabelColor;
+      }
+      foreach (var v in App.AllTextViews) {
         v.TextColor = TextColor.LabelColor;
       }
     }
 
     private void HighlightColor_Completed(object sender, EventArgs e) {
       HighlightColor.LabelColor = Parse(HighlightColor.Text);
-      foreach (var v in App.AllViews) {
+      foreach (var v in App.AllMathViews) {
+        v.HighlightColor = HighlightColor.LabelColor;
+      }
+      foreach (var v in App.AllTextViews) {
         v.HighlightColor = HighlightColor.LabelColor;
       }
     }
 
     private void BackColor_Completed(object sender, EventArgs e) {
       BackColor.LabelColor = Parse(BackColor.Text);
-      foreach (var v in App.AllViews) {
+      foreach (var v in App.AllMathViews) {
+        v.BackgroundColor = BackColor.LabelColor;
+      }
+      foreach (var v in App.AllTextViews) {
         v.BackgroundColor = BackColor.LabelColor;
       }
     }
 
     private void GlyphBoxColor_Completed(object sender, EventArgs e) {
       GlyphBoxColor.LabelColor = Parse(GlyphBoxColor.Text);
-      foreach (var v in App.AllViews) if (v.GlyphBoxColor is { } value) {
+      foreach (var v in App.AllMathViews) if (v.GlyphBoxColor is { } value) {
+        value.glyph = Parse(GlyphBoxColor.Text);
+        v.GlyphBoxColor = value;
+      }
+      foreach (var v in App.AllTextViews) if (v.GlyphBoxColor is { } value) {
         value.glyph = Parse(GlyphBoxColor.Text);
         v.GlyphBoxColor = value;
       }
     }
 
     private void GlyphRunColor_Completed(object sender, EventArgs e) {
       GlyphRunColor.LabelColor = Parse(GlyphRunColor.Text);
-      foreach (var v in App.AllViews) if (v.GlyphBoxColor is { } value) {
+      foreach (var v in App.AllMathViews) if (v.GlyphBoxColor is { } value) {
+        value.textRun = Parse(GlyphRunColor.Text);
+        v.GlyphBoxColor = value;
+      }
+      foreach (var v in App.AllTextViews) if (v.GlyphBoxColor is { } value) {
         value.textRun = Parse(GlyphRunColor.Text);
         v.GlyphBoxColor = value;
       }
@@ -98,19 +123,28 @@ private void DrawGlyphBoxes_OnChanged(object sender, ToggledEventArgs e) {
       GlyphRunColor.IsEnabled = e.Value;
       GlyphBoxColor.LabelColor = Parse(GlyphBoxColor.Text);
       GlyphRunColor.LabelColor = Parse(GlyphRunColor.Text);
-      foreach (var v in App.AllViews) {
+      foreach (var v in App.AllMathViews) {
+        v.GlyphBoxColor = e.Value ? (Parse(GlyphBoxColor.Text), Parse(GlyphRunColor.Text)) : default((Color glyph, Color textRun)?);
+      }
+      foreach (var v in App.AllTextViews) {
         v.GlyphBoxColor = e.Value ? (Parse(GlyphBoxColor.Text), Parse(GlyphRunColor.Text)) : default((Color glyph, Color textRun)?);
       }
     }
 
     private void PaintStyle_SelectedIndexChanged(object sender, EventArgs e) {
-      foreach (var v in App.AllViews) {
+      foreach (var v in App.AllMathViews) {
+        v.PaintStyle = (PaintStyle)PaintStyle.SelectedItem;
+      }
+      foreach (var v in App.AllTextViews) {
         v.PaintStyle = (PaintStyle)PaintStyle.SelectedItem;
       }
     }
 
     private void LineStyle_SelectedIndexChanged(object sender, EventArgs e) {
-      foreach (var v in App.AllViews) {
+      foreach (var v in App.AllMathViews) {
+        v.LineStyle = (Atom.LineStyle)LineStyle.SelectedItem;
+      }
+      foreach (var v in App.AllTextViews) {
         v.LineStyle = (Atom.LineStyle)LineStyle.SelectedItem;
       }
     }

CSharpMath.Forms.Example/CSharpMath.Forms.Example/TextPage.xaml.cs

@@ -14,6 +14,7 @@ public partial class TextPage : ContentPage
 	{
     public TextPage() {
       InitializeComponent();
+      App.AllTextViews.Add(View);
       //Text.Text = @"Here are some text. This text is made to be long enough to have the TextPainter of CSharpMath (hopefully) add a line break to this text automatically. To demonstrate the capabilities of the TextPainter, here are some math content: First, a fraction in inline mode: $\frac34$ Next, a summation in inline mode: $\sum_{i=0}^3i^i$ Then, a summation in display mode: $$\sum_{i=0}^3i^i$$ (ah, bugs.) After that, an integral in display mode: $$\int^6_{-56}x\ dx$$ Finally, an escaped dollar sign \$ that represents the start/end of math mode when it is unescaped. Even though colours are currently unsupported, it can be done via math mode with the \\color command with the help of the \\text command. It looks like this: $\color{#F00}{\text{some red text}}$, which is nearly indistinguishable from non-math mode aside from not being able to automatically break up when spaces are inside the coloured text. The SkiaSharp version of this is located at CSharpMath.SkiaSharp.TextPainter; and the Xamarin.Forms version of this is located at CSharpMath.Forms.TextView. Was added in 0.1.0-pre4; working in 0.1.0-pre5.";
       //However, it is also not yet complete as in not being able to SeparateThisReallyLongWordWhichIsSoLongThatItSpansAcrossTheEntirePageAndWontStopEvenWhenPartOfItIsOutOfBounds.
       Size.SelectedItem = View.FontSize;

CSharpMath.Forms.Example/CSharpMath.Forms.Example/TryPage.xaml.cs

@@ -12,7 +12,7 @@ public partial class TryPage : ContentPage {
     };
     public TryPage() {
       InitializeComponent();
-      App.AllViews.Add(View);
+      App.AllMathViews.Add(View);
       Size.SelectedItem = View.FontSize;
       Size.SelectedIndexChanged += (sender, e) =>
         View.FontSize = (float)Size.SelectedItem;