wip

2024-05-06 21:17:20 +01:00
parent 40845bb5b3
commit ff8e97f030
13 changed files with 145 additions and 26 deletions
@@ -4,7 +4,6 @@
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:fluent="using:FluentAvalonia.Styling"
    xmlns:labs="using:Avalonia.Labs.Controls">
-    <fluent:FluentAvaloniaTheme />
    <StyleInclude Source="ControlResources.axaml" />
    <labs:ControlThemes />
 </Styles>
@@ -1,10 +1,9 @@
 using Avalonia.Markup.Xaml;
-using Avalonia.Styling;
+using FluentAvalonia.Styling;

 namespace Toolkit.UI.Controls.Avalonia;

-public class ThemeResources :
-    Styles
+public class ThemeResources : FluentAvaloniaTheme
 {
    public ThemeResources(IServiceProvider? provider = null)
    {
@@ -6,7 +6,7 @@
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Avalonia" Version="11.1.0-beta1" />
+		<PackageReference Include="Avalonia" Version="11.1.0-beta2" />
 		<PackageReference Include="Avalonia.Labs.Controls" Version="11.0.10.1" />
 		<PackageReference Include="FluentAvaloniaUI" Version="2.1.0-preview1" />
 	</ItemGroup>