Update

wieslawsoltes · Mar 22, 2023 · 49ecebd · 49ecebd
1 parent ae3f6ff
commit 49ecebd
Show file tree

Hide file tree

Showing 36 changed files with 54 additions and 166 deletions.
diff --git a/build/Avalonia.Desktop.props b/build/Avalonia.Desktop.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview5" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview6" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.Diagnostics.props b/build/Avalonia.Diagnostics.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.0-preview5" Condition="'$(Configuration)' == 'Debug'" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.0-preview6" Condition="'$(Configuration)' == 'Debug'" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.ReactiveUI.props b/build/Avalonia.ReactiveUI.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview5" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview6" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.Themes.Fluent.props b/build/Avalonia.Themes.Fluent.props
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview5" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview6" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.0-preview6" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.Themes.Simple.props b/build/Avalonia.Themes.Simple.props
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.Themes.Simple" Version="11.0.0-preview5" />
+    <PackageReference Include="Avalonia.Themes.Simple" Version="11.0.0-preview6" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.0-preview6" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.Web.props b/build/Avalonia.Web.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.Browser" Version="11.0.0-preview5" />
+    <PackageReference Include="Avalonia.Browser" Version="11.0.0-preview6" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.props b/build/Avalonia.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.0-preview5" />
+    <PackageReference Include="Avalonia" Version="11.0.0-preview6" />
   </ItemGroup>
 </Project>
diff --git a/build/Base.props b/build/Base.props
@@ -2,7 +2,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VersionPrefix>11.0.0</VersionPrefix>
-    <VersionSuffix>preview5</VersionSuffix>
+    <VersionSuffix>preview6</VersionSuffix>
     <Authors>Wiesław Šoltés</Authors>
     <Company>Wiesław Šoltés</Company>
     <Description>A docking layout system.</Description>

diff --git a/samples/DockMvvmSample/Views/Documents/DocumentView.axaml.cs b/samples/DockMvvmSample/Views/Documents/DocumentView.axaml.cs
@@ -3,15 +3,10 @@
 
 namespace DockMvvmSample.Views.Documents;
 
