commit
e76c480f34
@ -1,6 +1,6 @@
|
|||||||
<Project>
|
<Project>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<AvaloniaVersion>11.0.0-rc1.1</AvaloniaVersion>
|
<AvaloniaVersion>11.0.0-rc2.1</AvaloniaVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
@ -7,7 +7,7 @@ using Application = Android.App.Application;
|
|||||||
namespace Semi.Avalonia.Demo.Android;
|
namespace Semi.Avalonia.Demo.Android;
|
||||||
|
|
||||||
[Activity(Theme = "@style/MyTheme.Splash", MainLauncher = true, NoHistory = true)]
|
[Activity(Theme = "@style/MyTheme.Splash", MainLauncher = true, NoHistory = true)]
|
||||||
public class SplashActivity: AvaloniaSplashActivity<App>
|
public class SplashActivity: AvaloniaMainActivity<App>
|
||||||
{
|
{
|
||||||
protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
|
protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
|
||||||
{
|
{
|
||||||
|
@ -7,114 +7,159 @@
|
|||||||
d:DesignHeight="800"
|
d:DesignHeight="800"
|
||||||
d:DesignWidth="800"
|
d:DesignWidth="800"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
<StackPanel HorizontalAlignment="Left" Spacing="20">
|
<ScrollViewer>
|
||||||
<ProgressBar
|
<StackPanel HorizontalAlignment="Left" Spacing="20">
|
||||||
Width="200"
|
<StackPanel
|
||||||
Maximum="100"
|
HorizontalAlignment="Left"
|
||||||
Minimum="0"
|
Orientation="Horizontal"
|
||||||
ShowProgressText="True"
|
Spacing="20">
|
||||||
Value="20" />
|
<ProgressBar
|
||||||
<ProgressBar
|
Width="100"
|
||||||
Width="200"
|
Height="100"
|
||||||
IsIndeterminate="True"
|
Maximum="{Binding #slider.Maximum}"
|
||||||
Maximum="100"
|
Minimum="{Binding #slider.Minimum}"
|
||||||
Minimum="0"
|
Theme="{DynamicResource ProgressRing}"
|
||||||
ShowProgressText="True"
|
Value="{Binding #slider.Value}"
|
||||||
Value="20" />
|
ShowProgressText="True"/>
|
||||||
<ProgressBar
|
<ProgressBar
|
||||||
Width="200"
|
Width="100"
|
||||||
Classes="Left"
|
Height="100"
|
||||||
IsIndeterminate="True"
|
IsIndeterminate="True"
|
||||||
Maximum="100"
|
Maximum="{Binding #slider.Maximum}"
|
||||||
Minimum="0"
|
Minimum="{Binding #slider.Minimum}"
|
||||||
ShowProgressText="True"
|
Theme="{DynamicResource ProgressRing}"
|
||||||
Value="20" />
|
ShowProgressText="True"/>
|
||||||
<ProgressBar
|
</StackPanel>
|
||||||
Width="200"
|
<Slider
|
||||||
Classes="Left"
|
Name="slider"
|
||||||
Maximum="100"
|
Width="300"
|
||||||
Minimum="0"
|
IsSnapToTickEnabled="True"
|
||||||
ShowProgressText="True"
|
Maximum="100"
|
||||||
Value="20" />
|
Minimum="0"
|
||||||
<ProgressBar
|
TickFrequency="10" />
|
||||||
Width="200"
|
<ProgressBar
|
||||||
Classes="Right"
|
Width="200"
|
||||||
Maximum="100"
|
Maximum="100"
|
||||||
Minimum="0"
|
Minimum="0"
|
||||||
ShowProgressText="True"
|
ShowProgressText="True"
|
||||||
Value="20" />
|
Value="{Binding #slider.Value}" />
|
||||||
<StackPanel
|
<ProgressBar
|
||||||
HorizontalAlignment="Left"
|
Width="200"
|
||||||
Orientation="Horizontal"
|
IsIndeterminate="True"
|
||||||
Spacing="20">
|
|
||||||
<ProgressBar
|
|
||||||
Classes="Left"
|
|
||||||
Maximum="100"
|
Maximum="100"
|
||||||
Minimum="0"
|
Minimum="0"
|
||||||
Orientation="Vertical"
|
|
||||||
ShowProgressText="True"
|
ShowProgressText="True"
|
||||||
Value="20" />
|
Value="20" />
|
||||||
<ProgressBar
|
<ProgressBar
|
||||||
|
Width="200"
|
||||||
|
Classes="Left"
|
||||||
|
IsIndeterminate="True"
|
||||||
|
Maximum="100"
|
||||||
|
Minimum="0"
|
||||||
|
ShowProgressText="True"
|
||||||
|
Value="20" />
|
||||||
|
<ProgressBar
|
||||||
|
Width="200"
|
||||||
|
Classes="Left"
|
||||||
|
Maximum="100"
|
||||||
|
Minimum="0"
|
||||||
|
ShowProgressText="True"
|
||||||
|
Value="20" />
|
||||||
|
<ProgressBar
|
||||||
|
Width="200"
|
||||||
Classes="Right"
|
Classes="Right"
|
||||||
Maximum="100"
|
Maximum="100"
|
||||||
Minimum="0"
|
Minimum="0"
|
||||||
Orientation="Vertical"
|
|
||||||
ShowProgressText="True"
|
ShowProgressText="True"
|
||||||
Value="20" />
|
Value="20" />
|
||||||
|
<StackPanel
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
Orientation="Horizontal"
|
||||||
|
Spacing="20">
|
||||||
|
<ProgressBar
|
||||||
|
Classes="Left"
|
||||||
|
Maximum="100"
|
||||||
|
Minimum="0"
|
||||||
|
Orientation="Vertical"
|
||||||
|
ShowProgressText="True"
|
||||||
|
Value="20" />
|
||||||
|
<ProgressBar
|
||||||
|
Classes="Right"
|
||||||
|
Maximum="100"
|
||||||
|
Minimum="0"
|
||||||
|
Orientation="Vertical"
|
||||||
|
ShowProgressText="True"
|
||||||
|
Value="20" />
|
||||||
|
<ProgressBar
|
||||||
|
Maximum="100"
|
||||||
|
Minimum="0"
|
||||||
|
Orientation="Vertical"
|
||||||
|
ShowProgressText="True"
|
||||||
|
Value="20" />
|
||||||
|
<ProgressBar
|
||||||
|
Classes="Left"
|
||||||
|
Maximum="100"
|
||||||
|
Minimum="0"
|
||||||
|
Orientation="Vertical"
|
||||||
|
ShowProgressText="False"
|
||||||
|
Value="20" />
|
||||||
|
<ProgressBar
|
||||||
|
IsIndeterminate="True"
|
||||||
|
Maximum="100"
|
||||||
|
Minimum="0"
|
||||||
|
Orientation="Vertical"
|
||||||
|
ShowProgressText="True"
|
||||||
|
Value="20" />
|
||||||
|
<ProgressBar
|
||||||
|
IsIndeterminate="True"
|
||||||
|
Maximum="100"
|
||||||
|
Minimum="0"
|
||||||
|
Orientation="Vertical"
|
||||||
|
ShowProgressText="False"
|
||||||
|
Value="20" />
|
||||||
|
</StackPanel>
|
||||||
<ProgressBar
|
<ProgressBar
|
||||||
|
Width="200"
|
||||||
|
Classes="Primary"
|
||||||
Maximum="100"
|
Maximum="100"
|
||||||
Minimum="0"
|
Minimum="0"
|
||||||
Orientation="Vertical"
|
|
||||||
ShowProgressText="True"
|
ShowProgressText="True"
|
||||||
Value="20" />
|
Value="60" />
|
||||||
<ProgressBar
|
<ProgressBar
|
||||||
Classes="Left"
|
Width="200"
|
||||||
|
Classes="Secondary"
|
||||||
Maximum="100"
|
Maximum="100"
|
||||||
Minimum="0"
|
Minimum="0"
|
||||||
Orientation="Vertical"
|
|
||||||
ShowProgressText="False"
|
|
||||||
Value="20" />
|
|
||||||
<ProgressBar
|
|
||||||
IsIndeterminate="True"
|
|
||||||
Maximum="100"
|
|
||||||
Minimum="0"
|
|
||||||
Orientation="Vertical"
|
|
||||||
ShowProgressText="True"
|
ShowProgressText="True"
|
||||||
Value="20" />
|
Value="60" />
|
||||||
<ProgressBar
|
<ProgressBar
|
||||||
IsIndeterminate="True"
|
Width="200"
|
||||||
|
Classes="Tertiary"
|
||||||
Maximum="100"
|
Maximum="100"
|
||||||
Minimum="0"
|
Minimum="0"
|
||||||
Orientation="Vertical"
|
ShowProgressText="True"
|
||||||
ShowProgressText="False"
|
Value="60" />
|
||||||
Value="20" />
|
<ProgressBar
|
||||||
|
Width="200"
|
||||||
|
Classes="Success"
|
||||||
|
Maximum="100"
|
||||||
|
Minimum="0"
|
||||||
|
ShowProgressText="True"
|
||||||
|
Value="60" />
|
||||||
|
<ProgressBar
|
||||||
|
Width="200"
|
||||||
|
Classes="Warning"
|
||||||
|
Maximum="100"
|
||||||
|
Minimum="0"
|
||||||
|
ShowProgressText="True"
|
||||||
|
Value="60" />
|
||||||
|
<ProgressBar
|
||||||
|
Width="200"
|
||||||
|
Classes="Error"
|
||||||
|
Maximum="100"
|
||||||
|
Minimum="0"
|
||||||
|
ShowProgressText="True"
|
||||||
|
Value="60" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<ProgressBar
|
</ScrollViewer>
|
||||||
Width="200"
|
</UserControl>
|
||||||
Classes="Success"
|
|
||||||
Maximum="100"
|
|
||||||
Minimum="0"
|
|
||||||
ShowProgressText="True"
|
|
||||||
Value="60" />
|
|
||||||
<ProgressBar
|
|
||||||
Width="200"
|
|
||||||
Classes="Warning"
|
|
||||||
Maximum="100"
|
|
||||||
Minimum="0"
|
|
||||||
ShowProgressText="True"
|
|
||||||
Value="60" />
|
|
||||||
<ProgressBar
|
|
||||||
Width="200"
|
|
||||||
Classes="Error"
|
|
||||||
Maximum="100"
|
|
||||||
Minimum="0"
|
|
||||||
ShowProgressText="True"
|
|
||||||
Value="60" />
|
|
||||||
<ProgressBar
|
|
||||||
Width="200"
|
|
||||||
Maximum="100"
|
|
||||||
Minimum="0"
|
|
||||||
ShowProgressText="True"
|
|
||||||
Value="60" />
|
|
||||||
</StackPanel>
|
|
||||||
</UserControl>
|
|
@ -7,7 +7,7 @@
|
|||||||
<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-rc1.1</AvaloniaVersion>
|
<AvaloniaVersion>11.0.0-rc2.1</AvaloniaVersion>
|
||||||
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
@ -40,8 +40,6 @@
|
|||||||
<Setter Property="VerticalContentAlignment" Value="Center" />
|
<Setter Property="VerticalContentAlignment" Value="Center" />
|
||||||
<Setter Property="HorizontalAlignment" Value="Left" />
|
<Setter Property="HorizontalAlignment" Value="Left" />
|
||||||
<Setter Property="VerticalAlignment" Value="Top" />
|
<Setter Property="VerticalAlignment" Value="Top" />
|
||||||
<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
|
|
||||||
<Setter Property="PlaceholderForeground" Value="{DynamicResource ComboBoxPlaceHolderForeground}" />
|
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<ControlTemplate TargetType="ComboBox">
|
<ControlTemplate TargetType="ComboBox">
|
||||||
<DataValidationErrors>
|
<DataValidationErrors>
|
||||||
@ -50,8 +48,8 @@
|
|||||||
x:Name="Background"
|
x:Name="Background"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Grid.ColumnSpan="2"
|
Grid.ColumnSpan="2"
|
||||||
MinHeight="{DynamicResource ComboBoxDefaultHeight}"
|
|
||||||
MinWidth="{DynamicResource ComboBoxThemeMinWidth}"
|
MinWidth="{DynamicResource ComboBoxThemeMinWidth}"
|
||||||
|
MinHeight="{DynamicResource ComboBoxDefaultHeight}"
|
||||||
Background="{TemplateBinding Background}"
|
Background="{TemplateBinding Background}"
|
||||||
BorderBrush="{TemplateBinding BorderBrush}"
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
BorderThickness="{TemplateBinding BorderThickness}"
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
@ -63,7 +61,8 @@
|
|||||||
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
|
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||||
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
|
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||||
Foreground="{TemplateBinding Foreground}"
|
Foreground="{TemplateBinding Foreground}"
|
||||||
IsVisible="{TemplateBinding SelectionBoxItem,Converter={x:Static ObjectConverters.IsNull}}"
|
IsVisible="{TemplateBinding SelectionBoxItem,
|
||||||
|
Converter={x:Static ObjectConverters.IsNull}}"
|
||||||
Opacity="0.3"
|
Opacity="0.3"
|
||||||
Text="{TemplateBinding PlaceholderText}" />
|
Text="{TemplateBinding PlaceholderText}" />
|
||||||
<ContentPresenter
|
<ContentPresenter
|
||||||
@ -105,7 +104,8 @@
|
|||||||
ClipToBounds="False"
|
ClipToBounds="False"
|
||||||
InheritsTransform="True"
|
InheritsTransform="True"
|
||||||
IsLightDismissEnabled="True"
|
IsLightDismissEnabled="True"
|
||||||
IsOpen="{TemplateBinding IsDropDownOpen,Mode=TwoWay}"
|
IsOpen="{TemplateBinding IsDropDownOpen,
|
||||||
|
Mode=TwoWay}"
|
||||||
PlacementTarget="Background"
|
PlacementTarget="Background"
|
||||||
WindowManagerAddShadowHint="False">
|
WindowManagerAddShadowHint="False">
|
||||||
<Border
|
<Border
|
||||||
@ -118,9 +118,7 @@
|
|||||||
BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}"
|
BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}"
|
||||||
ClipToBounds="True"
|
ClipToBounds="True"
|
||||||
CornerRadius="6">
|
CornerRadius="6">
|
||||||
<ScrollViewer
|
<ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
|
||||||
HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
|
|
||||||
VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
|
|
||||||
<ItemsPresenter
|
<ItemsPresenter
|
||||||
Name="PART_ItemsPresenter"
|
Name="PART_ItemsPresenter"
|
||||||
Margin="{DynamicResource ComboBoxDropdownContentMargin}"
|
Margin="{DynamicResource ComboBoxDropdownContentMargin}"
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
xmlns="https://github.com/avaloniaui"
|
xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:converters="using:Avalonia.Controls.Converters"
|
xmlns:converters="using:Avalonia.Controls.Converters"
|
||||||
|
xmlns:semiConverters="clr-namespace:Semi.Avalonia.Converters"
|
||||||
x:CompileBindings="True">
|
x:CompileBindings="True">
|
||||||
<Design.PreviewWith>
|
<Design.PreviewWith>
|
||||||
<StackPanel Margin="20" Spacing="20">
|
<StackPanel Margin="20" Spacing="20">
|
||||||
@ -169,15 +170,24 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
</Setter>
|
</Setter>
|
||||||
|
<Style Selector="^.Primary">
|
||||||
|
<Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarPrimaryForeground}" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^.Secondary">
|
||||||
|
<Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarSecondaryForeground}" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^.Tertiary">
|
||||||
|
<Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarTertiaryForeground}" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^.Success">
|
||||||
|
<Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarSuccessForeground}" />
|
||||||
|
</Style>
|
||||||
<Style Selector="^.Warning">
|
<Style Selector="^.Warning">
|
||||||
<Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarWarningForeground}" />
|
<Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarWarningForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Error">
|
<Style Selector="^.Error">
|
||||||
<Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarErrorForeground}" />
|
<Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarErrorForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Success">
|
|
||||||
<Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarSuccessForeground}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:horizontal /template/ Border#PART_Indicator">
|
<Style Selector="^:horizontal /template/ Border#PART_Indicator">
|
||||||
<Setter Property="HorizontalAlignment" Value="Left" />
|
<Setter Property="HorizontalAlignment" Value="Left" />
|
||||||
<Setter Property="VerticalAlignment" Value="Stretch" />
|
<Setter Property="VerticalAlignment" Value="Stretch" />
|
||||||
@ -326,4 +336,105 @@
|
|||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
|
|
||||||
|
<semiConverters:PositionToAngleConverter x:Key="AngleConverter" />
|
||||||
|
|
||||||
|
<ControlTheme x:Key="ProgressRing" TargetType="ProgressBar">
|
||||||
|
<Setter Property="Foreground" Value="{DynamicResource ProgressBarIndicatorBrush}" />
|
||||||
|
<Setter Property="Background" Value="{DynamicResource ProgressBarBackground}" />
|
||||||
|
<Setter Property="Template">
|
||||||
|
<ControlTemplate TargetType="ProgressBar">
|
||||||
|
<Panel>
|
||||||
|
<Border Name="PART_Indicator" />
|
||||||
|
<Arc
|
||||||
|
Name="Background"
|
||||||
|
RenderOptions.EdgeMode="Antialias"
|
||||||
|
StartAngle="-90"
|
||||||
|
Stroke="{TemplateBinding Background}"
|
||||||
|
StrokeJoin="Round"
|
||||||
|
StrokeLineCap="Round"
|
||||||
|
StrokeThickness="6"
|
||||||
|
SweepAngle="360" />
|
||||||
|
<Arc
|
||||||
|
Name="Indicator"
|
||||||
|
RenderOptions.EdgeMode="Antialias"
|
||||||
|
StartAngle="-90"
|
||||||
|
Stroke="{TemplateBinding Foreground}"
|
||||||
|
StrokeJoin="Round"
|
||||||
|
StrokeLineCap="Round"
|
||||||
|
StrokeThickness="6"
|
||||||
|
SweepAngle="{TemplateBinding Percentage,
|
||||||
|
Converter={StaticResource AngleConverter}}" />
|
||||||
|
<Arc
|
||||||
|
Name="IndeterminateIndicator"
|
||||||
|
Opacity="0"
|
||||||
|
RenderOptions.EdgeMode="Antialias"
|
||||||
|
StartAngle="-90"
|
||||||
|
Stroke="{TemplateBinding Foreground}"
|
||||||
|
StrokeJoin="Round"
|
||||||
|
StrokeLineCap="Round"
|
||||||
|
StrokeThickness="6"
|
||||||
|
SweepAngle="{TemplateBinding Percentage,
|
||||||
|
Converter={StaticResource AngleConverter}}" />
|
||||||
|
<TextBlock
|
||||||
|
Name="PART_ProgressText"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
FontWeight="{DynamicResource ProgressBarTextFontWeight}"
|
||||||
|
Foreground="{DynamicResource ProgressBarTextForeground}"
|
||||||
|
IsVisible="{TemplateBinding ShowProgressText}">
|
||||||
|
<TextBlock.Text>
|
||||||
|
<MultiBinding Converter="{StaticResource StringFormatConverter}">
|
||||||
|
<TemplateBinding Property="ProgressTextFormat" />
|
||||||
|
<TemplateBinding Property="Value" />
|
||||||
|
<TemplateBinding Property="Percentage" />
|
||||||
|
<TemplateBinding Property="Minimum" />
|
||||||
|
<TemplateBinding Property="Maximum" />
|
||||||
|
</MultiBinding>
|
||||||
|
</TextBlock.Text>
|
||||||
|
</TextBlock>
|
||||||
|
</Panel>
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter>
|
||||||
|
<Style Selector="^.Primary">
|
||||||
|
<Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarPrimaryForeground}" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^.Secondary">
|
||||||
|
<Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarSecondaryForeground}" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^.Tertiary">
|
||||||
|
<Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarTertiaryForeground}" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^.Success">
|
||||||
|
<Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarSuccessForeground}" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^.Warning">
|
||||||
|
<Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarWarningForeground}" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^.Error">
|
||||||
|
<Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarErrorForeground}" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^:indeterminate /template/ Arc#Indicator">
|
||||||
|
<Setter Property="Opacity" Value="0" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^:indeterminate /template/ Arc#IndeterminateIndicator">
|
||||||
|
<Setter Property="Opacity" Value="1" />
|
||||||
|
<Style.Animations>
|
||||||
|
<Animation IterationCount="Infinite" Duration="0:0:2">
|
||||||
|
<KeyFrame KeyTime="0:0:0">
|
||||||
|
<Setter Property="StartAngle" Value="-90" />
|
||||||
|
<Setter Property="SweepAngle" Value="20" />
|
||||||
|
</KeyFrame>
|
||||||
|
<KeyFrame KeyTime="0:0:1.5">
|
||||||
|
<Setter Property="StartAngle" Value="90" />
|
||||||
|
<Setter Property="SweepAngle" Value="160" />
|
||||||
|
</KeyFrame>
|
||||||
|
<KeyFrame KeyTime="0:0:2">
|
||||||
|
<Setter Property="StartAngle" Value="270" />
|
||||||
|
<Setter Property="SweepAngle" Value="20" />
|
||||||
|
</KeyFrame>
|
||||||
|
</Animation>
|
||||||
|
</Style.Animations>
|
||||||
|
</Style>
|
||||||
|
</ControlTheme>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
@ -9,7 +9,6 @@
|
|||||||
</Design.PreviewWith>
|
</Design.PreviewWith>
|
||||||
<ControlTheme x:Key="{x:Type TextBlock}" TargetType="TextBlock">
|
<ControlTheme x:Key="{x:Type TextBlock}" TargetType="TextBlock">
|
||||||
<!--<Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockDefaultForeground}" />-->
|
<!--<Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockDefaultForeground}" />-->
|
||||||
<Setter Property="TextBlock.FontSize" Value="{DynamicResource TextBlockFontSize}" />
|
|
||||||
<Style Selector="^.Secondary">
|
<Style Selector="^.Secondary">
|
||||||
<Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
|
<Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
@ -15,6 +15,14 @@
|
|||||||
<Setter Property="VerticalAlignment" Value="Center" />
|
<Setter Property="VerticalAlignment" Value="Center" />
|
||||||
<Setter Property="HorizontalContentAlignment" Value="Left" />
|
<Setter Property="HorizontalContentAlignment" Value="Left" />
|
||||||
<Setter Property="VerticalContentAlignment" Value="Center" />
|
<Setter Property="VerticalContentAlignment" Value="Center" />
|
||||||
|
<Setter Property="KnobTransitions">
|
||||||
|
<Transitions>
|
||||||
|
<DoubleTransition
|
||||||
|
Easing="CubicEaseOut"
|
||||||
|
Property="Canvas.Left"
|
||||||
|
Duration="0:0:0.2" />
|
||||||
|
</Transitions>
|
||||||
|
</Setter>
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<ControlTemplate TargetType="ToggleSwitch">
|
<ControlTemplate TargetType="ToggleSwitch">
|
||||||
<Grid
|
<Grid
|
||||||
@ -103,18 +111,6 @@
|
|||||||
<Setter Property="Margin" Value="0" />
|
<Setter Property="Margin" Value="0" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<!-- NormalState -->
|
|
||||||
<Style Selector="^:not(:dragging) /template/ Grid#PART_MovingKnobs">
|
|
||||||
<Setter Property="Transitions">
|
|
||||||
<Transitions>
|
|
||||||
<DoubleTransition
|
|
||||||
Easing="CubicEaseOut"
|
|
||||||
Property="Canvas.Left"
|
|
||||||
Duration="0:0:0.2" />
|
|
||||||
</Transitions>
|
|
||||||
</Setter>
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<Style Selector="^:unchecked">
|
<Style Selector="^:unchecked">
|
||||||
<Style Selector="^ /template/ ContentPresenter#PART_OnContentPresenter">
|
<Style Selector="^ /template/ ContentPresenter#PART_OnContentPresenter">
|
||||||
<Setter Property="ContentPresenter.IsVisible" Value="False" />
|
<Setter Property="ContentPresenter.IsVisible" Value="False" />
|
||||||
|
27
src/Semi.Avalonia/Converters/PositionToAngleConverter.cs
Normal file
27
src/Semi.Avalonia/Converters/PositionToAngleConverter.cs
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
using System;
|
||||||
|
using System.Globalization;
|
||||||
|
using Avalonia.Data.Converters;
|
||||||
|
|
||||||
|
namespace Semi.Avalonia.Converters;
|
||||||
|
|
||||||
|
public class PositionToAngleConverter: IValueConverter
|
||||||
|
{
|
||||||
|
public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
|
||||||
|
{
|
||||||
|
if (value is double d)
|
||||||
|
{
|
||||||
|
return d * 3.6;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
|
||||||
|
{
|
||||||
|
if (value is double d)
|
||||||
|
{
|
||||||
|
return d / 3.6;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
@ -7,6 +7,9 @@
|
|||||||
<SolidColorBrush x:Key="ProgressBarOuterTextForeground" Color="#F9F9F9" />
|
<SolidColorBrush x:Key="ProgressBarOuterTextForeground" Color="#F9F9F9" />
|
||||||
<SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="Transparent" />
|
<SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="Transparent" />
|
||||||
<FontWeight x:Key="ProgressBarTextFontWeight">600</FontWeight>
|
<FontWeight x:Key="ProgressBarTextFontWeight">600</FontWeight>
|
||||||
|
<SolidColorBrush x:Key="ProgressBarPrimaryForeground" Color="#54A9FF" />
|
||||||
|
<SolidColorBrush x:Key="ProgressBarSecondaryForeground" Color="#40B4F3" />
|
||||||
|
<SolidColorBrush x:Key="ProgressBarTertiaryForeground" Color="#888D92" />
|
||||||
<SolidColorBrush x:Key="ProgressBarSuccessForeground" Color="#5DC264" />
|
<SolidColorBrush x:Key="ProgressBarSuccessForeground" Color="#5DC264" />
|
||||||
<SolidColorBrush x:Key="ProgressBarWarningForeground" Color="#FFAE43" />
|
<SolidColorBrush x:Key="ProgressBarWarningForeground" Color="#FFAE43" />
|
||||||
<SolidColorBrush x:Key="ProgressBarErrorForeground" Color="#FC725A" />
|
<SolidColorBrush x:Key="ProgressBarErrorForeground" Color="#FC725A" />
|
||||||
|
@ -2,11 +2,14 @@
|
|||||||
<!-- Add Resources Here -->
|
<!-- Add Resources Here -->
|
||||||
<SolidColorBrush x:Key="ProgressBarIndicatorBrush" Color="#0077FA" />
|
<SolidColorBrush x:Key="ProgressBarIndicatorBrush" Color="#0077FA" />
|
||||||
<CornerRadius x:Key="ProgressBarBackgroundCornerRadius">3</CornerRadius>
|
<CornerRadius x:Key="ProgressBarBackgroundCornerRadius">3</CornerRadius>
|
||||||
<SolidColorBrush x:Key="ProgressBarBackground" Opacity="0.5" Color="#2E3238" />
|
<SolidColorBrush x:Key="ProgressBarBackground" Opacity="0.05" Color="#2E3238" />
|
||||||
<SolidColorBrush x:Key="ProgressBarTextForeground" Color="#1C1F23" />
|
<SolidColorBrush x:Key="ProgressBarTextForeground" Color="#1C1F23" />
|
||||||
<SolidColorBrush x:Key="ProgressBarOuterTextForeground" Color="#1C1F23" />
|
<SolidColorBrush x:Key="ProgressBarOuterTextForeground" Color="#1C1F23" />
|
||||||
<SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="Transparent" />
|
<SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="Transparent" />
|
||||||
<FontWeight x:Key="ProgressBarTextFontWeight">600</FontWeight>
|
<FontWeight x:Key="ProgressBarTextFontWeight">600</FontWeight>
|
||||||
|
<SolidColorBrush x:Key="ProgressBarPrimaryForeground" Color="#0077FA" />
|
||||||
|
<SolidColorBrush x:Key="ProgressBarSecondaryForeground" Color="#0095EE" />
|
||||||
|
<SolidColorBrush x:Key="ProgressBarTertiaryForeground" Color="#6B7075" />
|
||||||
<SolidColorBrush x:Key="ProgressBarSuccessForeground" Color="#3BB346" />
|
<SolidColorBrush x:Key="ProgressBarSuccessForeground" Color="#3BB346" />
|
||||||
<SolidColorBrush x:Key="ProgressBarWarningForeground" Color="#FC8800" />
|
<SolidColorBrush x:Key="ProgressBarWarningForeground" Color="#FC8800" />
|
||||||
<SolidColorBrush x:Key="ProgressBarErrorForeground" Color="#F93920" />
|
<SolidColorBrush x:Key="ProgressBarErrorForeground" Color="#F93920" />
|
||||||
|
Loading…
x
Reference in New Issue
Block a user