From bf9bbb039ee3e4cf4ad37f7fcece43ce467cc59f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Thu, 16 Jul 2020 23:41:29 +0100
Subject: [PATCH] Updated Avalonia to 0.10.0-preview1.

---
 CSharpMath.Avalonia.Example/App.xaml          |  4 +-
 .../CSharpMath.Avalonia.Example.csproj        | 15 +---
 CSharpMath.Avalonia.Example/MainView.xaml     | 57 ++++++-------
 CSharpMath.Avalonia.Example/MainView.xaml.cs  | 11 ++-
 CSharpMath.Avalonia.Example/SideBar.xaml      | 84 -------------------
 .../CSharpMath.Avalonia.csproj                |  2 +-
 .../CSharpMath.Rendering.Tests.csproj         |  2 +-
 CSharpMath.Xaml/Views.cs                      |  6 +-
 8 files changed, 40 insertions(+), 141 deletions(-)
 delete mode 100644 CSharpMath.Avalonia.Example/SideBar.xaml

diff --git a/CSharpMath.Avalonia.Example/App.xaml b/CSharpMath.Avalonia.Example/App.xaml
index da74be9e..291e7c7a 100644
--- 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
index c07fd7f9..231aabdc 100644
--- 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>
\ No newline at end of file
diff --git a/CSharpMath.Avalonia.Example/MainView.xaml b/CSharpMath.Avalonia.Example/MainView.xaml
index 84a0795e..400e86f6 100644
--- a/CSharpMath.Avalonia.Example/MainView.xaml
+++ b/CSharpMath.Avalonia.Example/MainView.xaml
@@ -6,35 +6,32 @@
              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>
+    <DockPanel>
+
+
+        <ComboBox x:Name="Themes"
+                  DockPanel.Dock="Bottom"
+                  HorizontalAlignment="Right"
+                  SelectedIndex="0"
+                  Width="100"
+                  Margin="8">
+            <ComboBoxItem>Light</ComboBoxItem>
+            <ComboBoxItem>Dark</ComboBoxItem>
+        </ComboBox>
+
+        <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
index e36f75e9..c7bbdfbc 100644
--- 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,19 @@ 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 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<ComboBox>("Themes");
       themes.SelectionChanged += (sender, e) => {
         switch (themes.SelectedIndex) {
           case 0:
-            Styles[0] = light;
+            Application.Current.Styles[0] = light;
             break;
           case 1:
-            Styles[0] = dark;
+            Application.Current.Styles[0] = dark;
             break;
         }
       };
-
-      Styles.Add(light);
     }
 
     private void InitializeComponent() {
diff --git a/CSharpMath.Avalonia.Example/SideBar.xaml b/CSharpMath.Avalonia.Example/SideBar.xaml
deleted file mode 100644
index 8592bf16..00000000
--- a/CSharpMath.Avalonia.Example/SideBar.xaml
+++ /dev/null
@@ -1,84 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.PreviewWith>
-        <Border Padding="20">
-            <TabControl Classes="sidebar">
-                <TabControl.Tag>
-                    <TextBlock>Tag</TextBlock>
-                </TabControl.Tag>
-                <TabItem Header="Item1" Content="Content1" />
-                <TabItem Header="Item2" Content="Content2" />
-            </TabControl> 
-        </Border>
-    </Design.PreviewWith>
-    <Style Selector="TabControl.sidebar">
-        <Setter Property="TabStripPlacement" Value="Left"/>
-        <Setter Property="Padding" Value="8 0 0 0"/>
-        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush}"/>
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Border 
-                    Margin="{TemplateBinding Margin}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}">
-                    <DockPanel>
-                        <ScrollViewer
-                            Name="PART_ScrollViewer"
-                            HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
-                            VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
-                            Background="{TemplateBinding Background}"
-                            DockPanel.Dock="Left">
-                            <ItemsPresenter
-                                Name="PART_ItemsPresenter"                          
-                                Items="{TemplateBinding Items}"
-                                ItemsPanel="{TemplateBinding ItemsPanel}"
-                                ItemTemplate="{TemplateBinding ItemTemplate}">
-                            </ItemsPresenter>
-                        </ScrollViewer>
-                        <ContentControl Content="{TemplateBinding Tag}" HorizontalContentAlignment="Right" DockPanel.Dock="Bottom"/>
-                        <ScrollViewer
-                            HorizontalScrollBarVisibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedItem.(ScrollViewer.HorizontalScrollBarVisibility)}"
-                            VerticalScrollBarVisibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedItem.(ScrollViewer.VerticalScrollBarVisibility)}">
-                            <ContentPresenter
-                                    Name="PART_SelectedContentHost"
-                                    Margin="{TemplateBinding Padding}"                           
-                                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    Content="{TemplateBinding SelectedContent}"
-                                    ContentTemplate="{TemplateBinding SelectedContentTemplate}">
-                            </ContentPresenter>
-                        </ScrollViewer>
-                    </DockPanel>
-                </Border>
-            </ControlTemplate>
-        </Setter>
-    </Style>
-
-    <Style Selector="TabControl.sidebar > TabItem">       
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="Foreground" Value="White"/>
-        <Setter Property="FontSize" Value="14"/>
-        <Setter Property="Margin" Value="0"/>
-        <Setter Property="Padding" Value="16"/>
-        <Setter Property="Opacity" Value="0.5"/>
-        <Setter Property="Transitions">
-            <Transitions>
-                <DoubleTransition Property="Opacity" Duration="0:0:0.150"/>
-            </Transitions>
-        </Setter>
-        <Setter Property="(ScrollViewer.HorizontalScrollBarVisibility)" Value="Auto"/>
-        <Setter Property="(ScrollViewer.VerticalScrollBarVisibility)" Value="Auto"/>
-    </Style>
-    <Style Selector="TabControl.sidebar > TabItem:pointerover">
-        <Setter Property="Opacity" Value="1"/>
-    </Style>
-    <Style Selector="TabControl.sidebar > TabItem:pointerover">
-        <Setter Property="Background" Value="Transparent"/>
-    </Style>
-    <Style Selector="TabControl.sidebar > TabItem:selected">
-        <Setter Property="Opacity" Value="1"/>
-    </Style>
-    <Style Selector="TabControl.sidebar > TabItem:selected">
-        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/>
-    </Style>
-</Styles>
\ No newline at end of file
diff --git a/CSharpMath.Avalonia/CSharpMath.Avalonia.csproj b/CSharpMath.Avalonia/CSharpMath.Avalonia.csproj
index d1d500d3..f972c905 100644
--- 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
index ffd0db32..94db3561 100644
--- 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.Xaml/Views.cs b/CSharpMath.Xaml/Views.cs
index 152fd3b3..60af8cbc 100644
--- a/CSharpMath.Xaml/Views.cs
+++ b/CSharpMath.Xaml/Views.cs
@@ -54,10 +54,10 @@ 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")),
+          new global::Avalonia.Styling.Setter(FontSizeProperty, 14.0f)
         }
       });
     }