-public class DocumentView : UserControl
+public partial class DocumentView : UserControl
 {
     public DocumentView()
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
diff --git a/samples/DockMvvmSample/Views/MainView.axaml b/samples/DockMvvmSample/Views/MainView.axaml
@@ -10,7 +10,7 @@
              mc:Ignorable="d"
              d:DesignWidth="1000" d:DesignHeight="550"
              x:DataType="vm:MainWindowViewModel" x:CompileBindings="True"
-             FontFamily="avares://Avalonia.Themes.Fluent/Assets#Inter">
+             FontFamily="avares://Avalonia.Fonts.Inter/Assets#Inter">
   <Design.DataContext>
     <vm:MainWindowViewModel />
   </Design.DataContext>

diff --git a/samples/DockMvvmSample/Views/MainView.axaml.cs b/samples/DockMvvmSample/Views/MainView.axaml.cs
@@ -4,18 +4,14 @@
 
 namespace DockMvvmSample.Views;
 
-public class MainView : UserControl
+public partial class MainView : UserControl
 {
     public MainView()
     {
         InitializeComponent();
         InitializeThemes();
         InitializeMenu();
     }
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 
     private void InitializeThemes()
     {

diff --git a/samples/DockMvvmSample/Views/MainWindow.axaml b/samples/DockMvvmSample/Views/MainWindow.axaml
@@ -8,7 +8,7 @@
         xmlns:views="using:DockMvvmSample.Views"
         mc:Ignorable="d"
         d:DesignWidth="1200" d:DesignHeight="680"
-        x:Name="MainWindow"
+        x:Name="MainWindowView"
         UseLayoutRounding="True" RenderOptions.BitmapInterpolationMode="HighQuality"
         WindowState="Normal" WindowStartupLocation="CenterScreen"
         Background="{x:Null}"
@@ -33,8 +33,8 @@
                                      MaterialOpacity="0.55" />
       </ExperimentalAcrylicBorder.Material>
     </ExperimentalAcrylicBorder>
-    <Panel Margin="{Binding #MainWindow.OffScreenMargin}">
-      <Panel Margin="{Binding #MainWindow.WindowDecorationMargin}">
+    <Panel Margin="{Binding #MainWindowView.OffScreenMargin}">
+      <Panel Margin="{Binding #MainWindowView.WindowDecorationMargin}">
         <views:MainView />
       </Panel>
     </Panel>

diff --git a/samples/DockMvvmSample/Views/MainWindow.axaml.cs b/samples/DockMvvmSample/Views/MainWindow.axaml.cs
@@ -4,7 +4,7 @@
 
 namespace DockMvvmSample.Views;
 
-public class MainWindow : Window
+public partial class MainWindow : Window
 {
     public MainWindow()
     {
@@ -13,9 +13,4 @@ public MainWindow()
         this.AttachDevTools();
 #endif
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
diff --git a/samples/DockMvvmSample/Views/ProportionalStackPanelView.axaml.cs b/samples/DockMvvmSample/Views/ProportionalStackPanelView.axaml.cs
@@ -3,15 +3,10 @@
 
 namespace DockMvvmSample.Views;
 
-public class ProportionalStackPanelView : UserControl
+public partial class ProportionalStackPanelView : UserControl
 {
     public ProportionalStackPanelView()
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
diff --git a/samples/DockMvvmSample/Views/Tools/Tool1View.axaml.cs b/samples/DockMvvmSample/Views/Tools/Tool1View.axaml.cs
@@ -3,15 +3,10 @@
 
 namespace DockMvvmSample.Views.Tools;
 
-public class Tool1View : UserControl
+public partial class Tool1View : UserControl
 {
     public Tool1View()
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
diff --git a/samples/DockMvvmSample/Views/Tools/Tool2View.axaml.cs b/samples/DockMvvmSample/Views/Tools/Tool2View.axaml.cs
@@ -3,15 +3,10 @@
 
 namespace DockMvvmSample.Views.Tools;
 
-public class Tool2View : UserControl
+public partial class Tool2View : UserControl
 {
     public Tool2View()
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
diff --git a/samples/DockMvvmSample/Views/Tools/Tool3View.axaml.cs b/samples/DockMvvmSample/Views/Tools/Tool3View.axaml.cs
@@ -3,15 +3,10 @@
 
 namespace DockMvvmSample.Views.Tools;
 
-public class Tool3View : UserControl
+public partial class Tool3View : UserControl
 {
     public Tool3View()
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
diff --git a/samples/DockMvvmSample/Views/Tools/Tool4View.axaml.cs b/samples/DockMvvmSample/Views/Tools/Tool4View.axaml.cs
@@ -3,15 +3,10 @@
 
 namespace DockMvvmSample.Views.Tools;
 
-public class Tool4View : UserControl
+public partial class Tool4View : UserControl
 {
     public Tool4View()
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
diff --git a/samples/DockMvvmSample/Views/Tools/Tool5View.axaml.cs b/samples/DockMvvmSample/Views/Tools/Tool5View.axaml.cs
@@ -3,15 +3,10 @@
 
 namespace DockMvvmSample.Views.Tools;
 
-public class Tool5View : UserControl
+public partial class Tool5View : UserControl
 {
     public Tool5View()
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
diff --git a/samples/DockMvvmSample/Views/Tools/Tool6View.axaml.cs b/samples/DockMvvmSample/Views/Tools/Tool6View.axaml.cs
@@ -3,15 +3,10 @@
 
 namespace DockMvvmSample.Views.Tools;
 
-public class Tool6View : UserControl
+public partial class Tool6View : UserControl
 {
     public Tool6View()
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
diff --git a/samples/DockMvvmSample/Views/Tools/Tool7View.axaml.cs b/samples/DockMvvmSample/Views/Tools/Tool7View.axaml.cs
@@ -3,15 +3,10 @@
 
 namespace DockMvvmSample.Views.Tools;
 
-public class Tool7View : UserControl
+public partial class Tool7View : UserControl
 {
     public Tool7View()
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
diff --git a/samples/DockMvvmSample/Views/Tools/Tool8View.axaml.cs b/samples/DockMvvmSample/Views/Tools/Tool8View.axaml.cs
@@ -3,15 +3,10 @@
 
 namespace DockMvvmSample.Views.Tools;
 
-public class Tool8View : UserControl
+public partial class Tool8View : UserControl
 {
     public Tool8View()
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
diff --git a/samples/DockMvvmSample/Views/Views/DashboardView.axaml.cs b/samples/DockMvvmSample/Views/Views/DashboardView.axaml.cs
@@ -3,15 +3,10 @@
 
 namespace DockMvvmSample.Views.Views;
 
-public class DashboardView : UserControl
+public partial class DashboardView : UserControl
 {
     public DashboardView()
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
diff --git a/samples/DockMvvmSample/Views/Views/HomeView.axaml.cs b/samples/DockMvvmSample/Views/Views/HomeView.axaml.cs
@@ -3,15 +3,10 @@
 
 namespace DockMvvmSample.Views.Views;
 
-public class HomeView : UserControl
+public partial class HomeView : UserControl
 {
     public HomeView()
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
diff --git a/samples/DockXamlSample/MainView.axaml.cs b/samples/DockXamlSample/MainView.axaml.cs
@@ -18,7 +18,7 @@
 
 namespace DockXamlSample;
 
-public class MainView : UserControl
+public partial class MainView : UserControl
 {
     private readonly IDockSerializer _serializer;
     private readonly IDockState _dockState;
@@ -32,22 +32,16 @@ public MainView()
 
         _dockState = new DockState();
 
-        var dock = this.FindControl<DockControl>("Dock");
-        if (dock is { })
+        if (Dock is { })
         {
-            var layout = dock.Layout;
+            var layout = Dock.Layout;
             if (layout is { })
             {
                 _dockState.Save(layout);
             }
         }
     }
 
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
-
     private List<FilePickerFileType> GetOpenOpenLayoutFileTypes()
     {
         return new List<FilePickerFileType>
@@ -83,7 +77,7 @@ private async Task OpenLayout()
 
         var file = result.FirstOrDefault();
 
-        if (file is not null && file.CanOpenRead)
+        if (file is not null)
         {
             try
             {
@@ -128,7 +122,7 @@ private async Task SaveLayout()
             ShowOverwritePrompt = true
         });
 
-        if (file is not null && file.CanOpenWrite)
+        if (file is not null)
         {
             try
             {