huanld/Speckle.Material.Avalonia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: huanld:dev
Branches Tags
huanld:master huanld:dev huanld:3.0_major_update huanld:release/3.0.0-avalonia11-preview3 huanld:nuke huanld:release/3.0.0-avalonia11-preview2 huanld:release/3.0.0-avalonia11-preview1 huanld:release/2.5.1
huanld:3.0.0-avalonia11-preview3 huanld:v3.0.0-avalonia10-preview2 huanld:v3.0.0-avalonia10-preview1 huanld:v2.5.1 huanld:v2.5.0 huanld:v2.4.0 huanld:v2.3.1 huanld:v2.3.0 huanld:v2.2.0 huanld:v2.1.0 huanld:v2.0.0 huanld:v1.0.1
...
pull from: huanld:release/2.5.1
Branches Tags
huanld:dev huanld:3.0_major_update huanld:release/3.0.0-avalonia11-preview3 huanld:nuke huanld:release/3.0.0-avalonia11-preview2 huanld:release/3.0.0-avalonia11-preview1 huanld:master huanld:release/2.5.1
huanld:3.0.0-avalonia11-preview3 huanld:v3.0.0-avalonia10-preview2 huanld:v3.0.0-avalonia10-preview1 huanld:v2.5.1 huanld:v2.5.0 huanld:v2.4.0 huanld:v2.3.1 huanld:v2.3.0 huanld:v2.2.0 huanld:v2.1.0 huanld:v2.0.0 huanld:v1.0.1

5 Commits
dev ... release/2.5.1

