Fix issues in Uno specific code

Author: MartinZikmund

CSharpMath.Xaml/Views.cs

@@ -4,6 +4,8 @@
 using CSharpMath.Rendering.FrontEnd;
 using CSharpMath.Structures;
 using Typography.OpenFont;
+using CSharpMathTextAlignment = CSharpMath.Rendering.FrontEnd.TextAlignment;
+using CSharpMathThickness = CSharpMath.Structures.Thickness;
 
 // X stands for Xaml
 #if Avalonia
@@ -198,18 +200,16 @@ protected override Windows.Foundation.Size MeasureOverride(Windows.Foundation.Si
     struct ReadOnlyProperty<TThis, TValue> where TThis : BaseView<TPainter, TContent> {
       public ReadOnlyProperty(string propertyName,
         Func<TPainter, TValue> getter) {
-        Property = XProperty.RegisterDirect<TThis, TValue>(propertyName, b => getter(b.Painter), null, getter(staticPainter));
-        _value = getter(staticPainter);
+        Property = XProperty.Register(propertyName, typeof(TValue), typeof(TThis), new Windows.UI.Xaml.PropertyMetadata(getter(staticPainter)));        
       }
-      TValue _value;
-      public global::Avalonia.DirectProperty<TThis, TValue> Property;
-      public void SetValue(TThis @this, TValue value) => @this.SetAndRaise(Property, ref _value, value);
+      public XProperty Property;
+      public void SetValue(TThis @this, TValue value) => @this.SetValue(Property, value);
     }
     static XCanvasColor XColorToXCanvasColor(XColor color) => new XCanvasColor(color.R, color.G, color.B, color.A);
     static XColor XCanvasColorToXColor(XCanvasColor color) => XColor.FromArgb(color.Alpha, color.Red, color.Green, color.Blue);
     static CSharpMathThickness XThicknessToCSharpMathThickness(XThickness thickness) => new CSharpMathThickness((float)thickness.Left, (float)thickness.Top, (float)thickness.Right, (float)thickness.Bottom);
     static XThickness CSharpMathThicknessToXThickness(CSharpMathThickness thickness) => new XThickness(thickness.Left, thickness.Top, thickness.Right, thickness.Bottom);
-    global::Avalonia.Point _origin;
+    global::Windows.Foundation.Point _origin;
     private void OnPointerPressed(object sender, PointerRoutedEventArgs e) {
       var point = e.GetCurrentPoint(this);
       if (point.Properties.IsLeftButtonPressed && EnablePanning) {
@@ -219,7 +219,7 @@ private void OnPointerPressed(object sender, PointerRoutedEventArgs e) {
     private void OnPointerMoved(object sender, PointerRoutedEventArgs e) {
       var point = e.GetCurrentPoint(this);
       if (point.Properties.IsLeftButtonPressed && EnablePanning) {
-        var displacement = point.Position - _origin;
+        var displacement = new Windows.Foundation.Point(point.Position.X - _origin.X, point.Position.Y - _origin.Y);
         _origin = point.Position;
         DisplacementX += (float)displacement.X;
         DisplacementY += (float)displacement.Y;
@@ -247,7 +247,7 @@ protected override void OnPaintSurface(global::SkiaSharp.Views.UWP.SKPaintSurfac
 
     static readonly System.Reflection.ParameterInfo[] drawMethodParams = typeof(TPainter)
       .GetMethod(nameof(Painter<XCanvas, TContent, XColor>.Draw),
-        new[] { typeof(XCanvas), typeof(TextAlignment), typeof(Thickness), typeof(double), typeof(double) }).GetParameters();
+        new[] { typeof(XCanvas), typeof(CSharpMathTextAlignment), typeof(CSharpMathThickness), typeof(float), typeof(float) }).GetParameters();
     static T? Nullable<T>(T value) where T : struct => new T?(value);
     public (XColor glyph, XColor textRun)? GlyphBoxColor { get => ((XColor glyph, XColor textRun)?)GetValue(GlyphBoxColorProperty); set => SetValue(GlyphBoxColorProperty, value); }
     public static readonly XProperty GlyphBoxColorProperty = CreateProperty<BaseView<TPainter, TContent>, (XColor glyph, XColor textRun)?>(nameof(GlyphBoxColor), false,
@@ -276,14 +276,14 @@ protected override void OnPaintSurface(global::SkiaSharp.Views.UWP.SKPaintSurfac
     public static readonly XProperty HighlightColorProperty = CreateProperty<BaseView<TPainter, TContent>, XColor>(nameof(HighlightColor), false, p => XCanvasColorToXColor(p.HighlightColor), (p, v) => p.HighlightColor = XColorToXCanvasColor(v));
     public XColor ErrorColor { get => (XColor)GetValue(ErrorColorProperty); set => SetValue(ErrorColorProperty, value); }
     public static readonly XProperty ErrorColorProperty = CreateProperty<BaseView<TPainter, TContent>, XColor>(nameof(ErrorColor), false, p => XCanvasColorToXColor(p.ErrorColor), (p, v) => p.ErrorColor = XColorToXCanvasColor(v));
-    public TextAlignment TextAlignment { get => (TextAlignment)GetValue(TextAlignmentProperty); set => SetValue(TextAlignmentProperty, value); }
-    public static readonly XProperty TextAlignmentProperty = CreateProperty<BaseView<TPainter, TContent>, TextAlignment>(nameof(Rendering.FrontEnd.TextAlignment), false, p => (TextAlignment)drawMethodParams[1].DefaultValue, (p, v) => { });
-    public Thickness Padding { get => (Thickness)GetValue(PaddingProperty); set => SetValue(PaddingProperty, value); }
-    public static readonly XProperty PaddingProperty = CreateProperty<BaseView<TPainter, TContent>, Thickness>(nameof(Padding), false, p => (Thickness)(drawMethodParams[2].DefaultValue ?? new Thickness()), (p, v) => { });
+    public CSharpMathTextAlignment TextAlignment { get => (CSharpMathTextAlignment)GetValue(TextAlignmentProperty); set => SetValue(TextAlignmentProperty, value); }
+    public static readonly XProperty TextAlignmentProperty = CreateProperty<BaseView<TPainter, TContent>, CSharpMathTextAlignment>(nameof(Rendering.FrontEnd.TextAlignment), false, p => (CSharpMathTextAlignment)drawMethodParams[1].DefaultValue, (p, v) => { });
+    public CSharpMathThickness Padding { get => (CSharpMathThickness)GetValue(PaddingProperty); set => SetValue(PaddingProperty, value); }
+    public static readonly XProperty PaddingProperty = CreateProperty<BaseView<TPainter, TContent>, CSharpMathThickness>(nameof(Padding), false, p => (CSharpMathThickness)(drawMethodParams[2].DefaultValue ?? new CSharpMathThickness()), (p, v) => { });
     public double DisplacementX { get => (float)GetValue(DisplacementXProperty); set => SetValue(DisplacementXProperty, value); }
-    public static readonly XProperty DisplacementXProperty = CreateProperty<BaseView<TPainter, TContent>, double>(nameof(DisplacementX), false, p => (double)drawMethodParams[3].DefaultValue, (p, v) => { });
+    public static readonly XProperty DisplacementXProperty = CreateProperty<BaseView<TPainter, TContent>, double>(nameof(DisplacementX), false, p => Convert.ToDouble(drawMethodParams[3].DefaultValue), (p, v) => { });
     public double DisplacementY { get => (float)GetValue(DisplacementYProperty); set => SetValue(DisplacementYProperty, value); }
-    public static readonly XProperty DisplacementYProperty = CreateProperty<BaseView<TPainter, TContent>, double>(nameof(DisplacementY), false, p => (double)drawMethodParams[4].DefaultValue, (p, v) => { });
+    public static readonly XProperty DisplacementYProperty = CreateProperty<BaseView<TPainter, TContent>, double>(nameof(DisplacementY), false, p => Convert.ToDouble(drawMethodParams[4].DefaultValue), (p, v) => { });
     public double Magnification { get => (float)GetValue(MagnificationProperty); set => SetValue(MagnificationProperty, value); }
     public static readonly XProperty MagnificationProperty = CreateProperty<BaseView<TPainter, TContent>, double>(nameof(Magnification), false, p => p.Magnification, (p, v) => p.Magnification = (float)v);
     public PaintStyle PaintStyle { get => (PaintStyle)GetValue(PaintStyleProperty); set => SetValue(PaintStyleProperty, value); }
@@ -294,6 +294,6 @@ protected override void OnPaintSurface(global::SkiaSharp.Views.UWP.SKPaintSurfac
     private static readonly ReadOnlyProperty<BaseView<TPainter, TContent>, string?> ErrorMessagePropertyKey = new ReadOnlyProperty<BaseView<TPainter, TContent>, string?>(nameof(ErrorMessage), p => p.ErrorMessage);
     public static readonly XProperty ErrorMessageProperty = ErrorMessagePropertyKey.Property;
   }
-  public class MathView : BaseView<MathPainter, MathList> { }
-  public class TextView : BaseView<TextPainter, Rendering.Text.TextAtom> { }
+  public partial class MathView : BaseView<MathPainter, MathList> { }
+  public partial class TextView : BaseView<TextPainter, Rendering.Text.TextAtom> { }
 }