zhaoyushun1999/Semi.Avalonia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: upgrade to preview6

Browse Source
This commit is contained in:
rabbitism 2023-03-22 09:40:08 +08:00
parent 6376d11a25
commit 0e3170eba2
8 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo/Semi.Avalonia.Demo.Android/Semi.Avalonia.Demo.Android.csproj
View File

@ -13,7 +13,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia.Android" Version="11.0.0-preview5" /> <PackageReference Include="Avalonia.Android" Version="11.0.0-preview6" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
View File

@ -20,9 +20,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview5" /> <PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview6" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.--> <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-preview5" /> <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-preview6" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
demo/Semi.Avalonia.Demo.Web/Program.cs
View File

@ -10,7 +10,7 @@ internal partial class Program
{ {
private static void Main(string[] args) private static void Main(string[] args)
{ {
BuildAvaloniaApp().SetupBrowserApp("out"); BuildAvaloniaApp(); //.SetupBrowserApp("out");
} }
public static AppBuilder BuildAvaloniaApp() public static AppBuilder BuildAvaloniaApp()

4
demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj
View File

@ -19,8 +19,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia.Browser" Version="11.0.0-preview5" /> <PackageReference Include="Avalonia.Browser" Version="11.0.0-preview6" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview5" /> <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview6" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

12
demo/Semi.Avalonia.Demo/Pages/ThemeVariantDemo.axaml.cs
View File

@ -8,7 +8,6 @@ namespace Semi.Avalonia.Demo.Pages;
public partial class ThemeVariantDemo : UserControl public partial class ThemeVariantDemo : UserControl
{ {
private ThemeVariant _variant = ThemeVariant.Default;
public ThemeVariantDemo() public ThemeVariantDemo()
{ {
InitializeComponent(); InitializeComponent();
@ -16,15 +15,6 @@ public partial class ThemeVariantDemo : UserControl
private void Switch_OnIsCheckedChanged(object sender, RoutedEventArgs e) private void Switch_OnIsCheckedChanged(object sender, RoutedEventArgs e)
{ {
if (_variant == ThemeVariant.Dark) scope.RequestedThemeVariant = scope.ActualThemeVariant == ThemeVariant.Dark ? ThemeVariant.Light : ThemeVariant.Dark;
{
scope.RequestedThemeVariant = ThemeVariant.Default;
_variant = ThemeVariant.Default;
}
else
{
scope.RequestedThemeVariant = ThemeVariant.Dark;
_variant = ThemeVariant.Dark;
}
} }
} }

7
demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj
View File

@ -11,12 +11,11 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.0-preview5" /> <PackageReference Include="Avalonia" Version="11.0.0-preview6" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.0-preview5" /> <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.0-preview6" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.--> <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-preview5" /> <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-preview6" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.1.0" /> <PackageReference Include="CommunityToolkit.Mvvm" Version="8.1.0" />
<PackageReference Include="XamlNameReferenceGenerator" Version="1.5.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
src/Package.props
View File

@ -7,6 +7,6 @@
<Authors>IRIHI Technology</Authors> <Authors>IRIHI Technology</Authors>
<Description>Avalonia Theme inspired by Semi Design. </Description> <Description>Avalonia Theme inspired by Semi Design. </Description>
<PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl> <PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
<AvaloniaVersion>11.0.0-preview5</AvaloniaVersion> <AvaloniaVersion>11.0.0-preview6</AvaloniaVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

2
src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
View File

@ -61,7 +61,7 @@
</Panel> </Panel>
</DropDownButton.Content> </DropDownButton.Content>
<DropDownButton.Flyout> <DropDownButton.Flyout>
<Flyout FlyoutPresenterClasses="nopadding" Placement="Auto"> <Flyout FlyoutPresenterClasses="nopadding" Placement="AnchorAndGravity">
<!-- <!--
The following is copy-pasted from the ColorView's control template. The following is copy-pasted from the ColorView's control template.