Author SHA1 Message Date
SKProCH 5406590573 Bump DialogHost.Avalonia
.NET Core / build (push) Has been cancelled
Details
2022-03-22 23:20:00 +03:00
SKProCH 312fad85ed Bump Avalonia version, fix errors in animations. Fixes #133 2022-03-22 21:29:31 +03:00
appleneko2001 14bd5a655e Fix disabled ToggleSwitch compatibility with Default Theme (issue#132) 2022-03-22 21:29:02 +03:00
appleneko2001 2feb1f1eac Fix horizontal slider compatibility with Default Theme (issue#132) 2022-03-22 21:29:01 +03:00
appleneko2001 248fccd977 Commit fix for issue 125 (ProgressBar sizing issue) 2022-03-22 21:28:38 +03:00
12 changed files with 51 additions and 18 deletions
Expand all files Collapse all files
Material.Avalonia/Material.Avalonia.csproj
+1 -2
View File
@@ -37,8 +37,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.7" />
<PackageReference Include="Material.Icons.Avalonia" Version="1.0.2" />
<PackageReference Include="Avalonia" Version="0.10.11" />
</ItemGroup>
<ItemGroup>
Material.Colors/Material.Colors.csproj
+1 -1
View File
@@ -17,6 +17,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.7" />
<PackageReference Include="Avalonia" Version="0.10.11" />
</ItemGroup>
</Project>
Material.DataGrid/Material.DataGrid.csproj
+2 -2
View File
@@ -21,8 +21,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.7" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.1" />
<PackageReference Include="Avalonia" Version="0.10.11" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.11" />
</ItemGroup>
<ItemGroup>
Material.Demo/Material.Demo.csproj
+5 -4
View File
@@ -4,10 +4,11 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.7" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.7" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.7" />
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.7" />
<PackageReference Include="Avalonia" Version="0.10.11" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.11" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.11" />
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.11" />
<PackageReference Include="Material.Icons.Avalonia" Version="1.0.2" />
<PackageReference Include="ShowMeTheXaml.Avalonia.Generator" Version="0.3.0" />
</ItemGroup>
<ItemGroup>
Material.Dialog/Material.Dialog.csproj
+1 -1
View File
@@ -15,7 +15,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.7" />
<PackageReference Include="Avalonia" Version="0.10.11" />
</ItemGroup>
<ItemGroup>
Material.Ripple/Material.Ripple.csproj
+1 -1
View File
@@ -23,7 +23,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.7" />
<PackageReference Include="Avalonia" Version="0.10.11" />
</ItemGroup>
</Project>
Material.Styles/Additional/Animations/ControllableAnimationBase.cs
+3 -2
View File
@@ -1,5 +1,6 @@
using System;
using System.Reactive.Subjects;
using System.Threading;
using System.Threading.Tasks;
using Avalonia;
using Avalonia.Animation;
@@ -34,8 +35,8 @@ namespace Material.Styles.Additional.Animations {
return Animation.Apply(control, clock, observable, onComplete);
}
public virtual Task RunAsync(Animatable control, IClock clock) {
return Animation.RunAsync(control, clock);
public virtual Task RunAsync(Animatable control, IClock clock, CancellationToken cancellationToken = new CancellationToken()) {
return Animation.RunAsync(control, clock, cancellationToken);
}
internal virtual void OnNext(Subject<bool> match, bool previous, bool obj) {
Material.Styles/Assists/ShadowAssist.cs
+2 -1
View File
@@ -1,5 +1,6 @@
using System;
using System.Globalization;
using System.Threading;
using Avalonia;
using Avalonia.Animation;
using Avalonia.Controls;
@@ -93,7 +94,7 @@ namespace Material.Styles.Assists {
new Setter {Property = Border.BoxShadowProperty, Value = targetBoxShadows}
}
});
animation.RunAsync(border);
animation.RunAsync(border, null, CancellationToken.None);
}
else
{
Material.Styles/Material.Styles.csproj
+3 -3
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<LangVersion>9</LangVersion>
<LangVersion>10</LangVersion>
<Authors>Larymar,SKProCH,Appleneko2001</Authors>
<Company>Larymar,SKProCH,Appleneko2001</Company>
<PackageProjectUrl>https://github.com/AvaloniaUtils/material.avalonia</PackageProjectUrl>
@@ -55,8 +55,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.7" />
<PackageReference Include="DialogHost.Avalonia" Version="0.3.1" />
<PackageReference Include="Avalonia" Version="0.10.11" />
<PackageReference Include="DialogHost.Avalonia" Version="0.4.0" />
<PackageReference Include="Material.Icons" Version="1.0.8" />
<PackageReference Include="Material.Icons.Avalonia" Version="1.0.2" />
</ItemGroup>
Material.Styles/ProgressBar.xaml
+14
View File
@@ -370,6 +370,20 @@
</Style.Animations>
</Style>
<!-- Override Avalonia.Themes.Default parameter -->
<!-- Issue: https://github.com/AvaloniaCommunity/Material.Avalonia/issues/125 -->
<Style Selector="ProgressBar:horizontal">
<Setter Property="MinWidth" Value="0"/>
<Setter Property="MinHeight" Value="0"/>
</Style>
<Style Selector="ProgressBar:vertical">
<Setter Property="MinWidth" Value="0"/>
<Setter Property="MinHeight" Value="0"/>
</Style>
<Design.PreviewWith>
<Border Padding="20">
<StackPanel>
Material.Styles/Slider.xaml
+10 -1
View File
@@ -25,7 +25,7 @@
<Setter Property="Foreground" Value="{DynamicResource MaterialDesignCheckBoxDisabled}" />
</Style>
<Style Selector="Slider">
<Style Selector="Slider:horizontal">
<Setter Property="Template">
<ControlTemplate>
<Border Name="border" BorderBrush="{TemplateBinding BorderBrush}"
@@ -479,6 +479,15 @@
<Style Selector="Slider.Accent.Discrete Thumb /template/ ContentPresenter#bubble TextBlock">
<Setter Property="Foreground" Value="{DynamicResource SecondaryHueMidForegroundBrush}" />
</Style>
<Style Selector="Slider:horizontal">
<Setter Property="MinWidth" Value="0"/>
<Setter Property="MinHeight" Value="0"/>
</Style>
<Style Selector="Slider:vertical">
<Setter Property="MinWidth" Value="0"/>
<Setter Property="MinHeight" Value="0"/>
</Style>
<Design.PreviewWith>
<Border Padding="40">
Material.Styles/ToggleSwitch.xaml
+8
View File
@@ -251,4 +251,12 @@
<Setter Property="assists:ToggleSwitchAssist.SwitchTrackOnBackground"
Value="{DynamicResource SecondaryHueLightBrush}" />
</Style>
<!-- Override Avalonia.Themes.Default parameter -->
<!-- Issue: https://github.com/AvaloniaCommunity/Material.Avalonia/issues/132 -->
<Style Selector="ToggleSwitch:disabled">
<Setter Property="TextBlock.Foreground" Value="{DynamicResource MaterialDesignBody}" />
<Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}" />
</Style>
</Styles>