Updated Avalonia to 0.10.0-preview1 (#146)

* Updated Avalonia to 0.10.0-preview1. * Update default font size * replace ComboBox with RadioButtons to avoid crash * change VerticalContentAlignment Co-authored-by: Hadrian Tang <[email protected]> Co-authored-by: FoggyFinder <[email protected]>
verybadcat · Jul 19, 2020 · d835e93 · d835e93
1 parent f75643d
commit d835e93
Show file tree

Hide file tree

Showing 11 changed files with 69 additions and 165 deletions.
diff --git a/CSharpMath.Avalonia.Example/App.xaml b/CSharpMath.Avalonia.Example/App.xaml
@@ -4,10 +4,8 @@
 
     <Application.Styles>
 
-        <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
-        <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
+        <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentLight.xaml"/>
 
-        <StyleInclude Source="/SideBar.xaml"/>
         <StyleInclude Source="/Styles.xaml"/>
 
     </Application.Styles>

diff --git a/CSharpMath.Avalonia.Example/CSharpMath.Avalonia.Example.csproj b/CSharpMath.Avalonia.Example/CSharpMath.Avalonia.Example.csproj
@@ -9,20 +9,9 @@
     <Compile Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
     <AvaloniaResource Include="**\*.xaml" />
     <EmbeddedResource Include="..\Icon.png" Link="Icon.png" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.9.6" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview1" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-preview1" />
     <ProjectReference Include="..\CSharpMath.Avalonia\CSharpMath.Avalonia.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Pages\MathButtonPage.xaml.cs">
-      <DependentUpon>MathButtonPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\MathViewPage.xaml.cs">
-      <DependentUpon>MathViewPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\TextViewPage.xaml.cs">
-      <DependentUpon>TextViewPage.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
 </Project>
diff --git a/CSharpMath.Avalonia.Example/MainView.xaml b/CSharpMath.Avalonia.Example/MainView.xaml
@@ -1,40 +1,44 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:pages="clr-namespace:CSharpMath.Avalonia.Example.Pages"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="CSharpMath.Avalonia.Example.MainView"
-             Background="{DynamicResource ThemeBackgroundBrush}"
-             Foreground="{DynamicResource ThemeForegroundBrush}"
-             FontSize="{DynamicResource FontSizeNormal}">
-
-      <TabControl x:Name="Sidebar"
-                  Classes="sidebar">
-
-          <TabControl.Tag>
-
-              <ComboBox x:Name="Themes"
-                        DockPanel.Dock="Bottom"
-                        SelectedIndex="0"
-                        Width="100"
-                        Margin="8">
-
-                  <ComboBoxItem>Light</ComboBoxItem>
-                  <ComboBoxItem>Dark</ComboBoxItem>
-
-              </ComboBox>
-
-          </TabControl.Tag>
-
-          <TabItem Header="MathView">
-              <pages:MathViewPage/>
-          </TabItem>
-
-          <TabItem Header="TextView">
-              <pages:TextViewPage/>
-          </TabItem>
-          <TabItem Header="MathButton">
-              <pages:MathButtonPage/>
-          </TabItem>
-
-      </TabControl>
+<UserControl
+    x:Class="CSharpMath.Avalonia.Example.MainView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:pages="clr-namespace:CSharpMath.Avalonia.Example.Pages"
+    Background="{DynamicResource ThemeBackgroundBrush}"
+    FontSize="{DynamicResource FontSizeNormal}"
+    Foreground="{DynamicResource ThemeForegroundBrush}">
+
+    <DockPanel>
+
+        <StackPanel
+            HorizontalAlignment="Right"
+            DockPanel.Dock="Bottom"
+            Orientation="Horizontal">
+            <RadioButton
+                x:Name="lightThemeRbn"
+                Margin="2,8"
+                Padding="8,0"
+                VerticalContentAlignment="Center"
+                Content="Light"
+                IsChecked="true" />
+            <RadioButton
+                Margin="2,8"
+                Padding="8,0"
+                VerticalContentAlignment="Center"
+                Content="Dark" />
+        </StackPanel>
+
+        <TabControl x:Name="Sidebar" Padding="16">
+            <TabItem Header="MathView">
+                <pages:MathViewPage />
+            </TabItem>
+            <TabItem Header="TextView">
+                <pages:TextViewPage />
+            </TabItem>
+            <TabItem Header="MathButton">
+                <pages:MathButtonPage />
+            </TabItem>
+        </TabControl>
+
+    </DockPanel>
 
 </UserControl>
diff --git a/CSharpMath.Avalonia.Example/MainView.xaml.cs b/CSharpMath.Avalonia.Example/MainView.xaml.cs
@@ -1,3 +1,4 @@
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Avalonia.Markup.Xaml.Styling;
@@ -7,21 +8,11 @@ public class MainView : UserControl {
     public MainView() {
       InitializeComponent();
 
-      var light = AvaloniaXamlLoader.Parse<StyleInclude>(@"<StyleInclude xmlns='https://github.com/avaloniaui' Source='avares://Avalonia.Themes.Default/Accents/BaseLight.xaml'/>");
-      var dark = AvaloniaXamlLoader.Parse<StyleInclude>(@"<StyleInclude xmlns='https://github.com/avaloniaui' Source='avares://Avalonia.Themes.Default/Accents/BaseDark.xaml'/>");
-      var themes = this.Find<ComboBox>("Themes");
-      themes.SelectionChanged += (sender, e) => {
-        switch (themes.SelectedIndex) {
-          case 0:
-            Styles[0] = light;
-            break;
-          case 1:
-            Styles[0] = dark;
-            break;
-        }
-      };
-
-      Styles.Add(light);
+      var light = AvaloniaXamlLoader.Parse<StyleInclude>(@"<StyleInclude xmlns='https://github.com/avaloniaui' Source='avares://Avalonia.Themes.Fluent/Accents/FluentLight.xaml'/>");
+      var dark = AvaloniaXamlLoader.Parse<StyleInclude>(@"<StyleInclude xmlns='https://github.com/avaloniaui' Source='avares://Avalonia.Themes.Fluent/Accents/FluentDark.xaml'/>");
+      var themes = this.Find<RadioButton>("lightThemeRbn");
+      themes.Checked += (sender, e) => Application.Current.Styles[0] = light;
+      themes.Unchecked += (sender, e) => Application.Current.Styles[0] = dark;
     }
 
     private void InitializeComponent() {

diff --git a/CSharpMath.Avalonia.Example/SideBar.xaml b/CSharpMath.Avalonia.Example/SideBar.xaml
diff --git a/CSharpMath.Avalonia/CSharpMath.Avalonia.csproj b/CSharpMath.Avalonia/CSharpMath.Avalonia.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <Compile Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
     <AvaloniaResource Include="**\*.xaml" />
-    <PackageReference Include="Avalonia" Version="0.9.6" />
+    <PackageReference Include="Avalonia" Version="0.10.0-preview1" />
     <ProjectReference Include="..\CSharpMath.Rendering\CSharpMath.Rendering.csproj" />
   </ItemGroup>
 

diff --git a/CSharpMath.Rendering.Tests/CSharpMath.Rendering.Tests.csproj b/CSharpMath.Rendering.Tests/CSharpMath.Rendering.Tests.csproj
@@ -8,7 +8,7 @@
     <Compile Include="..\CSharpMath.CoreTests\_Helpers\ApproximateAssertions.cs" Link="ApproximateAssertions.cs" />
     <ProjectReference Include="..\CSharpMath.Avalonia\CSharpMath.Avalonia.csproj" />
     <ProjectReference Include="..\CSharpMath.SkiaSharp\CSharpMath.SkiaSharp.csproj" />
-    <PackageReference Include="Avalonia.Skia" Version="0.9.4" />
+    <PackageReference Include="Avalonia.Skia" Version="0.10.0-preview1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.8" />

diff --git a/CSharpMath.Rendering.Tests/TestRendering.cs b/CSharpMath.Rendering.Tests/TestRendering.cs
@@ -135,6 +135,10 @@ protected void Run<TContent>(
 
       // Prevent black background behind black rendered output in File Explorer preview
       painter.HighlightColor = painter.UnwrapColor(System.Drawing.Color.FromArgb(0xF0, 0xF0, 0xF0));
+      if (painter.FontSize is PainterConstants.DefaultFontSize)
+        // We want a large and clear output so we increase the font size
+        // If we really want to test PainterConstants.DefaultFontSize = 14, choose e.g. 14.001 instead
+        painter.FontSize = 50;
       painter.LaTeX = latex;
 
       var actualFile = new FileInfo(System.IO.Path.Combine(folder, inFile + "." + frontEnd + ".png"));

diff --git a/CSharpMath.Rendering/FrontEnd/Painter.cs b/CSharpMath.Rendering/FrontEnd/Painter.cs
@@ -13,7 +13,7 @@ namespace CSharpMath.Rendering.FrontEnd {
   using BackEnd;
 
   public static class PainterConstants {
-    public const float DefaultFontSize = 50f;
+    public const float DefaultFontSize = 14;
   }
   public abstract class Painter<TCanvas, TContent, TColor> : ICSharpMathAPI<TContent, TColor> where TContent : class {
     public const float DefaultFontSize = PainterConstants.DefaultFontSize;

diff --git a/CSharpMath.Xaml.Tests.NuGet/Test.cs b/CSharpMath.Xaml.Tests.NuGet/Test.cs
@@ -1,4 +1,4 @@
-namespace CSharpMath.Xaml.Tests.NuGet {
+namespace CSharpMath.Xaml.Tests.NuGet {
   using Avalonia;
   using SkiaSharp;
   using Forms;
@@ -11,9 +11,9 @@ public void TestImage() {
       Xamarin.Forms.Device.PlatformServices = new Xamarin.Forms.Core.UnitTests.MockPlatformServices();
 
       using (var forms = System.IO.File.OpenWrite(File(nameof(Forms))))
-        new Forms.MathView { LaTeX = "1" }.Painter.DrawAsStream()?.CopyTo(forms);
+        new Forms.MathView { LaTeX = "1", FontSize = 50 }.Painter.DrawAsStream()?.CopyTo(forms);
       using (var avalonia = System.IO.File.OpenWrite(File(nameof(Avalonia))))
-        new Avalonia.MathView { LaTeX = "1" }.Painter.DrawAsPng(avalonia);
+        new Avalonia.MathView { LaTeX = "1", FontSize = 50 }.Painter.DrawAsPng(avalonia);
 
       using (var forms = System.IO.File.OpenRead(File(nameof(Forms))))
         Xunit.Assert.Contains(forms.Length, new[] { 344L, 797 }); // 797 on Mac, 344 on Ubuntu

diff --git a/CSharpMath.Xaml/Views.cs b/CSharpMath.Xaml/Views.cs
@@ -39,9 +39,12 @@ public static XProperty CreateProperty<TThis, TValue>(
       Action<TThis, TValue>? updateOtherProperty = null)
       where TThis : BaseView<TPainter, TContent> {
       var defaultValue = defaultValueGet(staticPainter);
-      void PropertyChanged(TThis @this, object newValue) {
-        propertySet(@this.Painter, (TValue)newValue);
-        updateOtherProperty?.Invoke(@this, (TValue)newValue);
+      void PropertyChanged(TThis @this, object? newValue) {
+        // We need to support nullable classes and structs, so we cannot forbid null here
+        // So this use of the null-forgiving operator should be blamed on non-generic PropertyChanged handlers
+        var @new = (TValue)newValue!;
+        propertySet(@this.Painter, @new);
+        updateOtherProperty?.Invoke(@this, @new);
         if (affectsMeasure) @this.InvalidateMeasure();
         // Redraw immediately! No deferred drawing
 #if Avalonia
@@ -54,10 +57,9 @@ void PropertyChanged(TThis @this, object newValue) {
     public BaseView() {
       // Respect built-in styles
       Styles.Add(new global::Avalonia.Styling.Style(global::Avalonia.Styling.Selectors.Is<BaseView<TPainter, TContent>>) {
-        Setters = new[]
+        Setters =
         {
-          new global::Avalonia.Styling.Setter(TextColorProperty, new global::Avalonia.Markup.Xaml.MarkupExtensions.DynamicResourceExtension("ThemeForegroundColor")),
-          new global::Avalonia.Styling.Setter(FontSizeProperty, new global::Avalonia.Markup.Xaml.MarkupExtensions.DynamicResourceExtension("FontSizeNormal"))
+          new global::Avalonia.Styling.Setter(TextColorProperty, new global::Avalonia.Markup.Xaml.MarkupExtensions.DynamicResourceExtension("SystemBaseHighColor"))
         }
       });
     }