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

Compare commits

base: zhaoyushun1999:main
Branches Tags
zhaoyushun1999:main
zhaoyushun1999:release/11.1.x
zhaoyushun1999:backport
zhaoyushun1999:popup
zhaoyushun1999:switch
zhaoyushun1999:gh-pages
zhaoyushun1999:action/deploy
zhaoyushun1999:action/pack
zhaoyushun1999:action/publish
zhaoyushun1999:release/11.0.x
zhaoyushun1999:wasm-test
zhaoyushun1999:android-vulkan
zhaoyushun1999:schemes
zhaoyushun1999:v11.2.1.1
zhaoyushun1999:v11.2.1
zhaoyushun1999:v11.2.0
zhaoyushun1999:v11.1.0.5-beta1
zhaoyushun1999:v11.0.7.7
zhaoyushun1999:v11.1.0.4
zhaoyushun1999:v11.2.0-beta1
zhaoyushun1999:v11.1.0.3
zhaoyushun1999:v11.1.0.2
zhaoyushun1999:v11.0.7.6
zhaoyushun1999:v11.1.0.1
zhaoyushun1999:v11.0.7.5
zhaoyushun1999:v11.1.0
zhaoyushun1999:v11.1.0-rc2.1
zhaoyushun1999:v11.0.7.4
zhaoyushun1999:v11.1.0-rc2
zhaoyushun1999:v11.1.0-rc1
zhaoyushun1999:v11.1.0-beta2
zhaoyushun1999:v11.0.7.2
zhaoyushun1999:v11.1.0-beta1.1
zhaoyushun1999:v11.1.0-beta1
zhaoyushun1999:v11.0.7.1
zhaoyushun1999:v11.0.7
zhaoyushun1999:v11.0.1
zhaoyushun1999:v11.0.0
zhaoyushun1999:v11.0.0-rc1
zhaoyushun1999:v0.1.0-preview8
zhaoyushun1999:v0.1.0-preview7
zhaoyushun1999:v0.1.0-preview6.1
zhaoyushun1999:v0.1.0-preview6
zhaoyushun1999:v0.1.0-preview5.4
zhaoyushun1999:v0.1.0-preview5.3
zhaoyushun1999:v0.1.0-preview5.2
zhaoyushun1999:v0.1.0-preview5.1
zhaoyushun1999:v0.1.0-preview5
zhaoyushun1999:v0.1.0-preview3
zhaoyushun1999:v0.1.0-preview2
..
compare: zhaoyushun1999:v11.2.0
Branches Tags
zhaoyushun1999:release/11.1.x
zhaoyushun1999:main
zhaoyushun1999:backport
zhaoyushun1999:popup
zhaoyushun1999:switch
zhaoyushun1999:gh-pages
zhaoyushun1999:action/deploy
zhaoyushun1999:action/pack
zhaoyushun1999:action/publish
zhaoyushun1999:release/11.0.x
zhaoyushun1999:wasm-test
zhaoyushun1999:android-vulkan
zhaoyushun1999:schemes
zhaoyushun1999:v11.2.1.1
zhaoyushun1999:v11.2.1
zhaoyushun1999:v11.2.0
zhaoyushun1999:v11.1.0.5-beta1
zhaoyushun1999:v11.0.7.7
zhaoyushun1999:v11.1.0.4
zhaoyushun1999:v11.2.0-beta1
zhaoyushun1999:v11.1.0.3
zhaoyushun1999:v11.1.0.2
zhaoyushun1999:v11.0.7.6
zhaoyushun1999:v11.1.0.1
zhaoyushun1999:v11.0.7.5
zhaoyushun1999:v11.1.0
zhaoyushun1999:v11.1.0-rc2.1
zhaoyushun1999:v11.0.7.4
zhaoyushun1999:v11.1.0-rc2
zhaoyushun1999:v11.1.0-rc1
zhaoyushun1999:v11.1.0-beta2
zhaoyushun1999:v11.0.7.2
zhaoyushun1999:v11.1.0-beta1.1
zhaoyushun1999:v11.1.0-beta1
zhaoyushun1999:v11.0.7.1
zhaoyushun1999:v11.0.7
zhaoyushun1999:v11.0.1
zhaoyushun1999:v11.0.0
zhaoyushun1999:v11.0.0-rc1
zhaoyushun1999:v0.1.0-preview8
zhaoyushun1999:v0.1.0-preview7
zhaoyushun1999:v0.1.0-preview6.1
zhaoyushun1999:v0.1.0-preview6
zhaoyushun1999:v0.1.0-preview5.4
zhaoyushun1999:v0.1.0-preview5.3
zhaoyushun1999:v0.1.0-preview5.2
zhaoyushun1999:v0.1.0-preview5.1
zhaoyushun1999:v0.1.0-preview5
zhaoyushun1999:v0.1.0-preview3
zhaoyushun1999:v0.1.0-preview2

No commits in common. "main" and "v11.2.0" have entirely different histories.
main ... v11.2.0

152 changed files with 2273 additions and 2507 deletions
Show Stats Expand all files Collapse all files

26
.github/workflows/pack-tree.yml vendored
View File

@ -1,26 +0,0 @@
name: Pack TreeDataGrid Nuget
on:
push:
branches: [ "action/pack-tree" ]
pull_request:
branches: [ "action/pack-tree" ]
jobs:
nuget:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4.1.1
- name: Nuget Semi.Avalonia.TreeDataGrid
run: dotnet pack ./src/Semi.Avalonia.TreeDataGrid -o ./nugets
- name: Publish NuGet package
run: dotnet nuget push "./nugets/*.nupkg" --api-key ${{ secrets.NUGET_ORG_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
- name: Upload a Build Artifact
uses: actions/upload-artifact@v4.3.1
with:
name: nugets
path: ./nugets

4
.github/workflows/pack.yml vendored
View File

@ -22,8 +22,8 @@ jobs:
- name: Nuget Semi.Avalonia.DataGrid - name: Nuget Semi.Avalonia.DataGrid
run: dotnet pack ./src/Semi.Avalonia.DataGrid -o ./nugets run: dotnet pack ./src/Semi.Avalonia.DataGrid -o ./nugets
- name: Publish NuGet package - name: Nuget Semi.Avalonia.TreeDataGrid
run: dotnet nuget push "./nugets/*.nupkg" --api-key ${{ secrets.NUGET_ORG_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate run: dotnet pack ./src/Semi.Avalonia.TreeDataGrid -o ./nugets
- name: Upload a Build Artifact - name: Upload a Build Artifact
uses: actions/upload-artifact@v4.3.1 uses: actions/upload-artifact@v4.3.1

2
README.md
View File

@ -68,8 +68,6 @@ We offer limited free community support for Semi Avalonia and Ursa. If you have
| Semi Design Version | Avalonia Version | | Semi Design Version | Avalonia Version |
|:--------------------|:-----------------| |:--------------------|:-----------------|
| 11.2.1 | >=11.2.1 |
| 11.2.0 | 11.2.0 |
| 11.1.0 | >=11.1.0 | | 11.1.0 | >=11.1.0 |
| 11.0.7 | >=11.0.7 | | 11.0.7 | >=11.0.7 |
| 11.0.1 | <=11.0.6 | | 11.0.1 | <=11.0.6 |

4
README_CN.md
View File

@ -56,6 +56,7 @@ dotnet add package Semi.Avalonia.TreeDataGrid
## 示例 ## 示例
您可以从 Semi Avalonia 的 release 页下载并试用 Semi Avalonia 的展示应用。 您可以从 Semi Avalonia 的 release 页下载并试用 Semi Avalonia 的展示应用。
<https://github.com/irihitech/Semi.Avalonia/releases> <https://github.com/irihitech/Semi.Avalonia/releases>
## 社区支持 ## 社区支持
@ -64,12 +65,11 @@ dotnet add package Semi.Avalonia.TreeDataGrid
![FeiShu](./docs/community-support.png) ![FeiShu](./docs/community-support.png)
## 版本兼容性 ## 版本兼容性
| Semi Design Version | Avalonia Version | | Semi Design Version | Avalonia Version |
|:--------------------|:-----------------| |:--------------------|:-----------------|
| 11.2.1 | >=11.2.1 |
| 11.2.0 | 11.2.0 |
| 11.1.0 | >=11.1.0 | | 11.1.0 | >=11.1.0 |
| 11.0.7 | >=11.0.7 | | 11.0.7 | >=11.0.7 |
| 11.0.1 | <=11.0.6 | | 11.0.1 | <=11.0.6 |

8
Semi.Avalonia.sln
View File

@ -12,14 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution
src\Package.props = src\Package.props src\Package.props = src\Package.props
EndProjectSection EndProjectSection
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub Action", "GitHub Action", "{318534A1-1CC3-40FB-B4AE-736F94465232}"
ProjectSection(SolutionItems) = preProject
.github\workflows\deploy.yml = .github\workflows\deploy.yml
.github\workflows\pack.yml = .github\workflows\pack.yml
.github\workflows\pack-tree.yml = .github\workflows\pack-tree.yml
.github\workflows\publish.yml = .github\workflows\publish.yml
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demo", "Demo", "{43091528-9509-43CB-A003-9C5C11E96DD6}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demo", "Demo", "{43091528-9509-43CB-A003-9C5C11E96DD6}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Avalonia.Demo.Desktop", "demo\Semi.Avalonia.Demo.Desktop\Semi.Avalonia.Demo.Desktop.csproj", "{2ADCA724-2B6D-46EC-87F7-604D7918B89A}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Avalonia.Demo.Desktop", "demo\Semi.Avalonia.Demo.Desktop\Semi.Avalonia.Demo.Desktop.csproj", "{2ADCA724-2B6D-46EC-87F7-604D7918B89A}"

3
demo/Directory.Build.props
View File

@ -1,7 +1,6 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<AvaloniaVersion>11.2.2</AvaloniaVersion> <AvaloniaVersion>11.2.0</AvaloniaVersion>
<CommunityToolkitVersion>8.3.2</CommunityToolkitVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

6
demo/Semi.Avalonia.Demo.Desktop/Program.cs
View File

@ -16,13 +16,13 @@ class Program
public static void Main(string[] args) => BuildAvaloniaApp() public static void Main(string[] args) => BuildAvaloniaApp()
.With(new FontManagerOptions .With(new FontManagerOptions
{ {
FontFallbacks = FontFallbacks = new[]
[ {
new FontFallback new FontFallback
{ {
FontFamily = new FontFamily("Microsoft YaHei") FontFamily = new FontFamily("Microsoft YaHei")
} }
] }
}) })
.StartWithClassicDesktopLifetime(args); .StartWithClassicDesktopLifetime(args);

BIN
demo/Semi.Avalonia.Demo.Web/Assets/Fonts/SourceHanSansCN-Bold.otf
View File

Binary file not shown.

0
demo/Semi.Avalonia.Demo.Web/Assets/Fonts/SourceHanSansCN-Regular.otf → demo/Semi.Avalonia.Demo.Web/Assets/SourceHanSansCN-Regular.otf
View File

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

@ -11,6 +11,6 @@ public static class AvaloniaAppBuilderExtensions
builder.With(new FontManagerOptions builder.With(new FontManagerOptions
{ {
DefaultFamilyName = DefaultFontFamily, DefaultFamilyName = DefaultFontFamily,
FontFallbacks = [new FontFallback { FontFamily = new FontFamily(DefaultFontFamily) }] FontFallbacks = new[] { new FontFallback { FontFamily = new FontFamily(DefaultFontFamily) } }
}); });
} }

10
demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.axaml
View File

@ -6,15 +6,15 @@
x:CompileBindings="True" x:CompileBindings="True"
x:DataType="viewModels:FunctionalColorGroupViewModel"> x:DataType="viewModels:FunctionalColorGroupViewModel">
<ControlTheme x:Key="{x:Type controls:FunctionalColorGroupControl}" TargetType="controls:FunctionalColorGroupControl"> <ControlTheme x:Key="{x:Type controls:FunctionalColorGroupControl}" TargetType="controls:FunctionalColorGroupControl">
<Setter Property="Template"> <Setter Property="controls:FunctionalColorGroupControl.Template">
<ControlTemplate TargetType="controls:FunctionalColorGroupControl"> <ControlTemplate x:DataType="viewModels:FunctionalColorGroupViewModel" TargetType="controls:FunctionalColorGroupControl">
<Grid RowDefinitions="Auto, *"> <Grid RowDefinitions="Auto, *">
<SelectableTextBlock <TextBlock
Grid.Row="0" Grid.Row="0"
Margin="0,16,0,0" Margin="0,16,0,0"
Classes="H3" Classes="H3"
Text="{TemplateBinding Title}" Text="{TemplateBinding Title}"
Theme="{DynamicResource TitleSelectableTextBlock}" /> Theme="{DynamicResource TitleTextBlock}" />
<TabControl Grid.Row="1"> <TabControl Grid.Row="1">
<TabItem Header="Light"> <TabItem Header="Light">
<DataGrid IsReadOnly="True" ItemsSource="{TemplateBinding LightColors}"> <DataGrid IsReadOnly="True" ItemsSource="{TemplateBinding LightColors}">
@ -129,4 +129,4 @@
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

27
demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.cs
View File

@ -4,38 +4,33 @@ using Avalonia.Controls.Primitives;
namespace Semi.Avalonia.Demo.Controls; namespace Semi.Avalonia.Demo.Controls;
public class FunctionalColorGroupControl : TemplatedControl public class FunctionalColorGroupControl: TemplatedControl
{ {
public static readonly StyledProperty<string?> TitleProperty = public static readonly StyledProperty<string?> TitleProperty = AvaloniaProperty.Register<FunctionalColorGroupControl, string?>(
AvaloniaProperty.Register<FunctionalColorGroupControl, string?>(nameof(Title)); nameof(Title));
public string? Title public string? Title
{ {
get => GetValue(TitleProperty); get => GetValue(TitleProperty);
set => SetValue(TitleProperty, value); set => SetValue(TitleProperty, value);
} }
public static readonly DirectProperty<FunctionalColorGroupControl, IEnumerable?> LightColorsProperty = public static readonly DirectProperty<FunctionalColorGroupControl, IEnumerable?> LightColorsProperty = AvaloniaProperty.RegisterDirect<FunctionalColorGroupControl, IEnumerable?>(
AvaloniaProperty.RegisterDirect<FunctionalColorGroupControl, IEnumerable?>(nameof(LightColors), nameof(LightColors), o => o.LightColors, (o, v) => o.LightColors = v);
o => o.LightColors, (o, v) => o.LightColors = v);
private IEnumerable? _lightColors; private IEnumerable? _lightColors;
public IEnumerable? LightColors public IEnumerable? LightColors
{ {
get => _lightColors; get => _lightColors;
set => SetAndRaise(LightColorsProperty, ref _lightColors, value); set => SetAndRaise(LightColorsProperty, ref _lightColors, value);
} }
public static readonly DirectProperty<FunctionalColorGroupControl, IEnumerable?> DarkColorsProperty = public static readonly DirectProperty<FunctionalColorGroupControl, IEnumerable?> DarkColorsProperty = AvaloniaProperty.RegisterDirect<FunctionalColorGroupControl, IEnumerable?>(
AvaloniaProperty.RegisterDirect<FunctionalColorGroupControl, IEnumerable?>(nameof(DarkColors), nameof(DarkColors), o => o.DarkColors, (o, v) => o.DarkColors = v);
o => o.DarkColors, (o, v) => o.DarkColors = v);
private IEnumerable? _darkColors; private IEnumerable? _darkColors;
public IEnumerable? DarkColors public IEnumerable? DarkColors
{ {
get => _darkColors; get => _darkColors;
set => SetAndRaise(DarkColorsProperty, ref _darkColors, value); set => SetAndRaise(DarkColorsProperty, ref _darkColors, value);
} }
} }

88
demo/Semi.Avalonia.Demo/Controls/ShadowGroupControl.axaml
View File

@ -1,88 +0,0 @@
<ResourceDictionary
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:Semi.Avalonia.Demo.Controls"
xmlns:viewModels="clr-namespace:Semi.Avalonia.Demo.ViewModels"
x:CompileBindings="True"
x:DataType="viewModels:ShadowGroupViewModel">
<ControlTheme x:Key="{x:Type controls:ShadowGroupControl}" TargetType="controls:ShadowGroupControl">
<Setter Property="Template">
<ControlTemplate TargetType="controls:ShadowGroupControl">
<Grid RowDefinitions="Auto, *">
<SelectableTextBlock
Grid.Row="0"
Margin="0,16,0,0"
Classes="H3"
Text="{TemplateBinding Title}"
Theme="{DynamicResource TitleSelectableTextBlock}" />
<TabControl Grid.Row="1">
<TabItem Header="Light">
<DataGrid IsReadOnly="True" ItemsSource="{TemplateBinding LightShadows}">
<DataGrid.Columns>
<DataGridTemplateColumn Width="*" Header="ResourceKey">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate DataType="viewModels:ShadowItemViewModel">
<SelectableTextBlock
Margin="12,0,12,0"
VerticalAlignment="Center"
Text="{Binding ResourceKey}" />
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTextColumn
Width="*"
x:DataType="viewModels:ShadowItemViewModel"
Binding="{Binding ShadowDisplayName}"
CanUserSort="False"
Header="Name" />
<DataGridTemplateColumn Width="300" Header="BoxShadows">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate DataType="viewModels:ShadowItemViewModel">
<SelectableTextBlock
Margin="12,0,12,0"
VerticalAlignment="Center"
Text="{Binding BoxShadowValue}" />
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
</DataGrid.Columns>
</DataGrid>
</TabItem>
<TabItem Header="Dark">
<DataGrid IsReadOnly="True" ItemsSource="{TemplateBinding DarkShadows}">
<DataGrid.Columns>
<DataGridTemplateColumn Width="*" Header="ResourceKey">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate DataType="viewModels:ShadowItemViewModel">
<SelectableTextBlock
Margin="12,0,12,0"
VerticalAlignment="Center"
Text="{Binding ResourceKey}" />
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTextColumn
Width="*"
x:DataType="viewModels:ShadowItemViewModel"
Binding="{Binding ShadowDisplayName}"
CanUserSort="False"
Header="Name" />
<DataGridTemplateColumn Width="300" Header="BoxShadows">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate DataType="viewModels:ShadowItemViewModel">
<SelectableTextBlock
Margin="12,0,12,0"
VerticalAlignment="Center"
Text="{Binding BoxShadowValue}" />
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
</DataGrid.Columns>
</DataGrid>
</TabItem>
</TabControl>
</Grid>
</ControlTemplate>
</Setter>
</ControlTheme>
</ResourceDictionary>

41
demo/Semi.Avalonia.Demo/Controls/ShadowGroupControl.cs
View File

@ -1,41 +0,0 @@
using System.Collections;
using Avalonia;
using Avalonia.Controls.Primitives;
namespace Semi.Avalonia.Demo.Controls;
public class ShadowGroupControl : TemplatedControl
{
public static readonly StyledProperty<string?> TitleProperty =
AvaloniaProperty.Register<ShadowGroupControl, string?>(nameof(Title));
public string? Title
{
get => GetValue(TitleProperty);
set => SetValue(TitleProperty, value);
}
private IEnumerable? _lightShadows;
public static readonly DirectProperty<ShadowGroupControl, IEnumerable?> LightShadowsProperty =
AvaloniaProperty.RegisterDirect<ShadowGroupControl, IEnumerable?>(nameof(LightShadows),
o => o.LightShadows, (o, v) => o.LightShadows = v);
public IEnumerable? LightShadows
{
get => _lightShadows;
set => SetAndRaise(LightShadowsProperty, ref _lightShadows, value);
}
private IEnumerable? _darkShadows;
public static readonly DirectProperty<ShadowGroupControl, IEnumerable?> DarkShadowsProperty =
AvaloniaProperty.RegisterDirect<ShadowGroupControl, IEnumerable?>(nameof(DarkShadows),
o => o.DarkShadows, (o, v) => o.DarkShadows = v);
public IEnumerable? DarkShadows
{
get => _darkShadows;
set => SetAndRaise(DarkShadowsProperty, ref _darkShadows, value);
}
}

90
demo/Semi.Avalonia.Demo/Pages/CarouselDemo.axaml
View File

@ -8,26 +8,20 @@
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<UserControl.Styles> <UserControl.Styles>
<Style Selector="Carousel"> <Style Selector="Border">
<Setter Property="Height" Value="200" /> <Setter Property="Height" Value="200" />
<Style Selector="^ TextBlock">
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Foreground" Value="#1C1F23" />
</Style>
</Style> </Style>
<Style Selector="RadioButton"> <Style Selector="TextBlock">
<Setter Property="Theme" Value="{DynamicResource ButtonRadioButton}" /> <Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Foreground" Value="#1C1F23" />
</Style> </Style>
</UserControl.Styles> </UserControl.Styles>
<StackPanel Spacing="20"> <StackPanel Spacing="20">
<Carousel Theme="{DynamicResource FullCarousel}" <Carousel Theme="{DynamicResource FullCarousel}">
Classes.Dot="{Binding #DotButton.IsChecked}" <Carousel.PageTransition>
Classes.Columnar="{Binding #ColumnarButton.IsChecked}" <PageSlide Orientation="Horizontal" Duration="0.25" />
Classes.Line="{Binding #LineButton.IsChecked}" </Carousel.PageTransition>
Classes.Left="{Binding #LeftButton.IsChecked}"
Classes.Center="{Binding #CenterButton.IsChecked}"
Classes.Right="{Binding #RightButton.IsChecked}">
<Border Background="#EAF5FF"> <Border Background="#EAF5FF">
<TextBlock Text="Text 1" /> <TextBlock Text="Text 1" />
</Border> </Border>
@ -41,39 +35,39 @@
<TextBlock Text="Text 4" /> <TextBlock Text="Text 4" />
</Border> </Border>
</Carousel> </Carousel>
<StackPanel Orientation="Horizontal" Spacing="8"> <Carousel Classes="Line" Theme="{DynamicResource FullCarousel}">
<TextBlock VerticalAlignment="Center" Text="Type" /> <Carousel.PageTransition>
<Border Theme="{DynamicResource RadioButtonGroupBorder}"> <PageSlide Orientation="Horizontal" Duration="0.25" />
<StackPanel Orientation="Horizontal"> </Carousel.PageTransition>
<RadioButton <Border Background="#EAF5FF">
Name="DotButton" <TextBlock Text="Text 1" />
IsChecked="True"
Content="Dot" />
<RadioButton
Name="ColumnarButton"
Content="Columnar" />
<RadioButton
Name="LineButton"
Content="Line" />
</StackPanel>
</Border> </Border>
</StackPanel> <Border Background="#F9F9F9">
<StackPanel Orientation="Horizontal" Spacing="8"> <TextBlock Text="Text 2" />
<TextBlock VerticalAlignment="Center" Text="Position" />
<Border Theme="{DynamicResource RadioButtonGroupBorder}">
<StackPanel Orientation="Horizontal">
<RadioButton
Name="LeftButton"
IsChecked="True"
Content="Left" />
<RadioButton
Name="CenterButton"
Content="Center" />
<RadioButton
Name="RightButton"
Content="Right" />
</StackPanel>
</Border> </Border>
</StackPanel> <Border Background="#FFF8EA">
<TextBlock Text="Text 3" />
</Border>
<Border Background="#FEF2ED">
<TextBlock Text="Text 4" />
</Border>
</Carousel>
<Carousel Classes="Columnar Left" Theme="{DynamicResource FullCarousel}">
<Carousel.PageTransition>
<PageSlide Orientation="Horizontal" Duration="0.25" />
</Carousel.PageTransition>
<Border Background="#EAF5FF">
<TextBlock Text="Text 1" />
</Border>
<Border Background="#F9F9F9">
<TextBlock Text="Text 2" />
</Border>
<Border Background="#FFF8EA">
<TextBlock Text="Text 3" />
</Border>
<Border Background="#FEF2ED">
<TextBlock Text="Text 4" />
</Border>
</Carousel>
</StackPanel> </StackPanel>
</UserControl> </UserControl>

9
demo/Semi.Avalonia.Demo/Pages/ComboBoxDemo.axaml
View File

@ -27,15 +27,6 @@
<ComboBox Classes="Small" /> <ComboBox Classes="Small" />
<ComboBox Classes="Bordered" /> <ComboBox Classes="Bordered" />
<ComboBox Classes="Bordered" IsEnabled="False" /> <ComboBox Classes="Bordered" IsEnabled="False" />
<ComboBox>
<ComboBox.SelectionBoxItemTemplate>
<DataTemplate DataType="x:String">
<ContentControl BorderThickness="1"
BorderBrush="Gold"
Content="{Binding}" />
</DataTemplate>
</ComboBox.SelectionBoxItemTemplate>
</ComboBox>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<ComboBox Width="100" Classes="Large" PlaceholderText="Large" /> <ComboBox Width="100" Classes="Large" PlaceholderText="Large" />

6
demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml
View File

@ -101,7 +101,7 @@
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
</TabItem> </TabItem>
<TabItem Name="EditableTab" Header="Editable"> <TabItem x:Name="EditableTab" Header="Editable">
<Grid Margin="8" RowDefinitions="Auto,*,Auto"> <Grid Margin="8" RowDefinitions="Auto,*,Auto">
<StackPanel <StackPanel
Grid.Row="0" Grid.Row="0"
@ -109,14 +109,14 @@
Spacing="4"> Spacing="4">
<TextBlock VerticalAlignment="Center" Text="FontSize:" /> <TextBlock VerticalAlignment="Center" Text="FontSize:" />
<Slider <Slider
Name="FontSizeSlider" x:Name="FontSizeSlider"
Width="100" Width="100"
VerticalAlignment="Center" VerticalAlignment="Center"
Maximum="30" Maximum="30"
Minimum="5" Minimum="5"
Value="14" /> Value="14" />
<CheckBox <CheckBox
Name="IsThreeStateCheckBox" x:Name="IsThreeStateCheckBox"
Content="IsThreeState" Content="IsThreeState"
IsChecked="False" /> IsChecked="False" />
</StackPanel> </StackPanel>

10
demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml → demo/Semi.Avalonia.Demo/Pages/GridSplitter.axaml
View File

@ -1,5 +1,5 @@
<UserControl <UserControl
x:Class="Semi.Avalonia.Demo.Pages.GridSplitterDemo" x:Class="Semi.Avalonia.Demo.Pages.GridSplitter"
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:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@ -14,13 +14,13 @@
RowDefinitions="*, Auto, *"> RowDefinitions="*, Auto, *">
<Border <Border
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Background="{DynamicResource SemiYellow3Color}" Background="#FEFBCB"
CornerRadius="10" /> CornerRadius="10" />
<GridSplitter Grid.Row="1" ShowsPreview="True" /> <GridSplitter Grid.Row="1" ShowsPreview="True" />
<Border <Border
Grid.Row="2" Grid.Row="2"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Background="{DynamicResource SemiYellow3Color}" Background="#FEFBCB"
CornerRadius="10" /> CornerRadius="10" />
</Grid> </Grid>
<Grid <Grid
@ -29,13 +29,13 @@
ColumnDefinitions="*, Auto, *"> ColumnDefinitions="*, Auto, *">
<Border <Border
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Background="{DynamicResource SemiYellow3Color}" Background="#FEFBCB"
CornerRadius="10" /> CornerRadius="10" />
<GridSplitter Grid.Column="1" ShowsPreview="True" /> <GridSplitter Grid.Column="1" ShowsPreview="True" />
<Border <Border
Grid.Column="2" Grid.Column="2"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Background="{DynamicResource SemiYellow3Color}" Background="#FEFBCB"
CornerRadius="10" /> CornerRadius="10" />
</Grid> </Grid>
</StackPanel> </StackPanel>

5
demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml.cs → demo/Semi.Avalonia.Demo/Pages/GridSplitter.axaml.cs
View File

@ -1,11 +1,12 @@
using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Semi.Avalonia.Demo.Pages; namespace Semi.Avalonia.Demo.Pages;
public partial class GridSplitterDemo : UserControl public partial class GridSplitter : UserControl
{ {
public GridSplitterDemo() public GridSplitter()
{ {
InitializeComponent(); InitializeComponent();
} }

18
demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml
View File

@ -2,7 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="1450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Semi.Avalonia.Demo.Pages.HeaderedContentControlDemo"> x:Class="Semi.Avalonia.Demo.Pages.HeaderedContentControlDemo">
<ScrollViewer> <ScrollViewer>
<StackPanel HorizontalAlignment="Left" Spacing="20"> <StackPanel HorizontalAlignment="Left" Spacing="20">
@ -27,18 +27,12 @@
</WrapPanel> </WrapPanel>
<TextBlock>GroupBox Theme</TextBlock> <TextBlock>GroupBox Theme</TextBlock>
<HeaderedContentControl <HeaderedContentControl
Theme="{DynamicResource GroupBox}"
HorizontalAlignment="Left" HorizontalAlignment="Left"
MaxWidth="360"> Theme="{DynamicResource GroupBox}"
<HeaderedContentControl.Header> Header="Semi Design"
<Panel> Width="400"
<SelectableTextBlock Text="Semi Design" /> Height="200">
<HyperlinkButton HorizontalAlignment="Right" Content="更多" /> <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统。设计系统包含设计语言以及一整套可复用的前端组件，帮助设计师与开发者更容易地打造高质量的、用户体验一致的、符合设计规范的 Web 应用。</TextBlock>
</Panel>
</HeaderedContentControl.Header>
<HeaderedContentControl.Content>
<SelectableTextBlock Text="Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统。设计系统包含设计语言以及一整套可复用的前端组件，帮助设计师与开发者更容易地打造高质量的、用户体验一致的、符合设计规范的 Web 应用。" />
</HeaderedContentControl.Content>
</HeaderedContentControl> </HeaderedContentControl>
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>

46
demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml
View File

@ -8,22 +8,36 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<StackPanel HorizontalAlignment="Left" Spacing="20"> <StackPanel HorizontalAlignment="Left" Spacing="20">
<HyperlinkButton
NavigateUri="https://www.irihi.tech/"
Content="IRIHI Homepage" />
<HyperlinkButton
Classes="Underline"
IsEnabled="False"
NavigateUri="https://www.irihi.tech/"
Content="Not Enabled" />
<HyperlinkButton
Classes="WithIcon Underline"
Height="20"
NavigateUri="https://www.irihi.tech/"
Content="带下划线的网页链接" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<HyperlinkButton Classes="OnlyIcon" NavigateUri="https://www.irihi.tech/" /> <HyperlinkButton Height="20" NavigateUri="http://www.irihi.tech/">
<HyperlinkButton Classes="OnlyIcon" NavigateUri="https://www.irihi.tech/" /> <TextBlock
HorizontalAlignment="Center"
Text="iRihi Homepage"
TextDecorations="Underline"
VerticalAlignment="Center" />
</HyperlinkButton>
</StackPanel>
<StackPanel Orientation="Horizontal">
<HyperlinkButton Height="20" IsEnabled="False">
<TextBlock
HorizontalAlignment="Center"
Text="Not Enabled"
TextDecorations="Underline"
VerticalAlignment="Center" />
</HyperlinkButton>
</StackPanel>
<StackPanel Orientation="Horizontal">
<HyperlinkButton
BorderThickness="1"
Classes="WithIcon"
Height="20"
NavigateUri="http://www.irihi.tech/">
<TextBlock
HorizontalAlignment="Center"
Text="Link with Icon"
TextDecorations="Underline"
VerticalAlignment="Center" />
</HyperlinkButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</UserControl> </UserControl>

80
demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml
View File

@ -4,7 +4,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="800" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<ScrollViewer> <ScrollViewer>
@ -13,13 +13,15 @@
<Style Selector="Label"> <Style Selector="Label">
<Setter Property="Margin" Value="4" /> <Setter Property="Margin" Value="4" />
</Style> </Style>
<Style Selector="Grid > TextBlock">
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="4" />
</Style>
</StackPanel.Styles> </StackPanel.Styles>
<ScrollViewer HorizontalScrollBarVisibility="Auto"> <ScrollViewer HorizontalScrollBarVisibility="Auto">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel.Styles>
<Style Selector="Label, TextBlock">
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="4" />
</Style>
</StackPanel.Styles>
<HeaderedContentControl <HeaderedContentControl
Width="400" Width="400"
Height="400" Height="400"
@ -30,62 +32,62 @@
<Grid <Grid
VerticalAlignment="Top" VerticalAlignment="Top"
ColumnDefinitions="Auto, *" ColumnDefinitions="Auto, *"
RowDefinitions="*,*,*,*,*,*,*,*,*,*,*"> RowDefinitions="*,*,*,*,*,*,*,*,*,*,*,*">
<TextBlock Grid.Row="0" Grid.Column="0">Classes</TextBlock> <TextBlock Grid.Row="1" Grid.Column="0">Classes</TextBlock>
<TextBlock Grid.Row="1" Grid.Column="0">-</TextBlock> <TextBlock Grid.Row="2" Grid.Column="0">-</TextBlock>
<TextBlock Grid.Row="2" Grid.Column="0">Secondary</TextBlock> <TextBlock Grid.Row="3" Grid.Column="0">Secondary</TextBlock>
<TextBlock Grid.Row="3" Grid.Column="0">Tertiary</TextBlock> <TextBlock Grid.Row="4" Grid.Column="0">Tertiary</TextBlock>
<TextBlock Grid.Row="4" Grid.Column="0">Quaternary</TextBlock> <TextBlock Grid.Row="5" Grid.Column="0">Quaternary</TextBlock>
<TextBlock Grid.Row="5" Grid.Column="0">Success</TextBlock> <TextBlock Grid.Row="6" Grid.Column="0">Success</TextBlock>
<TextBlock Grid.Row="6" Grid.Column="0">Warning</TextBlock> <TextBlock Grid.Row="7" Grid.Column="0">Warning</TextBlock>
<TextBlock Grid.Row="7" Grid.Column="0">Danger</TextBlock> <TextBlock Grid.Row="8" Grid.Column="0">Danger</TextBlock>
<TextBlock Grid.Row="8" Grid.Column="0">Mark</TextBlock> <TextBlock Grid.Row="9" Grid.Column="0">Mark</TextBlock>
<TextBlock Grid.Row="9" Grid.Column="0">Code</TextBlock> <TextBlock Grid.Row="10" Grid.Column="0">Code</TextBlock>
<Label Grid.Row="1" Grid.Column="1">Text</Label> <Label Grid.Row="2" Grid.Column="1">Text</Label>
<Label <Label
Grid.Row="2" Grid.Row="3"
Grid.Column="1" Grid.Column="1"
Classes="Secondary"> Classes="Secondary">
Secondary Secondary
</Label> </Label>
<Label <Label
Grid.Row="3" Grid.Row="4"
Grid.Column="1" Grid.Column="1"
Classes="Tertiary"> Classes="Tertiary">
Tertiary Tertiary
</Label> </Label>
<Label <Label
Grid.Row="4" Grid.Row="5"
Grid.Column="1" Grid.Column="1"
Classes="Quaternary"> Classes="Quaternary">
Quaternary Quaternary
</Label> </Label>
<Label <Label
Grid.Row="5" Grid.Row="6"
Grid.Column="1" Grid.Column="1"
Classes="Success"> Classes="Success">
Success Success
</Label> </Label>
<Label <Label
Grid.Row="6" Grid.Row="7"
Grid.Column="1" Grid.Column="1"
Classes="Warning"> Classes="Warning">
Warning Warning
</Label> </Label>
<Label <Label
Grid.Row="7" Grid.Row="8"
Grid.Column="1" Grid.Column="1"
Classes="Danger"> Classes="Danger">
Danger Danger
</Label> </Label>
<Label <Label
Grid.Row="8" Grid.Row="9"
Grid.Column="1" Grid.Column="1"
Classes="Mark"> Classes="Mark">
Default Mark Default Mark
</Label> </Label>
<Label <Label
Grid.Row="9" Grid.Row="10"
Grid.Column="1" Grid.Column="1"
Classes="Code"> Classes="Code">
Code Code
@ -102,51 +104,51 @@
<Grid <Grid
VerticalAlignment="Top" VerticalAlignment="Top"
ColumnDefinitions="Auto, *" ColumnDefinitions="Auto, *"
RowDefinitions="*,*,*,*,*,*,*"> RowDefinitions="*,*,*,*,*,*,*,*">
<TextBlock Grid.Row="0" Grid.Column="0">Classes</TextBlock> <TextBlock Grid.Row="1" Grid.Column="0">Classes</TextBlock>
<TextBlock Grid.Row="1" Grid.Column="0">H1</TextBlock> <TextBlock Grid.Row="2" Grid.Column="0">H1</TextBlock>
<TextBlock Grid.Row="2" Grid.Column="0">H2</TextBlock> <TextBlock Grid.Row="3" Grid.Column="0">H2</TextBlock>
<TextBlock Grid.Row="3" Grid.Column="0">H3</TextBlock> <TextBlock Grid.Row="4" Grid.Column="0">H3</TextBlock>
<TextBlock Grid.Row="4" Grid.Column="0">H4</TextBlock> <TextBlock Grid.Row="5" Grid.Column="0">H4</TextBlock>
<TextBlock Grid.Row="5" Grid.Column="0">H5</TextBlock> <TextBlock Grid.Row="6" Grid.Column="0">H5</TextBlock>
<TextBlock Grid.Row="6" Grid.Column="0">H6</TextBlock> <TextBlock Grid.Row="7" Grid.Column="0">H6</TextBlock>
<Label <Label
Grid.Row="1" Grid.Row="2"
Grid.Column="1" Grid.Column="1"
Classes="H1" Classes="H1"
Theme="{StaticResource TitleLabel}"> Theme="{StaticResource TitleLabel}">
Header 1 Header 1
</Label> </Label>
<Label <Label
Grid.Row="2" Grid.Row="3"
Grid.Column="1" Grid.Column="1"
Classes="H2" Classes="H2"
Theme="{StaticResource TitleLabel}"> Theme="{StaticResource TitleLabel}">
Header 2 Header 2
</Label> </Label>
<Label <Label
Grid.Row="3" Grid.Row="4"
Grid.Column="1" Grid.Column="1"
Classes="H3" Classes="H3"
Theme="{StaticResource TitleLabel}"> Theme="{StaticResource TitleLabel}">
Header 3 Header 3
</Label> </Label>
<Label <Label
Grid.Row="4" Grid.Row="5"
Grid.Column="1" Grid.Column="1"
Classes="H4" Classes="H4"
Theme="{StaticResource TitleLabel}"> Theme="{StaticResource TitleLabel}">
Header 4 Header 4
</Label> </Label>
<Label <Label
Grid.Row="5" Grid.Row="6"
Grid.Column="1" Grid.Column="1"
Classes="H5" Classes="H5"
Theme="{StaticResource TitleLabel}"> Theme="{StaticResource TitleLabel}">
Header 5 Header 5
</Label> </Label>
<Label <Label
Grid.Row="6" Grid.Row="7"
Grid.Column="1" Grid.Column="1"
Classes="H6" Classes="H6"
Theme="{StaticResource TitleLabel}"> Theme="{StaticResource TitleLabel}">

8
demo/Semi.Avalonia.Demo/Pages/Overview.axaml.cs
View File

@ -9,7 +9,7 @@ public partial class Overview : UserControl
InitializeComponent(); InitializeComponent();
} }
public string MainInstall { get; set; } = "dotnet add package Semi.Avalonia --version 11.2.1.1"; public string MainInstall { get; set; } = "dotnet add package Semi.Avalonia --version 11.1.0";
public string MainStyle { get; set; } = public string MainStyle { get; set; } =
""" """
@ -20,7 +20,7 @@ public partial class Overview : UserControl
</Application.Styles> </Application.Styles>
"""; """;
public string ColorPickerInstall { get; set; } = "dotnet add package Semi.Avalonia.ColorPicker --version 11.2.1.1"; public string ColorPickerInstall { get; set; } = "dotnet add package Semi.Avalonia.ColorPicker --version 11.1.0";
public string ColorPickerStyle { get; set; } = public string ColorPickerStyle { get; set; } =
""" """
@ -29,7 +29,7 @@ public partial class Overview : UserControl
</Application.Styles> </Application.Styles>
"""; """;
public string DataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.DataGrid --version 11.2.1.1"; public string DataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.DataGrid --version 11.1.0";
public string DataGridStyle { get; set; } = public string DataGridStyle { get; set; } =
""" """
@ -38,7 +38,7 @@ public partial class Overview : UserControl
</Application.Styles> </Application.Styles>
"""; """;
public string TreeDataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.TreeDataGrid --version 11.0.10.1"; public string TreeDataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.TreeDataGrid --version 11.1.0";
public string TreeDataGridStyle { get; set; } = public string TreeDataGridStyle { get; set; } =
""" """

22
demo/Semi.Avalonia.Demo/Pages/PaletteDemo.axaml
View File

@ -17,11 +17,10 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceInclude Source="../Themes/ToggleSwitch.axaml" /> <ResourceInclude Source="../Themes/ToggleButton.axaml" />
<ResourceInclude Source="../Controls/ColorItemControl.axaml" /> <ResourceInclude Source="../Controls/ColorItemControl.axaml" />
<ResourceInclude Source="../Controls/ColorDetailControl.axaml" /> <ResourceInclude Source="../Controls/ColorDetailControl.axaml" />
<ResourceInclude Source="../Controls/FunctionalColorGroupControl.axaml" /> <ResourceInclude Source="../Controls/FunctionalColorGroupControl.axaml" />
<ResourceInclude Source="../Controls/ShadowGroupControl.axaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
@ -34,11 +33,11 @@
PanePlacement="Right"> PanePlacement="Right">
<SplitView.Pane> <SplitView.Pane>
<StackPanel> <StackPanel>
<ToggleSwitch <ToggleButton
Name="toggle" Name="toggle"
HorizontalAlignment="Right" HorizontalAlignment="Right"
IsChecked="True" IsChecked="True"
Theme="{DynamicResource SplitViewToggleSwitch}" /> Theme="{DynamicResource SplitViewToggleButton}" />
<Border IsVisible="{Binding #splitView.IsPaneOpen}" Theme="{DynamicResource CardBorder}"> <Border IsVisible="{Binding #splitView.IsPaneOpen}" Theme="{DynamicResource CardBorder}">
<Panel> <Panel>
<TextBlock <TextBlock
@ -116,6 +115,7 @@
<ItemsControl ItemsSource="{Binding FunctionalColors}"> <ItemsControl ItemsSource="{Binding FunctionalColors}">
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate> <DataTemplate>
<!-- -->
<controls:FunctionalColorGroupControl <controls:FunctionalColorGroupControl
Title="{Binding Title}" Title="{Binding Title}"
DarkColors="{Binding DarkColors}" DarkColors="{Binding DarkColors}"
@ -123,20 +123,8 @@
</DataTemplate> </DataTemplate>
</ItemsControl.ItemTemplate> </ItemsControl.ItemTemplate>
</ItemsControl> </ItemsControl>
<ItemsControl ItemsSource="{Binding Shadows}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<controls:ShadowGroupControl
Title="{Binding Title}"
DarkShadows="{Binding DarkShadows}"
LightShadows="{Binding LightShadows}" />
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>
</SplitView.Content> </SplitView.Content>
</SplitView> </SplitView>
</UserControl> </UserControl>

32
demo/Semi.Avalonia.Demo/Pages/PathIconDemo.axaml
View File

@ -7,30 +7,16 @@
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<StackPanel HorizontalAlignment="Left"> <StackPanel HorizontalAlignment="Left" >
<StackPanel Orientation="Horizontal"> <TextBlock Text="Size"></TextBlock>
<StackPanel.Styles> <Slider Name="width" Minimum="0" Maximum="100" Value="20" Width="300"></Slider>
<Style Selector="PathIcon"> <ToggleSwitch Name="active" Content="Active"></ToggleSwitch>
<Setter Property="Theme" Value="{DynamicResource InnerPathIcon}" />
<Setter Property="Data" Value="M10.5 2C5.80558 2 2 5.80558 2 10.5C2 15.1944 5.80558 19 10.5 19C12.3054 19 13.9794 18.4371 15.356 17.4773L19.4393 21.5606C20.0251 22.1464 20.9749 22.1464 21.5606 21.5606C22.1464 20.9749 22.1464 20.0251 21.5606 19.4393L17.4773 15.356C18.4371 13.9794 19 12.3054 19 10.5C19 5.80558 15.1944 2 10.5 2ZM5 10.5C5 7.46243 7.46243 5 10.5 5C13.5376 5 16 7.46243 16 10.5C16 13.5376 13.5376 16 10.5 16C7.46243 16 5 13.5376 5 10.5Z" />
</Style>
</StackPanel.Styles>
<PathIcon Classes="ExtraSmall" />
<PathIcon Classes="Small" />
<PathIcon />
<PathIcon Classes="Large" />
<PathIcon Classes="ExtraLarge" />
</StackPanel>
<TextBlock Text="Size" />
<Slider Name="width" Minimum="0" Maximum="100" Value="20" Width="300" />
<ToggleSwitch Name="active" Content="Active" />
<PathIcon <PathIcon
Classes.Active="{Binding #active.IsChecked}" Classes.Active="{Binding ElementName=active, Path=IsChecked}"
BorderBrush="{DynamicResource SemiRed6}"
Width="{Binding #width.Value}" Width="{Binding #width.Value}"
Height="{Binding #width.Value}" Height="{Binding #width.Value}"
Foreground="{DynamicResource SemiBlue6}" Data="M12 3L2 12H5V20H19V12H22L12 3M13 18H11V16H13V18M13 14H11V8H13V14Z"
BorderBrush="{DynamicResource SemiRed6}" Foreground="{DynamicResource SemiBlue6}" />
Data="M12 3L2 12H5V20H19V12H22L12 3M13 18H11V16H13V18M13 14H11V8H13V14Z" />
</StackPanel> </StackPanel>
</UserControl> </UserControl>

83
demo/Semi.Avalonia.Demo/Pages/SelectableTextBlock.axaml
View File

@ -4,13 +4,13 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="600" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"> <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel.Styles> <StackPanel.Styles>
<Style Selector="Grid > SelectableTextBlock"> <Style Selector="SelectableTextBlock">
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="4" /> <Setter Property="Margin" Value="4" />
</Style> </Style>
@ -25,76 +25,70 @@
<Grid <Grid
VerticalAlignment="Top" VerticalAlignment="Top"
ColumnDefinitions="Auto, *" ColumnDefinitions="Auto, *"
RowDefinitions="*,*,*,*,*,*,*,*,*,*,*"> RowDefinitions="*,*,*,*,*,*,*,*,*,*,*,*">
<Grid.Styles> <SelectableTextBlock Grid.Row="1" Grid.Column="0">Classes</SelectableTextBlock>
<Style Selector="SelectableTextBlock"> <SelectableTextBlock Grid.Row="2" Grid.Column="0">-</SelectableTextBlock>
<Setter Property="VerticalAlignment" Value="Center" /> <SelectableTextBlock Grid.Row="3" Grid.Column="0">Secondary</SelectableTextBlock>
<Setter Property="Margin" Value="4" /> <SelectableTextBlock Grid.Row="4" Grid.Column="0">Tertiary</SelectableTextBlock>
</Style> <SelectableTextBlock Grid.Row="5" Grid.Column="0">Quaternary</SelectableTextBlock>
</Grid.Styles> <SelectableTextBlock Grid.Row="6" Grid.Column="0">Success</SelectableTextBlock>
<SelectableTextBlock Grid.Row="0" Grid.Column="0">Classes</SelectableTextBlock> <SelectableTextBlock Grid.Row="7" Grid.Column="0">Warning</SelectableTextBlock>
<SelectableTextBlock Grid.Row="1" Grid.Column="0">-</SelectableTextBlock> <SelectableTextBlock Grid.Row="8" Grid.Column="0">Danger</SelectableTextBlock>
<SelectableTextBlock Grid.Row="2" Grid.Column="0">Secondary</SelectableTextBlock> <SelectableTextBlock Grid.Row="9" Grid.Column="0">Mark</SelectableTextBlock>
<SelectableTextBlock Grid.Row="3" Grid.Column="0">Tertiary</SelectableTextBlock> <SelectableTextBlock Grid.Row="10" Grid.Column="0">Underline</SelectableTextBlock>
<SelectableTextBlock Grid.Row="4" Grid.Column="0">Quaternary</SelectableTextBlock> <SelectableTextBlock Grid.Row="11" Grid.Column="0">Delete</SelectableTextBlock>
<SelectableTextBlock Grid.Row="5" Grid.Column="0">Success</SelectableTextBlock>
<SelectableTextBlock Grid.Row="6" Grid.Column="0">Warning</SelectableTextBlock>
<SelectableTextBlock Grid.Row="7" Grid.Column="0">Danger</SelectableTextBlock>
<SelectableTextBlock Grid.Row="8" Grid.Column="0">Mark</SelectableTextBlock>
<SelectableTextBlock Grid.Row="9" Grid.Column="0">Underline</SelectableTextBlock>
<SelectableTextBlock Grid.Row="10" Grid.Column="0">Delete</SelectableTextBlock>
<SelectableTextBlock Grid.Row="1" Grid.Column="1">Text</SelectableTextBlock> <SelectableTextBlock Grid.Row="2" Grid.Column="1">Text</SelectableTextBlock>
<SelectableTextBlock <SelectableTextBlock
Grid.Row="2" Grid.Row="3"
Grid.Column="1" Grid.Column="1"
Classes="Secondary"> Classes="Secondary">
Secondary Secondary
</SelectableTextBlock> </SelectableTextBlock>
<SelectableTextBlock <SelectableTextBlock
Grid.Row="3" Grid.Row="4"
Grid.Column="1" Grid.Column="1"
Classes="Tertiary"> Classes="Tertiary">
Tertiary Tertiary
</SelectableTextBlock> </SelectableTextBlock>
<SelectableTextBlock <SelectableTextBlock
Grid.Row="4" Grid.Row="5"
Grid.Column="1" Grid.Column="1"
Classes="Quaternary"> Classes="Quaternary">
Quaternary Quaternary
</SelectableTextBlock> </SelectableTextBlock>
<SelectableTextBlock <SelectableTextBlock
Grid.Row="5" Grid.Row="6"
Grid.Column="1" Grid.Column="1"
Classes="Success"> Classes="Success">
Success Success
</SelectableTextBlock> </SelectableTextBlock>
<SelectableTextBlock <SelectableTextBlock
Grid.Row="6" Grid.Row="7"
Grid.Column="1" Grid.Column="1"
Classes="Warning"> Classes="Warning">
Warning Warning
</SelectableTextBlock> </SelectableTextBlock>
<SelectableTextBlock <SelectableTextBlock
Grid.Row="7" Grid.Row="8"
Grid.Column="1" Grid.Column="1"
Classes="Danger"> Classes="Danger">
Danger Danger
</SelectableTextBlock> </SelectableTextBlock>
<SelectableTextBlock <SelectableTextBlock
Grid.Row="8" Grid.Row="9"
Grid.Column="1" Grid.Column="1"
Classes="Mark"> Classes="Mark">
Default Mark Default Mark
</SelectableTextBlock> </SelectableTextBlock>
<SelectableTextBlock <SelectableTextBlock
Grid.Row="9" Grid.Row="10"
Grid.Column="1" Grid.Column="1"
Classes="Underline"> Classes="Underline">
Underline Underline
</SelectableTextBlock> </SelectableTextBlock>
<SelectableTextBlock <SelectableTextBlock
Grid.Row="10" Grid.Row="11"
Grid.Column="1" Grid.Column="1"
Classes="Delete"> Classes="Delete">
Delete Delete
@ -110,52 +104,53 @@
Theme="{DynamicResource GroupBox}"> Theme="{DynamicResource GroupBox}">
<Grid <Grid
VerticalAlignment="Top" VerticalAlignment="Top"
Background="{Binding}"
ColumnDefinitions="Auto, *" ColumnDefinitions="Auto, *"
RowDefinitions="*,*,*,*,*,*,*"> RowDefinitions="*,*,*,*,*,*,*,*">
<SelectableTextBlock Grid.Row="0" Grid.Column="0">Classes</SelectableTextBlock> <SelectableTextBlock Grid.Row="1" Grid.Column="0">Classes</SelectableTextBlock>
<SelectableTextBlock Grid.Row="1" Grid.Column="0">H1</SelectableTextBlock> <SelectableTextBlock Grid.Row="2" Grid.Column="0">H1</SelectableTextBlock>
<SelectableTextBlock Grid.Row="2" Grid.Column="0">H2</SelectableTextBlock> <SelectableTextBlock Grid.Row="3" Grid.Column="0">H2</SelectableTextBlock>
<SelectableTextBlock Grid.Row="3" Grid.Column="0">H3</SelectableTextBlock> <SelectableTextBlock Grid.Row="4" Grid.Column="0">H3</SelectableTextBlock>
<SelectableTextBlock Grid.Row="4" Grid.Column="0">H4</SelectableTextBlock> <SelectableTextBlock Grid.Row="5" Grid.Column="0">H4</SelectableTextBlock>
<SelectableTextBlock Grid.Row="5" Grid.Column="0">H5</SelectableTextBlock> <SelectableTextBlock Grid.Row="6" Grid.Column="0">H5</SelectableTextBlock>
<SelectableTextBlock Grid.Row="6" Grid.Column="0">H6</SelectableTextBlock> <SelectableTextBlock Grid.Row="7" Grid.Column="0">H6</SelectableTextBlock>
<SelectableTextBlock <SelectableTextBlock
Grid.Row="1" Grid.Row="2"
Grid.Column="1" Grid.Column="1"
Classes="H1" Classes="H1"
Theme="{StaticResource TitleSelectableTextBlock}"> Theme="{StaticResource TitleSelectableTextBlock}">
Header 1 Header 1
</SelectableTextBlock> </SelectableTextBlock>
<SelectableTextBlock <SelectableTextBlock
Grid.Row="2" Grid.Row="3"
Grid.Column="1" Grid.Column="1"
Classes="H2" Classes="H2"
Theme="{StaticResource TitleSelectableTextBlock}"> Theme="{StaticResource TitleSelectableTextBlock}">
Header 2 Header 2
</SelectableTextBlock> </SelectableTextBlock>
<SelectableTextBlock <SelectableTextBlock
Grid.Row="3" Grid.Row="4"
Grid.Column="1" Grid.Column="1"
Classes="H3" Classes="H3"
Theme="{StaticResource TitleSelectableTextBlock}"> Theme="{StaticResource TitleSelectableTextBlock}">
Header 3 Header 3
</SelectableTextBlock> </SelectableTextBlock>
<SelectableTextBlock <SelectableTextBlock
Grid.Row="4" Grid.Row="5"
Grid.Column="1" Grid.Column="1"
Classes="H4" Classes="H4"
Theme="{StaticResource TitleSelectableTextBlock}"> Theme="{StaticResource TitleSelectableTextBlock}">
Header 4 Header 4
</SelectableTextBlock> </SelectableTextBlock>
<SelectableTextBlock <SelectableTextBlock
Grid.Row="5" Grid.Row="6"
Grid.Column="1" Grid.Column="1"
Classes="H5" Classes="H5"
Theme="{StaticResource TitleSelectableTextBlock}"> Theme="{StaticResource TitleSelectableTextBlock}">
Header 5 Header 5
</SelectableTextBlock> </SelectableTextBlock>
<SelectableTextBlock <SelectableTextBlock
Grid.Row="6" Grid.Row="7"
Grid.Column="1" Grid.Column="1"
Classes="H6" Classes="H6"
Theme="{StaticResource TitleSelectableTextBlock}"> Theme="{StaticResource TitleSelectableTextBlock}">

15
demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml
View File

@ -114,9 +114,20 @@
ItemsSource="{Binding Songs}" /> ItemsSource="{Binding Songs}" />
<ToggleSwitch <ToggleSwitch
Grid.Row="2" Grid.Row="2"
Theme="{DynamicResource SplitViewToggleSwitch}" Theme="{DynamicResource ButtonToggleSwitch}"
HorizontalAlignment="Left"
IsChecked="{Binding #SplitView.IsPaneOpen}"> IsChecked="{Binding #SplitView.IsPaneOpen}">
<ToggleSwitch.OnContent>
<PathIcon
Width="16"
Height="16"
Data="{StaticResource NavigationMenuExpandIconGlyph}" />
</ToggleSwitch.OnContent>
<ToggleSwitch.OffContent>
<PathIcon
Width="16"
Height="16"
Data="{StaticResource NavigationMenuExpandIconGlyph}" />
</ToggleSwitch.OffContent>
</ToggleSwitch> </ToggleSwitch>
</Grid> </Grid>
</SplitView.Pane> </SplitView.Pane>

75
demo/Semi.Avalonia.Demo/Pages/TextBlockDemo.axaml
View File

@ -10,7 +10,7 @@
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"> <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel.Styles> <StackPanel.Styles>
<Style Selector="Grid > TextBlock"> <Style Selector="TextBlock">
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="4" /> <Setter Property="Margin" Value="4" />
</Style> </Style>
@ -25,70 +25,70 @@
<Grid <Grid
VerticalAlignment="Top" VerticalAlignment="Top"
ColumnDefinitions="Auto, *" ColumnDefinitions="Auto, *"
RowDefinitions="*,*,*,*,*,*,*,*,*,*,*"> RowDefinitions="*,*,*,*,*,*,*,*,*,*,*,*">
<TextBlock Grid.Row="0" Grid.Column="0">Classes</TextBlock> <TextBlock Grid.Row="1" Grid.Column="0">Classes</TextBlock>
<TextBlock Grid.Row="1" Grid.Column="0">-</TextBlock> <TextBlock Grid.Row="2" Grid.Column="0">-</TextBlock>
<TextBlock Grid.Row="2" Grid.Column="0">Secondary</TextBlock> <TextBlock Grid.Row="3" Grid.Column="0">Secondary</TextBlock>
<TextBlock Grid.Row="3" Grid.Column="0">Tertiary</TextBlock> <TextBlock Grid.Row="4" Grid.Column="0">Tertiary</TextBlock>
<TextBlock Grid.Row="4" Grid.Column="0">Quaternary</TextBlock> <TextBlock Grid.Row="5" Grid.Column="0">Quaternary</TextBlock>
<TextBlock Grid.Row="5" Grid.Column="0">Success</TextBlock> <TextBlock Grid.Row="6" Grid.Column="0">Success</TextBlock>
<TextBlock Grid.Row="6" Grid.Column="0">Warning</TextBlock> <TextBlock Grid.Row="7" Grid.Column="0">Warning</TextBlock>
<TextBlock Grid.Row="7" Grid.Column="0">Danger</TextBlock> <TextBlock Grid.Row="8" Grid.Column="0">Danger</TextBlock>
<TextBlock Grid.Row="8" Grid.Column="0">Mark</TextBlock> <TextBlock Grid.Row="9" Grid.Column="0">Mark</TextBlock>
<TextBlock Grid.Row="9" Grid.Column="0">Underline</TextBlock> <TextBlock Grid.Row="10" Grid.Column="0">Underline</TextBlock>
<TextBlock Grid.Row="10" Grid.Column="0">Delete</TextBlock> <TextBlock Grid.Row="11" Grid.Column="0">Delete</TextBlock>
<TextBlock Grid.Row="1" Grid.Column="1">Text</TextBlock> <TextBlock Grid.Row="2" Grid.Column="1">Text</TextBlock>
<TextBlock <TextBlock
Grid.Row="2" Grid.Row="3"
Grid.Column="1" Grid.Column="1"
Classes="Secondary"> Classes="Secondary">
Secondary Secondary
</TextBlock> </TextBlock>
<TextBlock <TextBlock
Grid.Row="3" Grid.Row="4"
Grid.Column="1" Grid.Column="1"
Classes="Tertiary"> Classes="Tertiary">
Tertiary Tertiary
</TextBlock> </TextBlock>
<TextBlock <TextBlock
Grid.Row="4" Grid.Row="5"
Grid.Column="1" Grid.Column="1"
Classes="Quaternary"> Classes="Quaternary">
Quaternary Quaternary
</TextBlock> </TextBlock>
<TextBlock <TextBlock
Grid.Row="5" Grid.Row="6"
Grid.Column="1" Grid.Column="1"
Classes="Success"> Classes="Success">
Success Success
</TextBlock> </TextBlock>
<TextBlock <TextBlock
Grid.Row="6" Grid.Row="7"
Grid.Column="1" Grid.Column="1"
Classes="Warning"> Classes="Warning">
Warning Warning
</TextBlock> </TextBlock>
<TextBlock <TextBlock
Grid.Row="7" Grid.Row="8"
Grid.Column="1" Grid.Column="1"
Classes="Danger"> Classes="Danger">
Danger Danger
</TextBlock> </TextBlock>
<TextBlock <TextBlock
Grid.Row="8" Grid.Row="9"
Grid.Column="1" Grid.Column="1"
Classes="Mark"> Classes="Mark">
Default Mark Default Mark
</TextBlock> </TextBlock>
<TextBlock <TextBlock
Grid.Row="9" Grid.Row="10"
Grid.Column="1" Grid.Column="1"
Classes="Underline"> Classes="Underline">
Underline Underline
</TextBlock> </TextBlock>
<TextBlock <TextBlock
Grid.Row="10" Grid.Row="11"
Grid.Column="1" Grid.Column="1"
Classes="Delete"> Classes="Delete">
Delete Delete
@ -105,57 +105,58 @@
<Grid <Grid
VerticalAlignment="Top" VerticalAlignment="Top"
ColumnDefinitions="Auto, *" ColumnDefinitions="Auto, *"
RowDefinitions="*,*,*,*,*,*,*"> RowDefinitions="*,*,*,*,*,*,*,*">
<TextBlock Grid.Row="0" Grid.Column="0">Classes</TextBlock> <TextBlock Grid.Row="1" Grid.Column="0">Classes</TextBlock>
<TextBlock Grid.Row="1" Grid.Column="0">H1</TextBlock> <TextBlock Grid.Row="2" Grid.Column="0">H1</TextBlock>
<TextBlock Grid.Row="2" Grid.Column="0">H2</TextBlock> <TextBlock Grid.Row="3" Grid.Column="0">H2</TextBlock>
<TextBlock Grid.Row="3" Grid.Column="0">H3</TextBlock> <TextBlock Grid.Row="4" Grid.Column="0">H3</TextBlock>
<TextBlock Grid.Row="4" Grid.Column="0">H4</TextBlock> <TextBlock Grid.Row="5" Grid.Column="0">H4</TextBlock>
<TextBlock Grid.Row="5" Grid.Column="0">H5</TextBlock> <TextBlock Grid.Row="6" Grid.Column="0">H5</TextBlock>
<TextBlock Grid.Row="6" Grid.Column="0">H6</TextBlock> <TextBlock Grid.Row="7" Grid.Column="0">H6</TextBlock>
<TextBlock <TextBlock
Grid.Row="1" Grid.Row="2"
Grid.Column="1" Grid.Column="1"
Classes="H1" Classes="H1"
Theme="{StaticResource TitleTextBlock}"> Theme="{StaticResource TitleTextBlock}">
Header 1 Header 1
</TextBlock> </TextBlock>
<TextBlock <TextBlock
Grid.Row="2" Grid.Row="3"
Grid.Column="1" Grid.Column="1"
Classes="H2" Classes="H2"
Theme="{StaticResource TitleTextBlock}"> Theme="{StaticResource TitleTextBlock}">
Header 2 Header 2
</TextBlock> </TextBlock>
<TextBlock <TextBlock
Grid.Row="3" Grid.Row="4"
Grid.Column="1" Grid.Column="1"
Classes="H3" Classes="H3"
Theme="{StaticResource TitleTextBlock}"> Theme="{StaticResource TitleTextBlock}">
Header 3 Header 3
</TextBlock> </TextBlock>
<TextBlock <TextBlock
Grid.Row="4" Grid.Row="5"
Grid.Column="1" Grid.Column="1"
Classes="H4" Classes="H4"
Theme="{StaticResource TitleTextBlock}"> Theme="{StaticResource TitleTextBlock}">
Header 4 Header 4
</TextBlock> </TextBlock>
<TextBlock <TextBlock
Grid.Row="5" Grid.Row="6"
Grid.Column="1" Grid.Column="1"
Classes="H5" Classes="H5"
Theme="{StaticResource TitleTextBlock}"> Theme="{StaticResource TitleTextBlock}">
Header 5 Header 5
</TextBlock> </TextBlock>
<TextBlock <TextBlock
Grid.Row="6" Grid.Row="7"
Grid.Column="1" Grid.Column="1"
Classes="H6" Classes="H6"
Theme="{StaticResource TitleTextBlock}"> Theme="{StaticResource TitleTextBlock}">
Header 6 Header 6
</TextBlock> </TextBlock>
</Grid> </Grid>
</HeaderedContentControl> </HeaderedContentControl>
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>

83
demo/Semi.Avalonia.Demo/Pages/ToggleSwitchDemo.axaml
View File

@ -8,23 +8,22 @@
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<StackPanel Spacing="8" Margin="20"> <StackPanel Spacing="8" Margin="20">
<StackPanel Orientation="Horizontal"> <ToggleSwitch
<StackPanel> Content="Content"
<ToggleSwitch /> OffContent="OffContent"
<ToggleSwitch IsChecked="True" /> OnContent="OnContent" />
</StackPanel> <ToggleSwitch
<StackPanel> Content="Content"
<ToggleSwitch IsEnabled="False" /> IsChecked="True"
<ToggleSwitch IsChecked="True" IsEnabled="False" /> IsEnabled="False"
</StackPanel> OffContent="OffContent"
</StackPanel> OnContent="OnContent" />
<StackPanel Orientation="Horizontal"> <ToggleSwitch
<ToggleSwitch Content="Switch" OnContent="Yes" OffContent="No" /> Content="Content"
<ToggleSwitch Content="Switch" OnContent="Yes" OffContent="No" IsChecked="True"/> IsChecked="False"
<ToggleSwitch Content="Switch" OnContent="Yes" OffContent="No" IsEnabled="False" /> IsEnabled="False"
<ToggleSwitch Content="Switch" OnContent="Yes" OffContent="No" IsEnabled="False" IsChecked="True" /> OffContent="OffContent"
</StackPanel> OnContent="OnContent" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" Classes="Small" /> <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" Classes="Small" />
<ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" Classes="Small" IsChecked="True" /> <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" Classes="Small" IsChecked="True" />
@ -45,8 +44,8 @@
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" OffContent="关" OnContent="开" /> <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" OffContent="关" OnContent="开"/>
<ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" OffContent="〇" OnContent="｜" /> <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" OffContent="〇" OnContent="｜"/>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" OffContent="关" OnContent="开" IsChecked="True" /> <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" OffContent="关" OnContent="开" IsChecked="True" />
@ -61,35 +60,21 @@
<ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" OffContent="〇" OnContent="｜" Classes="Large" IsChecked="True" /> <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" OffContent="〇" OnContent="｜" Classes="Large" IsChecked="True" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <ToggleSwitch Theme="{DynamicResource ButtonToggleSwitch}">
<ToggleSwitch <ToggleSwitch.OnContent>
HorizontalAlignment="Left" <PathIcon
Padding="8" Width="16"
Theme="{DynamicResource ButtonToggleSwitch}" Height="16"
Foreground="{DynamicResource ButtonDefaultTertiaryForeground}"> Data="M3.55 19.09L4.96 20.5L6.76 18.71L5.34 17.29M12 6C8.69 6 6 8.69 6 12S8.69 18 12 18 18 15.31 18 12C18 8.68 15.31 6 12 6M20 13H23V11H20M17.24 18.71L19.04 20.5L20.45 19.09L18.66 17.29M20.45 5L19.04 3.6L17.24 5.39L18.66 6.81M13 1H11V4H13M6.76 5.39L4.96 3.6L3.55 5L5.34 6.81L6.76 5.39M1 13H4V11H1M13 20H11V23H13"
<ToggleSwitch.Content> Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
<PathIcon </ToggleSwitch.OnContent>
Theme="{DynamicResource InnerPathIcon}" <ToggleSwitch.OffContent>
Data="M5 2H19C20.6569 2 22 3.34315 22 5V19C22 20.6569 20.6569 22 19 22H5C3.34315 22 2 20.6569 2 19V5C2 3.34315 3.34315 2 5 2ZM6 4C5.44772 4 5 4.44772 5 5V19C5 19.5523 5.44772 20 6 20H9C9.55229 20 10 19.5523 10 19V5C10 4.44772 9.55229 4 9 4H6Z" /> <PathIcon
</ToggleSwitch.Content> Width="16"
</ToggleSwitch> Height="16"
<ToggleSwitch Data="M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17 15C17.476 15 17.9408 14.9525 18.3901 14.862C17.296 17.3011 14.8464 19 12 19C8.13401 19 5 15.866 5 12C5 8.60996 7.40983 5.78277 10.6099 5.13803C10.218 6.01173 10 6.98041 10 8C10 11.866 13.134 15 17 15Z"
HorizontalAlignment="Left" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
Padding="8" </ToggleSwitch.OffContent>
Theme="{DynamicResource ButtonToggleSwitch}" </ToggleSwitch>
Foreground="{DynamicResource ButtonDefaultTertiaryForeground}">
<ToggleSwitch.OnContent>
<PathIcon
Theme="{DynamicResource InnerPathIcon}"
Data="M3.55 19.09L4.96 20.5L6.76 18.71L5.34 17.29M12 6C8.69 6 6 8.69 6 12S8.69 18 12 18 18 15.31 18 12C18 8.68 15.31 6 12 6M20 13H23V11H20M17.24 18.71L19.04 20.5L20.45 19.09L18.66 17.29M20.45 5L19.04 3.6L17.24 5.39L18.66 6.81M13 1H11V4H13M6.76 5.39L4.96 3.6L3.55 5L5.34 6.81L6.76 5.39M1 13H4V11H1M13 20H11V23H13" />
</ToggleSwitch.OnContent>
<ToggleSwitch.OffContent>
<PathIcon
Theme="{DynamicResource InnerPathIcon}"
Data="M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17 15C17.476 15 17.9408 14.9525 18.3901 14.862C17.296 17.3011 14.8464 19 12 19C8.13401 19 5 15.866 5 12C5 8.60996 7.40983 5.78277 10.6099 5.13803C10.218 6.01173 10 6.98041 10 8C10 11.866 13.134 15 17 15Z" />
</ToggleSwitch.OffContent>
</ToggleSwitch>
</StackPanel>
</StackPanel> </StackPanel>
</UserControl> </UserControl>

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

@ -14,7 +14,7 @@
<PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" /> <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
<!--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="$(AvaloniaVersion)" /> <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="$(CommunityToolkitVersion)" /> <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

15
demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml
View File

@ -1,6 +1,6 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ControlTheme x:Key="NavigationTab" TargetType="TabControl"> <ControlTheme x:Key="NavigationTab" TargetType="TabControl">
<Setter Property="Template"> <Setter Property="TabControl.Template">
<ControlTemplate TargetType="TabControl"> <ControlTemplate TargetType="TabControl">
<Border <Border
HorizontalAlignment="{TemplateBinding HorizontalAlignment}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
@ -10,10 +10,7 @@
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}"> CornerRadius="{TemplateBinding CornerRadius}">
<DockPanel> <DockPanel>
<ScrollViewer <ScrollViewer DockPanel.Dock="Left" VerticalScrollBarVisibility="Auto">
DockPanel.Dock="Left"
Name="PART_ScrollViewer"
VerticalScrollBarVisibility="Auto">
<Panel DockPanel.Dock="{TemplateBinding TabStripPlacement}"> <Panel DockPanel.Dock="{TemplateBinding TabStripPlacement}">
<ItemsPresenter Name="PART_ItemsPresenter"> <ItemsPresenter Name="PART_ItemsPresenter">
<ItemsPresenter.ItemsPanel> <ItemsPresenter.ItemsPanel>
@ -22,8 +19,7 @@
</ItemsPanelTemplate> </ItemsPanelTemplate>
</ItemsPresenter.ItemsPanel> </ItemsPresenter.ItemsPanel>
</ItemsPresenter> </ItemsPresenter>
<Border Name="PART_BorderSeparator" <Border Name="PART_BorderSeparator" Background="{DynamicResource TabItemLinePipePressedBorderBrush}" />
Background="{DynamicResource TabItemLinePipePressedBorderBrush}" />
</Panel> </Panel>
</ScrollViewer> </ScrollViewer>
<ContentPresenter <ContentPresenter
@ -42,8 +38,5 @@
<Setter Property="VerticalAlignment" Value="Stretch" /> <Setter Property="VerticalAlignment" Value="Stretch" />
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
</Style> </Style>
<Style Selector="^.Dismiss /template/ ScrollViewer#PART_ScrollViewer">
<Setter Property="IsVisible" Value="False" />
</Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

26
demo/Semi.Avalonia.Demo/Themes/ToggleButton.axaml Normal file
View File

@ -0,0 +1,26 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ControlTheme x:Key="SplitViewToggleButton" TargetType="ToggleButton">
<Setter Property="ToggleButton.Template">
<ControlTemplate TargetType="ToggleButton">
<Border
Name="Background"
Padding="8"
Background="{TemplateBinding Background}"
CornerRadius="3">
<PathIcon
Name="Icon"
Width="16"
Height="16"
Data="M5 2H19C20.6569 2 22 3.34315 22 5V19C22 20.6569 20.6569 22 19 22H5C3.34315 22 2 20.6569 2 19V5C2 3.34315 3.34315 2 5 2ZM6 4C5.44772 4 5 4.44772 5 5V19C5 19.5523 5.44772 20 6 20H9C9.55229 20 10 19.5523 10 19V5C10 4.44772 9.55229 4 9 4H6Z"
Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
</Border>
</ControlTemplate>
</Setter>
<Style Selector="^:pointerover">
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
</Style>
<Style Selector="^:pressed">
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
</Style>
</ControlTheme>
</ResourceDictionary>

31
demo/Semi.Avalonia.Demo/Themes/ToggleSwitch.axaml
View File

@ -1,31 +0,0 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ControlTheme x:Key="ThemeToggleSwitch"
BasedOn="{StaticResource ButtonToggleSwitch}"
TargetType="ToggleSwitch">
<Setter Property="Padding" Value="8" />
<Setter Property="OnContent" Value="{Binding $self.Content}" />
<Setter Property="OnContentTemplate">
<DataTemplate>
<PathIcon Theme="{StaticResource InnerPathIcon}" Data="{Binding}" />
</DataTemplate>
</Setter>
<Setter Property="OffContent" Value="{Binding $self.Content}" />
<Setter Property="OffContentTemplate">
<DataTemplate>
<PathIcon Theme="{StaticResource InnerPathIcon}" Data="{Binding}" />
</DataTemplate>
</Setter>
<Setter Property="ContentTemplate">
<DataTemplate>
<PathIcon Theme="{StaticResource InnerPathIcon}" Data="{Binding}" />
</DataTemplate>
</Setter>
</ControlTheme>
<ControlTheme x:Key="SplitViewToggleSwitch"
BasedOn="{StaticResource ThemeToggleSwitch}"
TargetType="ToggleSwitch">
<Setter Property="Content"
Value="M5 2H19C20.6569 2 22 3.34315 22 5V19C22 20.6569 20.6569 22 19 22H5C3.34315 22 2 20.6569 2 19V5C2 3.34315 3.34315 2 5 2ZM6 4C5.44772 4 5 4.44772 5 5V19C5 19.5523 5.44772 20 6 20H9C9.55229 20 10 19.5523 10 19V5C10 4.44772 9.55229 4 9 4H6Z" />
</ControlTheme>
</ResourceDictionary>

304
demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs
View File

@ -2,25 +2,25 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using Avalonia.Media; using Avalonia.Media;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.Mvvm.Messaging;
namespace Semi.Avalonia.Demo.ViewModels; namespace Semi.Avalonia.Demo.ViewModels;
public class PaletteDemoViewModel : ObservableObject public class PaletteDemoViewModel: ObservableObject
{ {
private readonly string[] _predefinedColorNames = private readonly string[] _predefinedColorNames =
[ {
"Red", "Pink", "Purple", "Violet", "Indigo", "Red", "Pink", "Purple", "Violet", "Indigo",
"Blue", "LightBlue", "Cyan", "Teal", "Green", "Blue", "LightBlue", "Cyan", "Teal", "Green",
"LightGreen", "Lime", "Yellow", "Amber", "Orange", "LightGreen", "Lime", "Yellow", "Amber", "Orange",
"Grey" "Grey"
]; };
private readonly IResourceDictionary? _lightResourceDictionary; private readonly IResourceDictionary? _lightResourceDictionary;
private readonly IResourceDictionary? _darkResourceDictionary; private readonly IResourceDictionary? _darkResourceDictionary;
private ColorItemViewModel _selectedColor = null!; private ColorItemViewModel _selectedColor = null!;
public ColorItemViewModel SelectedColor public ColorItemViewModel SelectedColor
@ -28,30 +28,26 @@ public class PaletteDemoViewModel : ObservableObject
get => _selectedColor; get => _selectedColor;
set => SetProperty(ref _selectedColor, value); set => SetProperty(ref _selectedColor, value);
} }
private ObservableCollection<ColorListViewModel>? _lightLists; private ObservableCollection<ColorListViewModel>? _lightLists;
public ObservableCollection<ColorListViewModel>? LightLists public ObservableCollection<ColorListViewModel>? LightLists
{ {
get => _lightLists; get => _lightLists;
set => SetProperty(ref _lightLists, value); set => SetProperty(ref _lightLists, value);
} }
private ObservableCollection<ColorListViewModel>? _darkLists; private ObservableCollection<ColorListViewModel>? _darkLists;
public ObservableCollection<ColorListViewModel>? DarkLists public ObservableCollection<ColorListViewModel>? DarkLists
{ {
get => _darkLists; get => _darkLists;
set => SetProperty(ref _darkLists, value); set => SetProperty(ref _darkLists, value);
} }
public ObservableCollection<FunctionalColorGroupViewModel> FunctionalColors { get; set; } = []; public ObservableCollection<FunctionalColorGroupViewModel> FunctionalColors { get; set; } = new();
public ObservableCollection<ShadowGroupViewModel> Shadows { get; set; } = [];
public PaletteDemoViewModel() public PaletteDemoViewModel()
{ {
_lightResourceDictionary = new Light.Palette(); _lightResourceDictionary = new Light.Palette();
_darkResourceDictionary = new Dark.Palette(); _darkResourceDictionary = new Dark.Palette();
WeakReferenceMessenger.Default.Register<PaletteDemoViewModel, ColorItemViewModel>(this, OnClickColorItem); WeakReferenceMessenger.Default.Register<PaletteDemoViewModel, ColorItemViewModel>(this, OnClickColorItem);
} }
@ -60,20 +56,18 @@ public class PaletteDemoViewModel : ObservableObject
{ {
InitializePalette(); InitializePalette();
InitializeFunctionalColors(); InitializeFunctionalColors();
InitializeShadows();
} }
private void InitializePalette() private void InitializePalette()
{ {
LightLists = []; LightLists = new ObservableCollection<ColorListViewModel>();
foreach (var color in _predefinedColorNames) foreach (var color in _predefinedColorNames)
{ {
ColorListViewModel s = new ColorListViewModel(); ColorListViewModel s = new ColorListViewModel();
s.Initialize(_lightResourceDictionary, color, true); s.Initialize(_lightResourceDictionary, color, true);
LightLists.Add(s); LightLists.Add(s);
} }
DarkLists = new ObservableCollection<ColorListViewModel>();
DarkLists = [];
foreach (var color in _predefinedColorNames) foreach (var color in _predefinedColorNames)
{ {
ColorListViewModel s = new ColorListViewModel(); ColorListViewModel s = new ColorListViewModel();
@ -98,19 +92,13 @@ public class PaletteDemoViewModel : ObservableObject
FunctionalColors.Add(new FunctionalColorGroupViewModel("Border", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.BorderTokens)); FunctionalColors.Add(new FunctionalColorGroupViewModel("Border", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.BorderTokens));
FunctionalColors.Add(new FunctionalColorGroupViewModel("Disabled", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.DisabledTokens)); FunctionalColors.Add(new FunctionalColorGroupViewModel("Disabled", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.DisabledTokens));
} }
private void InitializeShadows()
{
Shadows.Add(new ShadowGroupViewModel("Shadow", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.ShadowTokens));
}
private void OnClickColorItem(PaletteDemoViewModel vm, ColorItemViewModel item) private void OnClickColorItem(PaletteDemoViewModel vm, ColorItemViewModel item)
{ {
SelectedColor = item; SelectedColor = item;
} }
} }
public class ColorListViewModel : ObservableObject public class ColorListViewModel: ObservableObject
{ {
private ObservableCollection<ColorItemViewModel>? _colors; private ObservableCollection<ColorItemViewModel>? _colors;
@ -127,18 +115,17 @@ public class ColorListViewModel : ObservableObject
get => _seriesName; get => _seriesName;
set => SetProperty(ref _seriesName, value); set => SetProperty(ref _seriesName, value);
} }
internal void Initialize(IResourceDictionary? resourceDictionary, string color, bool light) internal void Initialize(IResourceDictionary? resourceDictionary, string color, bool light)
{ {
if (resourceDictionary is null) if (resourceDictionary is null)
{ {
return; return;
} }
SeriesName = color; SeriesName = color;
Color = []; Color = new ObservableCollection<ColorItemViewModel>();
for (var i = 0; i < 10; i++) for (int i = 0; i < 10; i++)
{ {
var key = "Semi" + color + i; var key = "Semi" + color + i;
if (resourceDictionary.TryGetValue(key, out var value)) if (resourceDictionary.TryGetValue(key, out var value))
@ -149,7 +136,7 @@ public class ColorListViewModel : ObservableObject
var item = new ColorItemViewModel(name, brush, key, light, i); var item = new ColorItemViewModel(name, brush, key, light, i);
item.ColorResourceKey = item.ResourceKey + "Color"; item.ColorResourceKey = item.ResourceKey + "Color";
Color.Add(item); Color.Add(item);
} }
} }
} }
} }
@ -157,16 +144,15 @@ public class ColorListViewModel : ObservableObject
public class ColorItemViewModel : ObservableObject public class ColorItemViewModel : ObservableObject
{ {
private IBrush _brush = null!;
private IBrush _brush = null!;
public IBrush Brush public IBrush Brush
{ {
get => _brush; get => _brush;
set => SetProperty(ref _brush, value); set => SetProperty(ref _brush, value);
} }
private IBrush _textBrush = null!; private IBrush _textBrush = null!;
public IBrush TextBrush public IBrush TextBrush
{ {
get => _textBrush; get => _textBrush;
@ -174,7 +160,6 @@ public class ColorItemViewModel : ObservableObject
} }
private string _colorDisplayName = null!; private string _colorDisplayName = null!;
public string ColorDisplayName public string ColorDisplayName
{ {
get => _colorDisplayName; get => _colorDisplayName;
@ -204,9 +189,8 @@ public class ColorItemViewModel : ObservableObject
get => _hex; get => _hex;
set => SetProperty(ref _hex, value); set => SetProperty(ref _hex, value);
} }
public ColorItemViewModel(string colorDisplayName, ISolidColorBrush brush, string resourceKey, bool light, public ColorItemViewModel(string colorDisplayName, ISolidColorBrush brush, string resourceKey, bool light, int index)
int index)
{ {
ColorDisplayName = colorDisplayName; ColorDisplayName = colorDisplayName;
Brush = brush; Brush = brush;
@ -226,22 +210,22 @@ public class ColorItemViewModel : ObservableObject
public class FunctionalColorGroupViewModel : ObservableObject public class FunctionalColorGroupViewModel : ObservableObject
{ {
private string _title = null!; private string _title = null!;
public string Title public string Title
{ {
get => _title; get => _title;
set => SetProperty(ref _title, value); set => SetProperty(ref _title, value);
} }
public ObservableCollection<ColorItemViewModel> LightColors { get; set; } = []; public ObservableCollection<ColorItemViewModel> LightColors { get; set; } = new();
public ObservableCollection<ColorItemViewModel> DarkColors { get; set; } = []; public ObservableCollection<ColorItemViewModel> DarkColors { get; set; } = new();
public FunctionalColorGroupViewModel(string title, IResourceDictionary? lightDictionary, public FunctionalColorGroupViewModel(string title, IResourceDictionary? lightDictionary, IResourceDictionary? darkDictionary, IReadOnlyList<Tuple<string, string>> tokens)
IResourceDictionary? darkDictionary, IReadOnlyList<Tuple<string, string>> tokens)
{ {
Title = title; Title = title;
foreach (var (key, name) in tokens) foreach (var token in tokens)
{ {
string key = token.Item1;
string name = token.Item2;
if (lightDictionary?.TryGetValue(key, out var lightValue) ?? false) if (lightDictionary?.TryGetValue(key, out var lightValue) ?? false)
{ {
if (lightValue is ISolidColorBrush lightBrush) if (lightValue is ISolidColorBrush lightBrush)
@ -261,203 +245,125 @@ public class FunctionalColorGroupViewModel : ObservableObject
} }
} }
public class ShadowItemViewModel : ObservableObject
{
private string _shadowDisplayName = null!;
public string ShadowDisplayName
{
get => _shadowDisplayName;
set => SetProperty(ref _shadowDisplayName, value);
}
private string _resourceKey = null!;
public string ResourceKey
{
get => _resourceKey;
set => SetProperty(ref _resourceKey, value);
}
private string _boxShadowValue = null!;
public string BoxShadowValue
{
get => _boxShadowValue;
set => SetProperty(ref _boxShadowValue, value);
}
public ShadowItemViewModel(string shadowDisplayName, BoxShadows boxShadows, string resourceKey)
{
ShadowDisplayName = shadowDisplayName;
ResourceKey = resourceKey;
BoxShadowValue = boxShadows.ToString();
}
}
public class ShadowGroupViewModel : ObservableObject
{
private string _title = null!;
public string Title
{
get => _title;
set => SetProperty(ref _title, value);
}
public ObservableCollection<ShadowItemViewModel> LightShadows { get; set; } = [];
public ObservableCollection<ShadowItemViewModel> DarkShadows { get; set; } = [];
public ShadowGroupViewModel(string title, IResourceDictionary? lightDictionary,
IResourceDictionary? darkDictionary, IReadOnlyList<Tuple<string, string>> tokens)
{
Title = title;
foreach (var (key, name) in tokens)
{
if (lightDictionary?.TryGetValue(key, out var lightValue) ?? false)
{
if (lightValue is BoxShadows lightShadow)
{
LightShadows.Add(new ShadowItemViewModel(name, lightShadow, key));
}
}
if (darkDictionary?.TryGetValue(key, out var darkValue) ?? false)
{
if (darkValue is BoxShadows darkShadow)
{
DarkShadows.Add(new ShadowItemViewModel(name, darkShadow, key));
}
}
}
}
}
public static class ColorTokens public static class ColorTokens
{ {
public static IReadOnlyList<Tuple<string, string>> PrimaryTokens { get; } = new List<Tuple<string, string>> public static IReadOnlyList<Tuple<string, string>> PrimaryTokens { get; } = new List<Tuple<string, string>>
{ {
new("SemiColorPrimary", "Primary"), new ("SemiColorPrimary", "Primary"),
new("SemiColorPrimaryPointerover", "Primary Pointerover"), new ("SemiColorPrimaryPointerover", "Primary Pointerover"),
new("SemiColorPrimaryActive", "Primary Active"), new ("SemiColorPrimaryActive", "Primary Active"),
new("SemiColorPrimaryDisabled", "Primary Disabled"), new ("SemiColorPrimaryDisabled", "Primary Disabled"),
new("SemiColorPrimaryLight", "Primary Light"), new ("SemiColorPrimaryLight", "Primary Light"),
new("SemiColorPrimaryLightPointerover", "Primary Light Pointerover"), new ("SemiColorPrimaryLightPointerover", "Primary Light Pointerover"),
new("SemiColorPrimaryLightActive", "Primary Light Active"), new ("SemiColorPrimaryLightActive", "Primary Light Active"),
}; };
public static IReadOnlyList<Tuple<string, string>> SecondaryTokens { get; } = new List<Tuple<string, string>> public static IReadOnlyList<Tuple<string, string>> SecondaryTokens { get; } = new List<Tuple<string, string>>
{ {
new("SemiColorSecondary", "Secondary"), new ("SemiColorSecondary", "Secondary"),
new("SemiColorSecondaryPointerover", "Secondary Pointerover"), new ("SemiColorSecondaryPointerover", "Secondary Pointerover"),
new("SemiColorSecondaryActive", "Secondary Active"), new ("SemiColorSecondaryActive", "Secondary Active"),
new("SemiColorSecondaryDisabled", "Secondary Disabled"), new ("SemiColorSecondaryDisabled", "Secondary Disabled"),
new("SemiColorSecondaryLight", "Secondary Light"), new ("SemiColorSecondaryLight", "Secondary Light"),
new("SemiColorSecondaryLightPointerover", "Secondary Light Pointerover"), new ("SemiColorSecondaryLightPointerover", "Secondary Light Pointerover"),
new("SemiColorSecondaryLightActive", "Secondary Light Active"), new ("SemiColorSecondaryLightActive", "Secondary Light Active"),
}; };
public static IReadOnlyList<Tuple<string, string>> TertiaryTokens { get; } = new List<Tuple<string, string>> public static IReadOnlyList<Tuple<string, string>> TertiaryTokens { get; } = new List<Tuple<string, string>>
{ {
new("SemiColorTertiary", "Tertiary"), new ("SemiColorTertiary", "Tertiary"),
new("SemiColorTertiaryPointerover", "Tertiary Pointerover"), new ("SemiColorTertiaryPointerover", "Tertiary Pointerover"),
new("SemiColorTertiaryActive", "Tertiary Active"), new ("SemiColorTertiaryActive", "Tertiary Active"),
new("SemiColorTertiaryLight", "Tertiary Light"), new ("SemiColorTertiaryLight", "Tertiary Light"),
new("SemiColorTertiaryLightPointerover", "Tertiary Light Pointerover"), new ("SemiColorTertiaryLightPointerover", "Tertiary Light Pointerover"),
new("SemiColorTertiaryLightActive", "Tertiary Light Active"), new ("SemiColorTertiaryLightActive", "Tertiary Light Active"),
}; };
public static IReadOnlyList<Tuple<string, string>> InformationTokens { get; } = new List<Tuple<string, string>> public static IReadOnlyList<Tuple<string, string>> InformationTokens { get; } = new List<Tuple<string, string>>
{ {
new("SemiColorInformation", "Information"), new ("SemiColorInformation", "Information"),
new("SemiColorInformationPointerover", "Information Pointerover"), new ("SemiColorInformationPointerover", "Information Pointerover"),
new("SemiColorInformationActive", "Information Active"), new ("SemiColorInformationActive", "Information Active"),
new("SemiColorInformationDisabled", "Information Disabled"), new ("SemiColorInformationDisabled", "Information Disabled"),
new("SemiColorInformationLight", "Information Light"), new ("SemiColorInformationLight", "Information Light"),
new("SemiColorInformationLightPointerover", "Information Light Pointerover"), new ("SemiColorInformationLightPointerover", "Information Light Pointerover"),
new("SemiColorInformationLightActive", "Information Light Active"), new ("SemiColorInformationLightActive", "Information Light Active"),
}; };
public static IReadOnlyList<Tuple<string, string>> SuccessTokens { get; } = new List<Tuple<string, string>> public static IReadOnlyList<Tuple<string, string>> SuccessTokens { get; } = new List<Tuple<string, string>>
{ {
new("SemiColorSuccess", "Success"), new ("SemiColorSuccess", "Success"),
new("SemiColorSuccessPointerover", "Success Pointerover"), new ("SemiColorSuccessPointerover", "Success Pointerover"),
new("SemiColorSuccessActive", "Success Active"), new ("SemiColorSuccessActive", "Success Active"),
new("SemiColorSuccessDisabled", "Success Disabled"), new ("SemiColorSuccessDisabled", "Success Disabled"),
new("SemiColorSuccessLight", "Success Light"), new ("SemiColorSuccessLight", "Success Light"),
new("SemiColorSuccessLightPointerover", "Success Light Pointerover"), new ("SemiColorSuccessLightPointerover", "Success Light Pointerover"),
new("SemiColorSuccessLightActive", "Success Light Active"), new ("SemiColorSuccessLightActive", "Success Light Active"),
}; };
public static IReadOnlyList<Tuple<string, string>> WarningTokens { get; } = new List<Tuple<string, string>> public static IReadOnlyList<Tuple<string, string>> WarningTokens { get; } = new List<Tuple<string, string>>
{ {
new("SemiColorWarning", "Warning"), new ("SemiColorWarning", "Warning"),
new("SemiColorWarningPointerover", "Warning Pointerover"), new ("SemiColorWarningPointerover", "Warning Pointerover"),
new("SemiColorWarningActive", "Warning Active"), new ("SemiColorWarningActive", "Warning Active"),
new("SemiColorWarningLight", "Warning Light"), new ("SemiColorWarningLight", "Warning Light"),
new("SemiColorWarningLightPointerover", "Warning Light Pointerover"), new ("SemiColorWarningLightPointerover", "Warning Light Pointerover"),
new("SemiColorWarningLightActive", "Warning Light Active"), new ("SemiColorWarningLightActive", "Warning Light Active"),
}; };
public static IReadOnlyList<Tuple<string, string>> DangerTokens { get; } = new List<Tuple<string, string>> public static IReadOnlyList<Tuple<string, string>> DangerTokens { get; } = new List<Tuple<string, string>>
{ {
new("SemiColorDanger", "Danger"), new ("SemiColorDanger", "Danger"),
new("SemiColorDangerPointerover", "Danger Pointerover"), new ("SemiColorDangerPointerover", "Danger Pointerover"),
new("SemiColorDangerActive", "Danger Active"), new ("SemiColorDangerActive", "Danger Active"),
new("SemiColorDangerLight", "Danger Light"), new ("SemiColorDangerLight", "Danger Light"),
new("SemiColorDangerLightPointerover", "Danger Light Pointerover"), new ("SemiColorDangerLightPointerover", "Danger Light Pointerover"),
new("SemiColorDangerLightActive", "Danger Light Active"), new ("SemiColorDangerLightActive", "Danger Light Active"),
}; };
public static IReadOnlyList<Tuple<string, string>> TextTokens { get; } = new List<Tuple<string, string>> public static IReadOnlyList<Tuple<string, string>> TextTokens { get; } = new List<Tuple<string, string>>
{ {
new("SemiColorText0", "Text 0"), new ("SemiColorText0", "Text 0"),
new("SemiColorText1", "Text 1"), new ("SemiColorText1", "Text 1"),
new("SemiColorText2", "Text 2"), new ("SemiColorText2", "Text 2"),
new("SemiColorText3", "Text 3"), new ("SemiColorText3", "Text 3"),
}; };
public static IReadOnlyList<Tuple<string, string>> LinkTokens { get; } = new List<Tuple<string, string>> public static IReadOnlyList<Tuple<string, string>> LinkTokens { get; } = new List<Tuple<string, string>>
{ {
new("SemiColorLink", "Link"), new ("SemiColorLink", "Link"),
new("SemiColorLinkPointerover", "Link Pointerover"), new ("SemiColorLinkPointerover", "Link Pointerover"),
new("SemiColorLinkActive", "Link Active"), new ("SemiColorLinkActive", "Link Active"),
new("SemiColorLinkVisited", "Link Visited"), new ("SemiColorLinkVisited", "Link Visited"),
}; };
public static IReadOnlyList<Tuple<string, string>> BackgroundTokens { get; } = new List<Tuple<string, string>> public static IReadOnlyList<Tuple<string, string>> BackgroundTokens { get; } = new List<Tuple<string, string>>
{ {
new("SemiColorBackground0", "Background 0"), new ("SemiColorBackground0", "Background 0"),
new("SemiColorBackground1", "Background 1"), new ("SemiColorBackground1", "Background 1"),
new("SemiColorBackground2", "Background 2"), new ("SemiColorBackground2", "Background 2"),
new("SemiColorBackground3", "Background 3"), new ("SemiColorBackground3", "Background 3"),
new("SemiColorBackground4", "Background 4"), new ("SemiColorBackground4", "Background 4"),
}; };
public static IReadOnlyList<Tuple<string, string>> FillTokens { get; } = new List<Tuple<string, string>> public static IReadOnlyList<Tuple<string, string>> FillTokens { get; } = new List<Tuple<string, string>>
{ {
new("SemiColorFill0", "Fill 0"), new ("SemiColorFill0", "Fill 0"),
new("SemiColorFill1", "Fill 1"), new ("SemiColorFill1", "Fill 1"),
new("SemiColorFill2", "Fill 2"), new ("SemiColorFill2", "Fill 2"),
}; };
public static IReadOnlyList<Tuple<string, string>> BorderTokens { get; } = new List<Tuple<string, string>> public static IReadOnlyList<Tuple<string, string>> BorderTokens { get; } = new List<Tuple<string, string>>
{ {
new("SemiColorBorder", "Border"), new ("SemiColorBorder", "Border"),
}; };
public static IReadOnlyList<Tuple<string, string>> DisabledTokens { get; } = new List<Tuple<string, string>> public static IReadOnlyList<Tuple<string, string>> DisabledTokens { get; } = new List<Tuple<string, string>>
{ {
new("SemiColorDisabledText", "Disabled Text"), new ("SemiColorDisabledText", "Disabled Text"),
new("SemiColorDisabledBorder", "Disabled Border"), new ("SemiColorDisabledBorder", "Disabled Border"),
new("SemiColorDisabledBackground", "Disabled Background"), new ("SemiColorDisabledBackground", "Disabled Background"),
new("SemiColorDisabledFill", "Disabled Fill"), new ("SemiColorDisabledFill", "Disabled Fill"),
};
public static IReadOnlyList<Tuple<string, string>> ShadowTokens { get; } = new List<Tuple<string, string>>
{
new("SemiColorShadow", "Shadow"),
new("SemiShadowElevated", "Shadow Elevated"),
}; };
} }

93
demo/Semi.Avalonia.Demo/Views/MainView.axaml
View File

@ -15,84 +15,56 @@
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceInclude Source="../Themes/TabMenu.axaml" /> <ResourceInclude Source="../Themes/TabMenu.axaml" />
<ResourceInclude Source="../Themes/ToggleSwitch.axaml" /> <ResourceInclude Source="../Themes/ToggleButton.axaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<StreamGeometry x:Key="DocIcon">M12 21.5C10.65 20.65 8.2 20 6.5 20C4.85 20 3.15 20.3 1.75 21.05C1.65 21.1 1.6 21.1 1.5 21.1C1.25 21.1 1 20.85 1 20.6V6C1.6 5.55 2.25 5.25 3 5C4.11 4.65 5.33 4.5 6.5 4.5C8.45 4.5 10.55 4.9 12 6C13.45 4.9 15.55 4.5 17.5 4.5C18.67 4.5 19.89 4.65 21 5C21.75 5.25 22.4 5.55 23 6V20.6C23 20.85 22.75 21.1 22.5 21.1C22.4 21.1 22.35 21.1 22.25 21.05C20.85 20.3 19.15 20 17.5 20C15.8 20 13.35 20.65 12 21.5M12 8V19.5C13.35 18.65 15.8 18 17.5 18C18.7 18 19.9 18.15 21 18.5V7C19.9 6.65 18.7 6.5 17.5 6.5C15.8 6.5 13.35 7.15 12 8M13 11.5C14.11 10.82 15.6 10.5 17.5 10.5C18.41 10.5 19.26 10.59 20 10.78V9.23C19.13 9.08 18.29 9 17.5 9C15.73 9 14.23 9.28 13 9.84V11.5M17.5 11.67C15.79 11.67 14.29 11.93 13 12.46V14.15C14.11 13.5 15.6 13.16 17.5 13.16C18.54 13.16 19.38 13.24 20 13.4V11.9C19.13 11.74 18.29 11.67 17.5 11.67M20 14.57C19.13 14.41 18.29 14.33 17.5 14.33C15.67 14.33 14.17 14.6 13 15.13V16.82C14.11 16.16 15.6 15.83 17.5 15.83C18.54 15.83 19.38 15.91 20 16.07V14.57Z</StreamGeometry>
<StreamGeometry x:Key="RepoIcon">M12,2A10,10 0 0,0 2,12C2,16.42 4.87,20.17 8.84,21.5C9.34,21.58 9.5,21.27 9.5,21C9.5,20.77 9.5,20.14 9.5,19.31C6.73,19.91 6.14,17.97 6.14,17.97C5.68,16.81 5.03,16.5 5.03,16.5C4.12,15.88 5.1,15.9 5.1,15.9C6.1,15.97 6.63,16.93 6.63,16.93C7.5,18.45 8.97,18 9.54,17.76C9.63,17.11 9.89,16.67 10.17,16.42C7.95,16.17 5.62,15.31 5.62,11.5C5.62,10.39 6,9.5 6.65,8.79C6.55,8.54 6.2,7.5 6.75,6.15C6.75,6.15 7.59,5.88 9.5,7.17C10.29,6.95 11.15,6.84 12,6.84C12.85,6.84 13.71,6.95 14.5,7.17C16.41,5.88 17.25,6.15 17.25,6.15C17.8,7.5 17.45,8.54 17.35,8.79C18,9.5 18.38,10.39 18.38,11.5C18.38,15.32 16.04,16.16 13.81,16.41C14.17,16.72 14.5,17.33 14.5,18.26C14.5,19.6 14.5,20.68 14.5,21C14.5,21.27 14.66,21.59 15.17,21.5C19.14,20.16 22,16.42 22,12A10,10 0 0,0 12,2Z</StreamGeometry>
<StreamGeometry x:Key="DarkThemeIcon">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17 15C17.476 15 17.9408 14.9525 18.3901 14.862C17.296 17.3011 14.8464 19 12 19C8.13401 19 5 15.866 5 12C5 8.60996 7.40983 5.78277 10.6099 5.13803C10.218 6.01173 10 6.98041 10 8C10 11.866 13.134 15 17 15Z</StreamGeometry>
<StreamGeometry x:Key="LightThemeIcon">M3.55 19.09L4.96 20.5L6.76 18.71L5.34 17.29M12 6C8.69 6 6 8.69 6 12S8.69 18 12 18 18 15.31 18 12C18 8.68 15.31 6 12 6M20 13H23V11H20M17.24 18.71L19.04 20.5L20.45 19.09L18.66 17.29M20.45 5L19.04 3.6L17.24 5.39L18.66 6.81M13 1H11V4H13M6.76 5.39L4.96 3.6L3.55 5L5.34 6.81L6.76 5.39M1 13H4V11H1M13 20H11V23H13</StreamGeometry>
<StreamGeometry x:Key="MenuIcon">M2 19.5C2 18.6716 2.67157 18 3.5 18H20.5C21.3284 18 22 18.6716 22 19.5C22 20.3284 21.3284 21 20.5 21H3.5C2.67157 21 2 20.3284 2 19.5ZM2 12C2 11.1716 2.67157 10.5 3.5 10.5H20.5C21.3284 10.5 22 11.1716 22 12C22 12.8284 21.3284 13.5 20.5 13.5H3.5C2.67157 13.5 2 12.8284 2 12ZM2 4.5C2 3.67157 2.67157 3 3.5 3H20.5C21.3284 3 22 3.67157 22 4.5C22 5.32843 21.3284 6 20.5 6H3.5C2.67157 6 2 5.32843 2 4.5Z</StreamGeometry>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
<Grid RowDefinitions="Auto, *"> <Grid RowDefinitions="Auto, *">
<Border <Border
Grid.Row="0"
Margin="8" Margin="8"
Padding="12,4" Padding="12,4"
Theme="{DynamicResource CardBorder}"> Theme="{DynamicResource CardBorder}">
<Panel> <Grid VerticalAlignment="Center" ColumnDefinitions="*, Auto">
<StackPanel Orientation="Horizontal" Spacing="8"> <StackPanel Grid.Column="0" Orientation="Horizontal">
<ToggleSwitch <TextBlock
Name="ExpandButton"
Theme="{DynamicResource SplitViewToggleSwitch}" />
<SelectableTextBlock
VerticalAlignment="Center" VerticalAlignment="Center"
Classes="H6" Classes="H6"
Text="Semi Avalonia" Text="Semi Avalonia"
Theme="{DynamicResource TitleSelectableTextBlock}" /> Theme="{DynamicResource TitleTextBlock}" />
<SelectableTextBlock <TextBlock
Margin="8,0"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="/" /> Text="/" />
<SelectableTextBlock <TextBlock
Margin="8,0"
VerticalAlignment="Center" VerticalAlignment="Center"
Classes="Secondary" Classes="Secondary"
Text="{ReflectionBinding #tab.SelectedItem.Header}" /> Text="{ReflectionBinding #tab.SelectedItem.Header}" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right"> <StackPanel Grid.Column="1" Orientation="Horizontal">
<StackPanel.Styles> <Button Click="OpenDocumentation" Theme="{DynamicResource BorderlessButton}">
<Style Selector="Button"> <PathIcon
<Setter Property="Theme" Value="{DynamicResource BorderlessButton}" /> Width="16"
<Setter Property="Padding" Value="8" /> Height="16"
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" /> Data="M12 21.5C10.65 20.65 8.2 20 6.5 20C4.85 20 3.15 20.3 1.75 21.05C1.65 21.1 1.6 21.1 1.5 21.1C1.25 21.1 1 20.85 1 20.6V6C1.6 5.55 2.25 5.25 3 5C4.11 4.65 5.33 4.5 6.5 4.5C8.45 4.5 10.55 4.9 12 6C13.45 4.9 15.55 4.5 17.5 4.5C18.67 4.5 19.89 4.65 21 5C21.75 5.25 22.4 5.55 23 6V20.6C23 20.85 22.75 21.1 22.5 21.1C22.4 21.1 22.35 21.1 22.25 21.05C20.85 20.3 19.15 20 17.5 20C15.8 20 13.35 20.65 12 21.5M12 8V19.5C13.35 18.65 15.8 18 17.5 18C18.7 18 19.9 18.15 21 18.5V7C19.9 6.65 18.7 6.5 17.5 6.5C15.8 6.5 13.35 7.15 12 8M13 11.5C14.11 10.82 15.6 10.5 17.5 10.5C18.41 10.5 19.26 10.59 20 10.78V9.23C19.13 9.08 18.29 9 17.5 9C15.73 9 14.23 9.28 13 9.84V11.5M17.5 11.67C15.79 11.67 14.29 11.93 13 12.46V14.15C14.11 13.5 15.6 13.16 17.5 13.16C18.54 13.16 19.38 13.24 20 13.4V11.9C19.13 11.74 18.29 11.67 17.5 11.67M20 14.57C19.13 14.41 18.29 14.33 17.5 14.33C15.67 14.33 14.17 14.6 13 15.13V16.82C14.11 16.16 15.6 15.83 17.5 15.83C18.54 15.83 19.38 15.91 20 16.07V14.57Z"
</Style> Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
<Style Selector="ToggleSwitch">
<Setter Property="Theme" Value="{DynamicResource ThemeToggleSwitch}" />
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
</Style>
<Style Selector="PathIcon">
<Setter Property="Theme" Value="{DynamicResource InnerPathIcon}" />
</Style>
</StackPanel.Styles>
<Button Command="{Binding OpenUrlCommand}" CommandParameter="{Binding DocumentationUrl}">
<PathIcon Data="{StaticResource DocIcon}" />
</Button> </Button>
<Button Click="OpenRepository" Theme="{DynamicResource BorderlessButton}">
<Button Command="{Binding OpenUrlCommand}" CommandParameter="{Binding RepoUrl}"> <PathIcon
<PathIcon Data="{StaticResource RepoIcon}" /> Width="16"
</Button> Height="16"
Data="M12,2A10,10 0 0,0 2,12C2,16.42 4.87,20.17 8.84,21.5C9.34,21.58 9.5,21.27 9.5,21C9.5,20.77 9.5,20.14 9.5,19.31C6.73,19.91 6.14,17.97 6.14,17.97C5.68,16.81 5.03,16.5 5.03,16.5C4.12,15.88 5.1,15.9 5.1,15.9C6.1,15.97 6.63,16.93 6.63,16.93C7.5,18.45 8.97,18 9.54,17.76C9.63,17.11 9.89,16.67 10.17,16.42C7.95,16.17 5.62,15.31 5.62,11.5C5.62,10.39 6,9.5 6.65,8.79C6.55,8.54 6.2,7.5 6.75,6.15C6.75,6.15 7.59,5.88 9.5,7.17C10.29,6.95 11.15,6.84 12,6.84C12.85,6.84 13.71,6.95 14.5,7.17C16.41,5.88 17.25,6.15 17.25,6.15C17.8,7.5 17.45,8.54 17.35,8.79C18,9.5 18.38,10.39 18.38,11.5C18.38,15.32 16.04,16.16 13.81,16.41C14.17,16.72 14.5,17.33 14.5,18.26C14.5,19.6 14.5,20.68 14.5,21C14.5,21.27 14.66,21.59 15.17,21.5C19.14,20.16 22,16.42 22,12A10,10 0 0,0 12,2Z"
<ToggleSwitch Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
Command="{Binding ToggleThemeCommand}"
OnContent="{StaticResource DarkThemeIcon}"
OffContent="{StaticResource LightThemeIcon}" />
<Button>
<PathIcon Data="{StaticResource MenuIcon}" />
<Button.Flyout>
<MenuFlyout Placement="Bottom" ItemsSource="{Binding MenuItems}" />
</Button.Flyout>
<Button.Styles>
<Style Selector="MenuItem" x:DataType="views:MenuItemViewModel">
<Setter Property="Header" Value="{Binding Header}" />
<Setter Property="ItemsSource" Value="{Binding Items}" />
<Setter Property="Command" Value="{Binding Command}" />
<Setter Property="CommandParameter" Value="{Binding CommandParameter}" />
</Style>
</Button.Styles>
</Button> </Button>
<ComboBox
MinWidth="100"
PlaceholderText="Select a theme"
DisplayMemberBinding="{Binding Name}"
ItemsSource="{Binding Themes}"
SelectedItem="{Binding SelectedTheme}" />
</StackPanel> </StackPanel>
</Panel> </Grid>
</Border> </Border>
<TabControl <TabControl
Name="tab" Name="tab"
@ -101,7 +73,6 @@
Padding="20,0,0,0" Padding="20,0,0,0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
TabStripPlacement="Left" TabStripPlacement="Left"
Classes.Dismiss="{Binding #ExpandButton.IsChecked}"
Theme="{DynamicResource NavigationTab}"> Theme="{DynamicResource NavigationTab}">
<TabItem Header="Overview"> <TabItem Header="Overview">
<pages:Overview /> <pages:Overview />
@ -155,7 +126,7 @@
<pages:FlyoutDemo /> <pages:FlyoutDemo />
</TabItem> </TabItem>
<TabItem Header="GridSplitter"> <TabItem Header="GridSplitter">
<pages:GridSplitterDemo /> <pages:GridSplitter />
</TabItem> </TabItem>
<TabItem Header="HeaderedContentControl"> <TabItem Header="HeaderedContentControl">
<pages:HeaderedContentControlDemo /> <pages:HeaderedContentControlDemo />
@ -238,4 +209,4 @@
</TabControl> </TabControl>
</Grid> </Grid>
</UserControl> </UserControl>

125
demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs
View File

@ -1,13 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.ObjectModel;
using System.Threading.Tasks;
using System.Windows.Input;
using Avalonia; using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Interactivity;
using Avalonia.Styling; using Avalonia.Styling;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
namespace Semi.Avalonia.Demo.Views; namespace Semi.Avalonia.Demo.Views;
@ -18,96 +15,62 @@ public partial class MainView : UserControl
InitializeComponent(); InitializeComponent();
this.DataContext = new MainViewModel(); this.DataContext = new MainViewModel();
} }
}
public partial class MainViewModel : ObservableObject private void ToggleButton_OnIsCheckedChanged(object sender, RoutedEventArgs e)
{
public string DocumentationUrl => "https://docs.irihi.tech/semi";
public string RepoUrl => "https://github.com/irihitech/Semi.Avalonia";
public IReadOnlyList<MenuItemViewModel> MenuItems { get; }
public MainViewModel()
{
MenuItems =
[
new MenuItemViewModel
{
Header = "High Contrast Theme",
Items =
[
new MenuItemViewModel
{
Header = "Aquatic",
Command = SelectThemeCommand,
CommandParameter = SemiTheme.Aquatic
},
new MenuItemViewModel
{
Header = "Desert",
Command = SelectThemeCommand,
CommandParameter = SemiTheme.Desert
},
new MenuItemViewModel
{
Header = "Dust",
Command = SelectThemeCommand,
CommandParameter = SemiTheme.Dust
},
new MenuItemViewModel
{
Header = "NightSky",
Command = SelectThemeCommand,
CommandParameter = SemiTheme.NightSky
},
]
}
];
}
[RelayCommand]
private void ToggleTheme()
{
var app = Application.Current;
if (app is null) return;
var theme = app.ActualThemeVariant;
app.RequestedThemeVariant = theme == ThemeVariant.Dark ? ThemeVariant.Light : ThemeVariant.Dark;
}
[RelayCommand]
private void SelectTheme(object? obj)
{ {
var app = Application.Current; var app = Application.Current;
if (app is not null) if (app is not null)
{ {
app.RequestedThemeVariant = obj as ThemeVariant; var theme = app.ActualThemeVariant;
app.RequestedThemeVariant = theme == ThemeVariant.Dark ? ThemeVariant.Light : ThemeVariant.Dark;
} }
} }
[RelayCommand] private async void OpenRepository(object sender, RoutedEventArgs e)
private static async Task OpenUrl(string url)
{ {
var launcher = ResolveDefaultTopLevel()?.Launcher; var top = TopLevel.GetTopLevel(this);
if (launcher is not null) if (top is null) return;
{ var launcher = top.Launcher;
await launcher.LaunchUriAsync(new Uri(url)); await launcher.LaunchUriAsync(new Uri("https://github.com/irihitech/Semi.Avalonia"));
}
} }
private static TopLevel? ResolveDefaultTopLevel() private async void OpenDocumentation(object sender, RoutedEventArgs e)
{ {
return Application.Current?.ApplicationLifetime switch var top = TopLevel.GetTopLevel(this);
{ if (top is null) return;
IClassicDesktopStyleApplicationLifetime desktopLifetime => desktopLifetime.MainWindow, var launcher = top.Launcher;
ISingleViewApplicationLifetime singleView => TopLevel.GetTopLevel(singleView.MainView), await launcher.LaunchUriAsync(new Uri("https://docs.irihi.tech/semi"));
_ => null
};
} }
} }
public class MenuItemViewModel public partial class MainViewModel: ObservableObject
{ {
public string? Header { get; set; } public ObservableCollection<ThemeItem> Themes { get; } = new()
public ICommand? Command { get; set; } {
public object? CommandParameter { get; set; } new ThemeItem("Light", ThemeVariant.Light),
public IList<MenuItemViewModel>? Items { get; set; } new ThemeItem("Dark", ThemeVariant.Dark),
new ThemeItem("Aquatic", SemiTheme.Aquatic),
new ThemeItem("Desert", SemiTheme.Desert),
new ThemeItem("Dust", SemiTheme.Dust),
new ThemeItem("NightSky", SemiTheme.NightSky),
};
[ObservableProperty] private ThemeItem? _selectedTheme;
partial void OnSelectedThemeChanged(ThemeItem? oldValue, ThemeItem? newValue)
{
if (newValue is null) return;
var app = Application.Current;
if (app is not null)
{
app.RequestedThemeVariant = newValue.Theme;
}
}
}
public class ThemeItem(string name, ThemeVariant theme)
{
public string Name { get; set; } = name;
public ThemeVariant Theme { get; set; } = theme;
} }

12
demo/Semi.Avalonia.TreeDataGrid.Demo/Program.cs
View File

@ -1,6 +1,5 @@
using Avalonia; using Avalonia;
using System; using System;
using Avalonia.Media;
namespace Semi.Avalonia.TreeDataGrid.Demo; namespace Semi.Avalonia.TreeDataGrid.Demo;
@ -11,21 +10,12 @@ class Program
// yet and stuff might break. // yet and stuff might break.
[STAThread] [STAThread]
public static void Main(string[] args) => BuildAvaloniaApp() public static void Main(string[] args) => BuildAvaloniaApp()
.With(new FontManagerOptions
{
FontFallbacks =
[
new FontFallback
{
FontFamily = new FontFamily("Microsoft YaHei")
}
]
})
.StartWithClassicDesktopLifetime(args); .StartWithClassicDesktopLifetime(args);
// Avalonia configuration, don't remove; also used by visual designer. // Avalonia configuration, don't remove; also used by visual designer.
public static AppBuilder BuildAvaloniaApp() public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure<App>() => AppBuilder.Configure<App>()
.UsePlatformDetect() .UsePlatformDetect()
.WithInterFont()
.LogToTrace(); .LogToTrace();
} }

17
demo/Semi.Avalonia.TreeDataGrid.Demo/Semi.Avalonia.TreeDataGrid.Demo.csproj
View File

@ -1,29 +1,28 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<BuiltInComInteropSupport>true</BuiltInComInteropSupport> <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
<LangVersion>latest</LangVersion>
<ApplicationManifest>app.manifest</ApplicationManifest> <ApplicationManifest>app.manifest</ApplicationManifest>
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault> <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
<!-- Uncomment below to enable Native AOT compilation-->
<!--<PublishAot>true</PublishAot>-->
<!--<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>-->
</PropertyGroup> </PropertyGroup>
<Import Project="../Directory.Build.props" /> <Import Project="../Directory.Build.props" />
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" /> <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" /> <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
<!--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="$(AvaloniaVersion)" /> <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="$(CommunityToolkitVersion)" /> <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\src\Semi.Avalonia.TreeDataGrid\Semi.Avalonia.TreeDataGrid.csproj" /> <ProjectReference Include="..\..\src\Semi.Avalonia.TreeDataGrid\Semi.Avalonia.TreeDataGrid.csproj" />
<ProjectReference Include="..\..\src\Semi.Avalonia\Semi.Avalonia.csproj" /> <ProjectReference Include="..\..\src\Semi.Avalonia\Semi.Avalonia.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
src/Package.props
View File

@ -3,14 +3,14 @@
<TargetFrameworks>net6.0;net8.0;netstandard2.0</TargetFrameworks> <TargetFrameworks>net6.0;net8.0;netstandard2.0</TargetFrameworks>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<Version>11.2.1.1</Version> <Version>11.2.0</Version>
<Authors>IRIHI Technology Co., Ltd.</Authors> <Authors>IRIHI Technology Co., Ltd.</Authors>
<Description>Avalonia Theme inspired by Semi Design.</Description> <Description>Avalonia Theme inspired by Semi Design.</Description>
<RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl> <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression> <PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>irihi.png</PackageIcon> <PackageIcon>irihi.png</PackageIcon>
<PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl> <PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
<AvaloniaVersion>11.2.1</AvaloniaVersion> <AvaloniaVersion>11.2.0</AvaloniaVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

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

@ -80,7 +80,7 @@
<!-- Backgrounds --> <!-- Backgrounds -->
<!-- TODO: Background="{DynamicResource ColorViewTabBackgroundBrush}" --> <!-- TODO: Background="{DynamicResource ColorViewTabBackgroundBrush}" -->
<Border <Border
Name="ContentBackgroundBorder" x:Name="ContentBackgroundBorder"
Grid.Row="0" Grid.Row="0"
Grid.RowSpan="2" Grid.RowSpan="2"
Height="{TemplateBinding Height}" Height="{TemplateBinding Height}"
@ -92,7 +92,7 @@
CornerRadius="{TemplateBinding CornerRadius}" /> CornerRadius="{TemplateBinding CornerRadius}" />
<TabControl <TabControl
Name="PART_TabControl" x:Name="PART_TabControl"
Grid.Row="0" Grid.Row="0"
Padding="0" Padding="0"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
@ -129,7 +129,7 @@
<ColumnDefinition Width="Auto" MinWidth="32" /> <ColumnDefinition Width="Auto" MinWidth="32" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<primitives:ColorSlider <primitives:ColorSlider
Name="ColorSpectrumThirdComponentSlider" x:Name="ColorSpectrumThirdComponentSlider"
Grid.Column="0" Grid.Column="0"
Margin="0,0,12,0" Margin="0,0,12,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
@ -143,7 +143,7 @@
IsVisible="{TemplateBinding IsColorSpectrumSliderVisible}" IsVisible="{TemplateBinding IsColorSpectrumSliderVisible}"
Orientation="Vertical" /> Orientation="Vertical" />
<primitives:ColorSpectrum <primitives:ColorSpectrum
Name="ColorSpectrum" x:Name="ColorSpectrum"
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
@ -157,7 +157,7 @@
MinValue="{TemplateBinding MinValue}" MinValue="{TemplateBinding MinValue}"
Shape="{TemplateBinding ColorSpectrumShape}" /> Shape="{TemplateBinding ColorSpectrumShape}" />
<primitives:ColorSlider <primitives:ColorSlider
Name="ColorSpectrumAlphaSlider" x:Name="ColorSpectrumAlphaSlider"
Grid.Column="2" Grid.Column="2"
Margin="12,0,0,0" Margin="12,0,0,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
@ -281,7 +281,7 @@
CornerRadius="3"> CornerRadius="3">
<Grid ColumnDefinitions="1*,1*" IsVisible="{TemplateBinding IsColorModelVisible}"> <Grid ColumnDefinitions="1*,1*" IsVisible="{TemplateBinding IsColorModelVisible}">
<RadioButton <RadioButton
Name="RgbRadioButton" x:Name="RgbRadioButton"
Grid.Column="0" Grid.Column="0"
HorizontalContentAlignment="Center" HorizontalContentAlignment="Center"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
@ -293,7 +293,7 @@
Mode=TwoWay}" Mode=TwoWay}"
Theme="{DynamicResource ColorViewRadioButton}" /> Theme="{DynamicResource ColorViewRadioButton}" />
<RadioButton <RadioButton
Name="HsvRadioButton" x:Name="HsvRadioButton"
Grid.Column="1" Grid.Column="1"
HorizontalContentAlignment="Center" HorizontalContentAlignment="Center"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
@ -307,7 +307,7 @@
</Grid> </Grid>
</Border> </Border>
<TextBox <TextBox
Name="PART_HexTextBox" x:Name="PART_HexTextBox"
Grid.Column="2" Grid.Column="2"
Height="32" Height="32"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
@ -319,7 +319,7 @@
<!-- Color component editing controls --> <!-- Color component editing controls -->
<!-- Component 1 RGB:Red HSV:Hue --> <!-- Component 1 RGB:Red HSV:Hue -->
<NumericUpDown <NumericUpDown
Name="Component1NumericUpDown" x:Name="Component1NumericUpDown"
Grid.Row="2" Grid.Row="2"
Grid.Column="0" Grid.Column="0"
Width="{DynamicResource ColorViewNumericUpDownWidth}" Width="{DynamicResource ColorViewNumericUpDownWidth}"
@ -334,7 +334,7 @@
ShowButtonSpinner="False" ShowButtonSpinner="False"
Value="{Binding Value, ElementName=Component1Slider}" /> Value="{Binding Value, ElementName=Component1Slider}" />
<primitives:ColorSlider <primitives:ColorSlider
Name="Component1Slider" x:Name="Component1Slider"
Grid.Row="2" Grid.Row="2"
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
@ -350,7 +350,7 @@
TickFrequency="1" /> TickFrequency="1" />
<!-- Component 2 RGB:Green HSV:Saturation --> <!-- Component 2 RGB:Green HSV:Saturation -->
<NumericUpDown <NumericUpDown
Name="Component2NumericUpDown" x:Name="Component2NumericUpDown"
Grid.Row="3" Grid.Row="3"
Grid.Column="0" Grid.Column="0"
Width="{DynamicResource ColorViewNumericUpDownWidth}" Width="{DynamicResource ColorViewNumericUpDownWidth}"
@ -365,7 +365,7 @@
ShowButtonSpinner="False" ShowButtonSpinner="False"
Value="{Binding Value, ElementName=Component2Slider}" /> Value="{Binding Value, ElementName=Component2Slider}" />
<primitives:ColorSlider <primitives:ColorSlider
Name="Component2Slider" x:Name="Component2Slider"
Grid.Row="3" Grid.Row="3"
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
@ -381,7 +381,7 @@
TickFrequency="1" /> TickFrequency="1" />
<!-- Component 3 RGB:Blue HSV:Value --> <!-- Component 3 RGB:Blue HSV:Value -->
<NumericUpDown <NumericUpDown
Name="Component3NumericUpDown" x:Name="Component3NumericUpDown"
Grid.Row="4" Grid.Row="4"
Grid.Column="0" Grid.Column="0"
Width="{DynamicResource ColorViewNumericUpDownWidth}" Width="{DynamicResource ColorViewNumericUpDownWidth}"
@ -396,7 +396,7 @@
ShowButtonSpinner="False" ShowButtonSpinner="False"
Value="{Binding Value, ElementName=Component3Slider}" /> Value="{Binding Value, ElementName=Component3Slider}" />
<primitives:ColorSlider <primitives:ColorSlider
Name="Component3Slider" x:Name="Component3Slider"
Grid.Row="4" Grid.Row="4"
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
@ -412,7 +412,7 @@
TickFrequency="1" /> TickFrequency="1" />
<!-- Alpha Component --> <!-- Alpha Component -->
<NumericUpDown <NumericUpDown
Name="AlphaComponentNumericUpDown" x:Name="AlphaComponentNumericUpDown"
Grid.Row="5" Grid.Row="5"
Grid.Column="0" Grid.Column="0"
Width="{DynamicResource ColorViewNumericUpDownWidth}" Width="{DynamicResource ColorViewNumericUpDownWidth}"
@ -434,7 +434,7 @@
</NumericUpDown.IsVisible> </NumericUpDown.IsVisible>
</NumericUpDown> </NumericUpDown>
<primitives:ColorSlider <primitives:ColorSlider
Name="AlphaComponentSlider" x:Name="AlphaComponentSlider"
Grid.Row="5" Grid.Row="5"
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
@ -559,7 +559,7 @@
CornerRadius="8 8 0 0" CornerRadius="8 8 0 0"
ClipToBounds="True"> ClipToBounds="True">
<primitives:ColorSpectrum <primitives:ColorSpectrum
Name="ColorSpectrum" x:Name="ColorSpectrum"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Components="{TemplateBinding ColorSpectrumComponents}" Components="{TemplateBinding ColorSpectrumComponents}"
@ -573,7 +573,7 @@
Shape="{TemplateBinding ColorSpectrumShape}" /> Shape="{TemplateBinding ColorSpectrumShape}" />
</Border> </Border>
<primitives:ColorSlider <primitives:ColorSlider
Name="ColorSpectrumThirdComponentSlider" x:Name="ColorSpectrumThirdComponentSlider"
Grid.Row="1" Grid.Row="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
@ -585,7 +585,7 @@
Orientation="Horizontal" /> Orientation="Horizontal" />
<primitives:ColorSlider <primitives:ColorSlider
Name="ColorSpectrumAlphaSlider" x:Name="ColorSpectrumAlphaSlider"
Grid.Row="2" Grid.Row="2"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
@ -612,32 +612,32 @@
Height="20" Height="20"
CornerRadius="4" /> CornerRadius="4" />
<Panel <Panel
Name="PART_TextBoxPanel" x:Name="PART_TextBoxPanel"
Width="106" Width="106"
Margin="4 0 0 0" Margin="4 0 0 0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center"> VerticalAlignment="Center">
<TextBox <TextBox
Name="PART_HexTextBox" x:Name="PART_HexTextBox"
Classes="Small" Classes="Small"
InnerLeftContent="#" InnerLeftContent="#"
IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Hex}" IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Hex}"
Text="{TemplateBinding Color, Converter={StaticResource ColorToHexConverter}, Mode=TwoWay}" Text="{TemplateBinding Color, Converter={StaticResource ColorToHexConverter}, Mode=TwoWay}"
MaxLength="8" /> MaxLength="8" />
<TextBox <TextBox
Name="PART_RgbaTextBox" x:Name="PART_RgbaTextBox"
Classes="Small" Classes="Small"
IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Rgba}" IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Rgba}"
Text="{TemplateBinding Color, Converter={StaticResource ColorToTextConverter}, Mode=TwoWay}" /> Text="{TemplateBinding Color, Converter={StaticResource ColorToTextConverter}, Mode=TwoWay}" />
<TextBox <TextBox
Name="PART_HsvaTextBox" x:Name="PART_HsvaTextBox"
Classes="Small" Classes="Small"
IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Hsva}" IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Hsva}"
Text="{TemplateBinding HsvColor, Converter={StaticResource HsvColorToTextConverter}, Mode=TwoWay}" /> Text="{TemplateBinding HsvColor, Converter={StaticResource HsvColorToTextConverter}, Mode=TwoWay}" />
</Panel> </Panel>
<NumericUpDown <NumericUpDown
Name="AlphaComponentNumericUpDown" x:Name="AlphaComponentNumericUpDown"
Width="70" Width="70"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
@ -652,7 +652,7 @@
IsVisible="{TemplateBinding IsAlphaVisible}" IsVisible="{TemplateBinding IsAlphaVisible}"
Value="{Binding #ColorSpectrumAlphaSlider.Value}" /> Value="{Binding #ColorSpectrumAlphaSlider.Value}" />
<ComboBox <ComboBox
Name="ColorModelComboBox" x:Name="ColorModelComboBox"
Width="80" Width="80"
VerticalAlignment="Center" VerticalAlignment="Center"
Classes="Small" Classes="Small"

8
src/Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml
View File

@ -30,7 +30,7 @@
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Background="{DynamicResource ColorControlCheckeredBackgroundBrush}" /> Background="{DynamicResource ColorControlCheckeredBackgroundBrush}" />
<Border <Border
Name="PART_AccentDecrement2Border" x:Name="PART_AccentDecrement2Border"
Grid.Column="0" Grid.Column="0"
Background="{TemplateBinding HsvColor, Background="{TemplateBinding HsvColor,
Converter={StaticResource AccentColorConverter}, Converter={StaticResource AccentColorConverter},
@ -39,7 +39,7 @@
Converter={StaticResource LeftCornerRadiusFilterConverter}}" Converter={StaticResource LeftCornerRadiusFilterConverter}}"
Tag="-2" /> Tag="-2" />
<Border <Border
Name="PART_AccentDecrement1Border" x:Name="PART_AccentDecrement1Border"
Grid.Column="1" Grid.Column="1"
Background="{TemplateBinding HsvColor, Background="{TemplateBinding HsvColor,
Converter={StaticResource AccentColorConverter}, Converter={StaticResource AccentColorConverter},
@ -60,14 +60,14 @@
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Background="{DynamicResource ColorControlCheckeredBackgroundBrush}" /> Background="{DynamicResource ColorControlCheckeredBackgroundBrush}" />
<Border <Border
Name="PART_AccentIncrement1Border" x:Name="PART_AccentIncrement1Border"
Grid.Column="0" Grid.Column="0"
Background="{TemplateBinding HsvColor, Background="{TemplateBinding HsvColor,
Converter={StaticResource AccentColorConverter}, Converter={StaticResource AccentColorConverter},
ConverterParameter='1'}" ConverterParameter='1'}"
Tag="1" /> Tag="1" />
<Border <Border
Name="PART_AccentIncrement2Border" x:Name="PART_AccentIncrement2Border"
Grid.Column="1" Grid.Column="1"
Background="{TemplateBinding HsvColor, Background="{TemplateBinding HsvColor,
Converter={StaticResource AccentColorConverter}, Converter={StaticResource AccentColorConverter},

24
src/Semi.Avalonia.ColorPicker/Controls/ColorSpectrum.axaml
View File

@ -15,16 +15,16 @@
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type ColorSpectrum}"> <ControlTemplate TargetType="{x:Type ColorSpectrum}">
<Panel <Panel
Name="PART_LayoutRoot" x:Name="PART_LayoutRoot"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"> VerticalAlignment="Stretch">
<Panel <Panel
Name="PART_SizingPanel" x:Name="PART_SizingPanel"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
ClipToBounds="True"> ClipToBounds="True">
<Rectangle <Rectangle
Name="PART_SpectrumRectangle" x:Name="PART_SpectrumRectangle"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
IsHitTestVisible="False" IsHitTestVisible="False"
@ -36,7 +36,7 @@
RadiusY="{TemplateBinding CornerRadius, RadiusY="{TemplateBinding CornerRadius,
Converter={StaticResource BottomRightCornerRadiusConverter}}" /> Converter={StaticResource BottomRightCornerRadiusConverter}}" />
<Rectangle <Rectangle
Name="PART_SpectrumOverlayRectangle" x:Name="PART_SpectrumOverlayRectangle"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
IsHitTestVisible="False" IsHitTestVisible="False"
@ -48,7 +48,7 @@
RadiusY="{TemplateBinding CornerRadius, RadiusY="{TemplateBinding CornerRadius,
Converter={StaticResource BottomRightCornerRadiusConverter}}" /> Converter={StaticResource BottomRightCornerRadiusConverter}}" />
<Ellipse <Ellipse
Name="PART_SpectrumEllipse" x:Name="PART_SpectrumEllipse"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
IsHitTestVisible="False" IsHitTestVisible="False"
@ -56,7 +56,7 @@
Converter={StaticResource EnumToBoolConverter}, Converter={StaticResource EnumToBoolConverter},
ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" /> ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" />
<Ellipse <Ellipse
Name="PART_SpectrumOverlayEllipse" x:Name="PART_SpectrumOverlayEllipse"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
IsHitTestVisible="False" IsHitTestVisible="False"
@ -64,24 +64,24 @@
Converter={StaticResource EnumToBoolConverter}, Converter={StaticResource EnumToBoolConverter},
ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" /> ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" />
<Canvas <Canvas
Name="PART_InputTarget" x:Name="PART_InputTarget"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Background="Transparent"> Background="Transparent">
<!-- Note: ToolTip.VerticalOffset is for touch devices to keep the tip above fingers --> <!-- Note: ToolTip.VerticalOffset is for touch devices to keep the tip above fingers -->
<Panel <Panel
Name="PART_SelectionEllipsePanel" x:Name="PART_SelectionEllipsePanel"
ToolTip.Placement="Top" ToolTip.Placement="Top"
ToolTip.VerticalOffset="-10"> ToolTip.VerticalOffset="-10">
<Ellipse <Ellipse
Name="FocusEllipse" x:Name="FocusEllipse"
Margin="-2" Margin="-2"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
IsHitTestVisible="False" IsHitTestVisible="False"
StrokeThickness="2" /> StrokeThickness="2" />
<Ellipse <Ellipse
Name="SelectionEllipse" x:Name="SelectionEllipse"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
IsHitTestVisible="False" IsHitTestVisible="False"
@ -92,7 +92,7 @@
</Panel> </Panel>
</Canvas> </Canvas>
<Rectangle <Rectangle
Name="BorderRectangle" x:Name="BorderRectangle"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
IsHitTestVisible="False" IsHitTestVisible="False"
@ -104,7 +104,7 @@
RadiusY="{TemplateBinding CornerRadius, RadiusY="{TemplateBinding CornerRadius,
Converter={StaticResource BottomRightCornerRadiusConverter}}" /> Converter={StaticResource BottomRightCornerRadiusConverter}}" />
<Ellipse <Ellipse
Name="BorderEllipse" x:Name="BorderEllipse"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
IsHitTestVisible="False" IsHitTestVisible="False"

54
src/Semi.Avalonia.ColorPicker/Controls/ColorView.axaml
View File

@ -90,7 +90,7 @@
ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplate="{TemplateBinding ContentTemplate}"
CornerRadius="{TemplateBinding CornerRadius}" /> CornerRadius="{TemplateBinding CornerRadius}" />
<Rectangle <Rectangle
Name="BorderRectangle" x:Name="BorderRectangle"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
IsHitTestVisible="False" IsHitTestVisible="False"
@ -124,7 +124,7 @@
<Setter Property="RadioButton.Template"> <Setter Property="RadioButton.Template">
<ControlTemplate TargetType="RadioButton"> <ControlTemplate TargetType="RadioButton">
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter" x:Name="PART_ContentPresenter"
Margin="{TemplateBinding Margin}" Margin="{TemplateBinding Margin}"
Padding="{TemplateBinding Padding}" Padding="{TemplateBinding Padding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@ -174,7 +174,7 @@
<!-- Backgrounds --> <!-- Backgrounds -->
<!-- TODO: Background="{DynamicResource ColorViewTabBackgroundBrush}" --> <!-- TODO: Background="{DynamicResource ColorViewTabBackgroundBrush}" -->
<Border <Border
Name="ContentBackgroundBorder" x:Name="ContentBackgroundBorder"
Grid.Row="0" Grid.Row="0"
Grid.RowSpan="2" Grid.RowSpan="2"
Height="{TemplateBinding Height}" Height="{TemplateBinding Height}"
@ -186,7 +186,7 @@
CornerRadius="{TemplateBinding CornerRadius}" /> CornerRadius="{TemplateBinding CornerRadius}" />
<TabControl <TabControl
Name="PART_TabControl" x:Name="PART_TabControl"
Grid.Row="0" Grid.Row="0"
Padding="0" Padding="0"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
@ -223,7 +223,7 @@
<ColumnDefinition Width="Auto" MinWidth="32" /> <ColumnDefinition Width="Auto" MinWidth="32" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<primitives:ColorSlider <primitives:ColorSlider
Name="ColorSpectrumThirdComponentSlider" x:Name="ColorSpectrumThirdComponentSlider"
Grid.Column="0" Grid.Column="0"
Margin="0,0,12,0" Margin="0,0,12,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
@ -237,7 +237,7 @@
IsVisible="{TemplateBinding IsColorSpectrumSliderVisible}" IsVisible="{TemplateBinding IsColorSpectrumSliderVisible}"
Orientation="Vertical" /> Orientation="Vertical" />
<primitives:ColorSpectrum <primitives:ColorSpectrum
Name="ColorSpectrum" x:Name="ColorSpectrum"
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
@ -251,7 +251,7 @@
MinValue="{TemplateBinding MinValue}" MinValue="{TemplateBinding MinValue}"
Shape="{TemplateBinding ColorSpectrumShape}" /> Shape="{TemplateBinding ColorSpectrumShape}" />
<primitives:ColorSlider <primitives:ColorSlider
Name="ColorSpectrumAlphaSlider" x:Name="ColorSpectrumAlphaSlider"
Grid.Column="2" Grid.Column="2"
Margin="12,0,0,0" Margin="12,0,0,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
@ -347,7 +347,7 @@
CornerRadius="3"> CornerRadius="3">
<Grid ColumnDefinitions="1*,1*" IsVisible="{TemplateBinding IsColorModelVisible}"> <Grid ColumnDefinitions="1*,1*" IsVisible="{TemplateBinding IsColorModelVisible}">
<RadioButton <RadioButton
Name="RgbRadioButton" x:Name="RgbRadioButton"
Grid.Column="0" Grid.Column="0"
HorizontalContentAlignment="Center" HorizontalContentAlignment="Center"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
@ -359,7 +359,7 @@
Mode=TwoWay}" Mode=TwoWay}"
Theme="{DynamicResource ColorViewRadioButton}" /> Theme="{DynamicResource ColorViewRadioButton}" />
<RadioButton <RadioButton
Name="HsvRadioButton" x:Name="HsvRadioButton"
Grid.Column="1" Grid.Column="1"
HorizontalContentAlignment="Center" HorizontalContentAlignment="Center"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
@ -373,7 +373,7 @@
</Grid> </Grid>
</Border> </Border>
<TextBox <TextBox
Name="PART_HexTextBox" x:Name="PART_HexTextBox"
Grid.Column="2" Grid.Column="2"
Height="32" Height="32"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
@ -385,7 +385,7 @@
<!-- Color component editing controls --> <!-- Color component editing controls -->
<!-- Component 1 RGB:Red HSV:Hue --> <!-- Component 1 RGB:Red HSV:Hue -->
<NumericUpDown <NumericUpDown
Name="Component1NumericUpDown" x:Name="Component1NumericUpDown"
Grid.Row="2" Grid.Row="2"
Grid.Column="0" Grid.Column="0"
Width="{DynamicResource ColorViewNumericUpDownWidth}" Width="{DynamicResource ColorViewNumericUpDownWidth}"
@ -400,7 +400,7 @@
ShowButtonSpinner="False" ShowButtonSpinner="False"
Value="{Binding Value, ElementName=Component1Slider}" /> Value="{Binding Value, ElementName=Component1Slider}" />
<primitives:ColorSlider <primitives:ColorSlider
Name="Component1Slider" x:Name="Component1Slider"
Grid.Row="2" Grid.Row="2"
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
@ -416,7 +416,7 @@
TickFrequency="1" /> TickFrequency="1" />
<!-- Component 2 RGB:Green HSV:Saturation --> <!-- Component 2 RGB:Green HSV:Saturation -->
<NumericUpDown <NumericUpDown
Name="Component2NumericUpDown" x:Name="Component2NumericUpDown"
Grid.Row="3" Grid.Row="3"
Grid.Column="0" Grid.Column="0"
Width="{DynamicResource ColorViewNumericUpDownWidth}" Width="{DynamicResource ColorViewNumericUpDownWidth}"
@ -431,7 +431,7 @@
ShowButtonSpinner="False" ShowButtonSpinner="False"
Value="{Binding Value, ElementName=Component2Slider}" /> Value="{Binding Value, ElementName=Component2Slider}" />
<primitives:ColorSlider <primitives:ColorSlider
Name="Component2Slider" x:Name="Component2Slider"
Grid.Row="3" Grid.Row="3"
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
@ -447,7 +447,7 @@
TickFrequency="1" /> TickFrequency="1" />
<!-- Component 3 RGB:Blue HSV:Value --> <!-- Component 3 RGB:Blue HSV:Value -->
<NumericUpDown <NumericUpDown
Name="Component3NumericUpDown" x:Name="Component3NumericUpDown"
Grid.Row="4" Grid.Row="4"
Grid.Column="0" Grid.Column="0"
Width="{DynamicResource ColorViewNumericUpDownWidth}" Width="{DynamicResource ColorViewNumericUpDownWidth}"
@ -462,7 +462,7 @@
ShowButtonSpinner="False" ShowButtonSpinner="False"
Value="{Binding Value, ElementName=Component3Slider}" /> Value="{Binding Value, ElementName=Component3Slider}" />
<primitives:ColorSlider <primitives:ColorSlider
Name="Component3Slider" x:Name="Component3Slider"
Grid.Row="4" Grid.Row="4"
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
@ -478,7 +478,7 @@
TickFrequency="1" /> TickFrequency="1" />
<!-- Alpha Component --> <!-- Alpha Component -->
<NumericUpDown <NumericUpDown
Name="AlphaComponentNumericUpDown" x:Name="AlphaComponentNumericUpDown"
Grid.Row="5" Grid.Row="5"
Grid.Column="0" Grid.Column="0"
Width="{DynamicResource ColorViewNumericUpDownWidth}" Width="{DynamicResource ColorViewNumericUpDownWidth}"
@ -500,7 +500,7 @@
</NumericUpDown.IsVisible> </NumericUpDown.IsVisible>
</NumericUpDown> </NumericUpDown>
<primitives:ColorSlider <primitives:ColorSlider
Name="AlphaComponentSlider" x:Name="AlphaComponentSlider"
Grid.Row="5" Grid.Row="5"
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
@ -584,7 +584,7 @@
CornerRadius="8 8 0 0" CornerRadius="8 8 0 0"
ClipToBounds="True"> ClipToBounds="True">
<primitives:ColorSpectrum <primitives:ColorSpectrum
Name="ColorSpectrum" x:Name="ColorSpectrum"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Components="{TemplateBinding ColorSpectrumComponents}" Components="{TemplateBinding ColorSpectrumComponents}"
@ -598,7 +598,7 @@
Shape="{TemplateBinding ColorSpectrumShape}" /> Shape="{TemplateBinding ColorSpectrumShape}" />
</Border> </Border>
<primitives:ColorSlider <primitives:ColorSlider
Name="ColorSpectrumThirdComponentSlider" x:Name="ColorSpectrumThirdComponentSlider"
Grid.Row="1" Grid.Row="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
@ -610,7 +610,7 @@
Orientation="Horizontal" /> Orientation="Horizontal" />
<primitives:ColorSlider <primitives:ColorSlider
Name="ColorSpectrumAlphaSlider" x:Name="ColorSpectrumAlphaSlider"
Grid.Row="2" Grid.Row="2"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
@ -637,32 +637,32 @@
Height="20" Height="20"
CornerRadius="4" /> CornerRadius="4" />
<Panel <Panel
Name="PART_TextBoxPanel" x:Name="PART_TextBoxPanel"
Width="106" Width="106"
Margin="4 0 0 0" Margin="4 0 0 0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center"> VerticalAlignment="Center">
<TextBox <TextBox
Name="PART_HexTextBox" x:Name="PART_HexTextBox"
Classes="Small" Classes="Small"
InnerLeftContent="#" InnerLeftContent="#"
IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Hex}" IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Hex}"
Text="{TemplateBinding Color, Converter={StaticResource ColorToHexConverter}, Mode=TwoWay}" Text="{TemplateBinding Color, Converter={StaticResource ColorToHexConverter}, Mode=TwoWay}"
MaxLength="8" /> MaxLength="8" />
<TextBox <TextBox
Name="PART_RgbaTextBox" x:Name="PART_RgbaTextBox"
Classes="Small" Classes="Small"
IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Rgba}" IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Rgba}"
Text="{TemplateBinding Color, Converter={StaticResource ColorToTextConverter}, Mode=TwoWay}" /> Text="{TemplateBinding Color, Converter={StaticResource ColorToTextConverter}, Mode=TwoWay}" />
<TextBox <TextBox
Name="PART_HsvaTextBox" x:Name="PART_HsvaTextBox"
Classes="Small" Classes="Small"
IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Hsva}" IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Hsva}"
Text="{TemplateBinding HsvColor, Converter={StaticResource HsvColorToTextConverter}, Mode=TwoWay}" /> Text="{TemplateBinding HsvColor, Converter={StaticResource HsvColorToTextConverter}, Mode=TwoWay}" />
</Panel> </Panel>
<NumericUpDown <NumericUpDown
Name="AlphaComponentNumericUpDown" x:Name="AlphaComponentNumericUpDown"
Width="70" Width="70"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
@ -677,7 +677,7 @@
IsVisible="{TemplateBinding IsAlphaVisible}" IsVisible="{TemplateBinding IsAlphaVisible}"
Value="{Binding #ColorSpectrumAlphaSlider.Value}" /> Value="{Binding #ColorSpectrumAlphaSlider.Value}" />
<ComboBox <ComboBox
Name="ColorModelComboBox" x:Name="ColorModelComboBox"
Width="80" Width="80"
VerticalAlignment="Center" VerticalAlignment="Center"
Classes="Small" Classes="Small"

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

@ -17,5 +17,5 @@
<SolidColorBrush x:Key="ColorSpectrumBorderBrush" Opacity="0.08" Color="#1C1F23" /> <SolidColorBrush x:Key="ColorSpectrumBorderBrush" Opacity="0.08" Color="#1C1F23" />
<BoxShadows x:Key="ColorPreviewerMainBoxShadow">inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000</BoxShadows> <BoxShadows x:Key="ColorPreviewerMainBoxShadow">0 0 14 0 #1AFFFFFF</BoxShadows>
</ResourceDictionary> </ResourceDictionary>

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

@ -17,5 +17,5 @@
<SolidColorBrush x:Key="ColorSpectrumBorderBrush" Opacity="0.08" Color="#1C1F23" /> <SolidColorBrush x:Key="ColorSpectrumBorderBrush" Opacity="0.08" Color="#1C1F23" />
<BoxShadows x:Key="ColorPreviewerMainBoxShadow">0 0 1 #4A000000, 0 4 14 #1A000000</BoxShadows> <BoxShadows x:Key="ColorPreviewerMainBoxShadow">0 0 14 0 #1A000000</BoxShadows>
</ResourceDictionary> </ResourceDictionary>

2
src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj
View File

@ -4,7 +4,7 @@
<PropertyGroup> <PropertyGroup>
<Title>Semi.Avalonia.ColorPicker</Title> <Title>Semi.Avalonia.ColorPicker</Title>
<PackageReleaseNotes>Update to Semi.Avalonia.ColorPicker 11.2.1.1</PackageReleaseNotes> <PackageReleaseNotes>Update to Avalonia 11.2.0</PackageReleaseNotes>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))"> <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">

38
src/Semi.Avalonia.DataGrid/DataGrid.axaml
View File

@ -34,14 +34,14 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<Border <Border
Name="CellBorder" x:Name="CellBorder"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}"> CornerRadius="{TemplateBinding CornerRadius}">
<Grid Name="PART_CellRoot" ColumnDefinitions="*,Auto"> <Grid x:Name="PART_CellRoot" ColumnDefinitions="*,Auto">
<Rectangle <Rectangle
Name="CurrencyVisual" x:Name="CurrencyVisual"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Fill="Transparent" Fill="Transparent"
@ -50,7 +50,7 @@
Stroke="{DynamicResource DataGridCellCurrentBorderBrush}" Stroke="{DynamicResource DataGridCellCurrentBorderBrush}"
StrokeThickness="{DynamicResource DataGridCellVisualStrokeThickness}" /> StrokeThickness="{DynamicResource DataGridCellVisualStrokeThickness}" />
<Panel <Panel
Name="FocusVisual" x:Name="FocusVisual"
Grid.Column="0" Grid.Column="0"
IsHitTestVisible="False" IsHitTestVisible="False"
IsVisible="False"> IsVisible="False">
@ -74,7 +74,7 @@
Foreground="{TemplateBinding Foreground}" /> Foreground="{TemplateBinding Foreground}" />
<Rectangle <Rectangle
Name="InvalidVisualElement" x:Name="InvalidVisualElement"
Grid.Column="0" Grid.Column="0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
@ -116,7 +116,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="DataGridColumnHeader"> <ControlTemplate TargetType="DataGridColumnHeader">
<Border <Border
Name="HeaderBorder" x:Name="HeaderBorder"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
@ -152,7 +152,7 @@
Fill="{TemplateBinding SeparatorBrush}" Fill="{TemplateBinding SeparatorBrush}"
IsVisible="{TemplateBinding AreSeparatorsVisible}" /> IsVisible="{TemplateBinding AreSeparatorsVisible}" />
<Panel <Panel
Name="FocusVisual" x:Name="FocusVisual"
Grid.Column="0" Grid.Column="0"
IsHitTestVisible="False" IsHitTestVisible="False"
IsVisible="False"> IsVisible="False">
@ -203,7 +203,7 @@
TargetType="DataGridColumnHeader"> TargetType="DataGridColumnHeader">
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<Grid Name="TopLeftHeaderRoot" RowDefinitions="*,*,Auto"> <Grid x:Name="TopLeftHeaderRoot" RowDefinitions="*,*,Auto">
<Border <Border
Grid.RowSpan="2" Grid.RowSpan="2"
BorderBrush="{DynamicResource DataGridLineBrush}" BorderBrush="{DynamicResource DataGridLineBrush}"
@ -227,7 +227,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<Grid <Grid
Name="PART_Root" x:Name="PART_Root"
ColumnDefinitions="Auto,*" ColumnDefinitions="Auto,*"
RowDefinitions="*,*,Auto"> RowDefinitions="*,*,Auto">
<Border <Border
@ -237,18 +237,18 @@
BorderThickness="0,0,1,0"> BorderThickness="0,0,1,0">
<Grid Background="{TemplateBinding Background}"> <Grid Background="{TemplateBinding Background}">
<Rectangle <Rectangle
Name="RowInvalidVisualElement" x:Name="RowInvalidVisualElement"
Fill="{DynamicResource DataGridCellErrorBrush}" Fill="{DynamicResource DataGridCellErrorBrush}"
Opacity="0" Opacity="0"
Stretch="Fill" /> Stretch="Fill" />
<Rectangle <Rectangle
Name="BackgroundRectangle" x:Name="BackgroundRectangle"
Fill="{DynamicResource DataGridRowBackground}" Fill="{DynamicResource DataGridRowBackground}"
Stretch="Fill" /> Stretch="Fill" />
</Grid> </Grid>
</Border> </Border>
<Rectangle <Rectangle
Name="HorizontalSeparator" x:Name="HorizontalSeparator"
Grid.Row="2" Grid.Row="2"
Grid.Column="0" Grid.Column="0"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
@ -277,7 +277,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="DataGridRow"> <ControlTemplate TargetType="DataGridRow">
<Border <Border
Name="RowBorder" x:Name="RowBorder"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
@ -295,7 +295,7 @@
Background="{DynamicResource DataGridRowBackground}" Background="{DynamicResource DataGridRowBackground}"
CornerRadius="3" /> CornerRadius="3" />
<Rectangle <Rectangle
Name="InvalidVisualElement" x:Name="InvalidVisualElement"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Fill="{DynamicResource DataGridRowErrorBackground}" Fill="{DynamicResource DataGridRowErrorBackground}"
Opacity="0" /> Opacity="0" />
@ -419,7 +419,7 @@
</StackPanel> </StackPanel>
<Rectangle <Rectangle
Name="CurrencyVisual" x:Name="CurrencyVisual"
Grid.Row="0" Grid.Row="0"
Grid.Column="0" Grid.Column="0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
@ -430,7 +430,7 @@
Stroke="{DynamicResource DataGridRowGroupHeaderCurrentBorderBrush}" Stroke="{DynamicResource DataGridRowGroupHeaderCurrentBorderBrush}"
StrokeThickness="{DynamicResource DataGridRowGroupHeaderVisualStrokeThickness}" /> StrokeThickness="{DynamicResource DataGridRowGroupHeaderVisualStrokeThickness}" />
<Panel <Panel
Name="FocusVisual" x:Name="FocusVisual"
Grid.Row="0" Grid.Row="0"
Grid.Column="0" Grid.Column="0"
IsHitTestVisible="False" IsHitTestVisible="False"
@ -453,7 +453,7 @@
DataGridFrozenGrid.IsFrozen="True" /> DataGridFrozenGrid.IsFrozen="True" />
<Rectangle <Rectangle
Name="PART_BottomGridLine" x:Name="PART_BottomGridLine"
Grid.Row="1" Grid.Row="1"
Grid.Column="0" Grid.Column="0"
Grid.ColumnSpan="5" Grid.ColumnSpan="5"
@ -482,7 +482,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="DataGrid"> <ControlTemplate TargetType="DataGrid">
<Border <Border
Name="DataGridBorder" x:Name="DataGridBorder"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
@ -544,7 +544,7 @@
Orientation="Horizontal" /> Orientation="Horizontal" />
</Grid> </Grid>
<Border <Border
Name="PART_DisabledVisualElement" x:Name="PART_DisabledVisualElement"
Grid.Row="0" Grid.Row="0"
Grid.RowSpan="4" Grid.RowSpan="4"
Grid.Column="0" Grid.Column="0"

2
src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj
View File

@ -4,7 +4,7 @@
<PropertyGroup> <PropertyGroup>
<Title>Semi.Avalonia.DataGrid</Title> <Title>Semi.Avalonia.DataGrid</Title>
<PackageReleaseNotes>Update to Semi.Avalonia.DataGrid 11.2.1.1</PackageReleaseNotes> <PackageReleaseNotes>Update to Avalonia 11.2.0</PackageReleaseNotes>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))"> <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">

4
src/Semi.Avalonia.TreeDataGrid/Index.axaml
View File

@ -2,8 +2,8 @@
<Styles.Resources> <Styles.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.ThemeDictionaries> <ResourceDictionary.ThemeDictionaries>
<ResourceInclude x:Key="Default" Source="avares://Semi.Avalonia.TreeDataGrid/Light.axaml" /> <MergeResourceInclude x:Key="Default" Source="avares://Semi.Avalonia.TreeDataGrid/Light.axaml" />
<ResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia.TreeDataGrid/Dark.axaml" /> <MergeResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia.TreeDataGrid/Dark.axaml" />
</ResourceDictionary.ThemeDictionaries> </ResourceDictionary.ThemeDictionaries>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceInclude Source="avares://Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml" /> <ResourceInclude Source="avares://Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml" />

6
src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj
View File

@ -4,14 +4,14 @@
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<Version>11.0.10.1</Version> <PackageReleaseNotes>Update to Avalonia 11.1-rc1</PackageReleaseNotes>
<PackageReleaseNotes>Update to 11.0.10.1</PackageReleaseNotes>
<Authors>IRIHI Technology Co., Ltd.</Authors> <Authors>IRIHI Technology Co., Ltd.</Authors>
<Description>Avalonia Theme inspired by Semi Design.</Description> <Description>Avalonia Theme inspired by Semi Design.</Description>
<RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl> <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression> <PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>irihi.png</PackageIcon> <PackageIcon>irihi.png</PackageIcon>
<PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl> <PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
<AvaloniaVersion>11.0.0</AvaloniaVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))"> <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
@ -19,7 +19,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia.Controls.TreeDataGrid" Version="11.0.10"/> <PackageReference Include="Avalonia.Controls.TreeDataGrid" Version="$(AvaloniaVersion)"/>
<None Include="irihi.png" Pack="true" PackagePath=""/> <None Include="irihi.png" Pack="true" PackagePath=""/>
</ItemGroup> </ItemGroup>

14
src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml
View File

@ -11,7 +11,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="TreeDataGrid"> <ControlTemplate TargetType="TreeDataGrid">
<Border <Border
Name="RootBorder" x:Name="RootBorder"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
@ -23,7 +23,7 @@
HorizontalScrollBarVisibility="Hidden" HorizontalScrollBarVisibility="Hidden"
IsVisible="{TemplateBinding ShowColumnHeaders}" IsVisible="{TemplateBinding ShowColumnHeaders}"
VerticalScrollBarVisibility="Disabled"> VerticalScrollBarVisibility="Disabled">
<Border Name="ColumnHeadersPresenterBorder"> <Border x:Name="ColumnHeadersPresenterBorder">
<TreeDataGridColumnHeadersPresenter <TreeDataGridColumnHeadersPresenter
Name="PART_ColumnHeadersPresenter" Name="PART_ColumnHeadersPresenter"
ElementFactory="{TemplateBinding ElementFactory}" ElementFactory="{TemplateBinding ElementFactory}"
@ -173,7 +173,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<Border <Border
Name="CellBorder" x:Name="CellBorder"
Padding="{TemplateBinding Padding}" Padding="{TemplateBinding Padding}"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
@ -205,7 +205,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Background="Transparent"> Background="Transparent">
<PathIcon <PathIcon
Name="ChevronPath" x:Name="ChevronPath"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Data="{DynamicResource TreeDataGridItemCollapsedChevronPathData}" Data="{DynamicResource TreeDataGridItemCollapsedChevronPathData}"
@ -222,7 +222,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<Border <Border
Name="CellBorder" x:Name="CellBorder"
Padding="{TemplateBinding Indent, Padding="{TemplateBinding Indent,
Converter={x:Static conv:IndentConverter.Instance}}" Converter={x:Static conv:IndentConverter.Instance}}"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
@ -253,7 +253,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<Border <Border
Name="CellBorder" x:Name="CellBorder"
Padding="{TemplateBinding Padding}" Padding="{TemplateBinding Padding}"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
@ -275,7 +275,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<Border <Border
Name="CellBorder" x:Name="CellBorder"
Padding="{TemplateBinding Padding}" Padding="{TemplateBinding Padding}"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"

12
src/Semi.Avalonia/Controls/AdornerLayer.axaml
View File

@ -5,17 +5,9 @@
<ControlTheme x:Key="{x:Type AdornerLayer}" TargetType="AdornerLayer"> <ControlTheme x:Key="{x:Type AdornerLayer}" TargetType="AdornerLayer">
<Setter Property="DefaultFocusAdorner"> <Setter Property="DefaultFocusAdorner">
<FocusAdornerTemplate> <FocusAdornerTemplate>
<Border Theme="{DynamicResource AdornerLayerBorder}" /> <Border BorderThickness="{DynamicResource AdornerLayerBorderThickness}"
BorderBrush="{DynamicResource AdornerLayerStroke}" />
</FocusAdornerTemplate> </FocusAdornerTemplate>
</Setter> </Setter>
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="AdornerLayerBorder" TargetType="Border">
<Setter Property="BorderThickness" Value="{DynamicResource AdornerLayerBorderThickness}" />
<Setter Property="BorderBrush" Value="{DynamicResource AdornerLayerBorderBrush}" />
<Setter Property="CornerRadius" Value="{DynamicResource AdornerLayerCornerRadius}" />
<Style Selector="^.Solid">
<Setter Property="BorderBrush" Value="{DynamicResource AdornerLayerSolidBorderBrush}" />
</Style>
</ControlTheme>
</ResourceDictionary> </ResourceDictionary>

18
src/Semi.Avalonia/Controls/AutoCompleteBox.axaml
View File

@ -27,13 +27,12 @@
Watermark="{TemplateBinding Watermark}" /> Watermark="{TemplateBinding Watermark}" />
<Popup <Popup
Name="PART_Popup" Name="PART_Popup"
MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
MaxHeight="{TemplateBinding MaxDropDownHeight}" MaxHeight="{TemplateBinding MaxDropDownHeight}"
IsLightDismissEnabled="True" IsLightDismissEnabled="True"
PlacementTarget="{TemplateBinding}"> PlacementTarget="{TemplateBinding}">
<Border <Border
MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
Margin="{DynamicResource AutoCompleteBoxPopupMargin}" Margin="{DynamicResource AutoCompleteBoxPopupMargin}"
Padding="{DynamicResource AutoCompleteBoxPopupPadding}"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Background="{DynamicResource AutoCompleteBoxPopupBackground}" Background="{DynamicResource AutoCompleteBoxPopupBackground}"
BorderBrush="{DynamicResource AutoCompleteBoxPopupBorderBrush}" BorderBrush="{DynamicResource AutoCompleteBoxPopupBorderBrush}"
@ -66,25 +65,24 @@
Watermark="{TemplateBinding Watermark}" /> Watermark="{TemplateBinding Watermark}" />
<Popup <Popup
Name="PART_Popup" Name="PART_Popup"
MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
MaxHeight="{TemplateBinding MaxDropDownHeight}" MaxHeight="{TemplateBinding MaxDropDownHeight}"
IsLightDismissEnabled="True" IsLightDismissEnabled="True"
PlacementTarget="{TemplateBinding}"> PlacementTarget="{TemplateBinding}">
<Border <Border
MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
Margin="{DynamicResource AutoCompleteBoxPopupMargin}" Margin="{DynamicResource AutoCompleteBoxPopupMargin}"
Padding="{DynamicResource AutoCompleteBoxPopupPadding}"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Background="{DynamicResource AutoCompleteBoxPopupBackground}" Background="{DynamicResource AutoCompleteBoxPopupBackground}"
BorderBrush="{DynamicResource AutoCompleteBoxPopupBorderBrush}" BorderBrush="{DynamicResource AutoCompleteBoxPopupBorderBrush}"
BorderThickness="{DynamicResource AutoCompleteBoxPopupBorderThickness}" BorderThickness="{DynamicResource AutoCompleteBoxPopupBorderThickness}"
BoxShadow="{DynamicResource AutoCompleteBoxPopupBoxShadow}" BoxShadow="{DynamicResource AutoCompleteBoxPopupBoxShadow}"
CornerRadius="{DynamicResource AutoCompleteBoxPopupCornerRadius}"> CornerRadius="{DynamicResource AutoCompleteBoxPopupCornerRadius}">
<ListBox <ListBox
Name="PART_SelectingItemsControl" Name="PART_SelectingItemsControl"
Foreground="{TemplateBinding Foreground}" Foreground="{TemplateBinding Foreground}"
ItemTemplate="{TemplateBinding ItemTemplate}" ItemTemplate="{TemplateBinding ItemTemplate}"
ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto"
ScrollViewer.VerticalScrollBarVisibility="Auto" /> ScrollViewer.VerticalScrollBarVisibility="Auto" />
</Border> </Border>
</Popup> </Popup>
</Panel> </Panel>

12
src/Semi.Avalonia/Controls/Border.axaml
View File

@ -17,12 +17,12 @@
</Design.PreviewWith> </Design.PreviewWith>
<ControlTheme x:Key="CardBorder" TargetType="Border"> <ControlTheme x:Key="CardBorder" TargetType="Border">
<Setter Property="Padding" Value="{DynamicResource ThicknessCardPadding}" /> <Setter Property="Border.Padding" Value="{DynamicResource ThicknessCardPadding}" />
<Setter Property="BorderBrush" Value="{DynamicResource BorderCardBorderBrush}" /> <Setter Property="Border.BorderBrush" Value="{DynamicResource BorderCardBorderBrush}" />
<Setter Property="CornerRadius" Value="{DynamicResource RadiusCardCornerRadius}" /> <Setter Property="Border.CornerRadius" Value="{DynamicResource RadiusCardCornerRadius}" />
<Setter Property="Background" Value="{DynamicResource BorderCardBackground}" /> <Setter Property="Border.Background" Value="{DynamicResource BorderCardBackground}" />
<Setter Property="BorderThickness" Value="{DynamicResource ThicknessCardBorderThickness}" /> <Setter Property="Border.BorderThickness" Value="{DynamicResource ThicknessCardBorderThickness}" />
<Setter Property="Margin" Value="{DynamicResource ThicknessCardMargin}" /> <Setter Property="Border.Margin" Value="{DynamicResource ThicknessCardMargin}" />
<Style Selector="^.Shadow"> <Style Selector="^.Shadow">
<Setter Property="BoxShadow" Value="{DynamicResource BorderCardBoxShadow}" /> <Setter Property="BoxShadow" Value="{DynamicResource BorderCardBoxShadow}" />
</Style> </Style>

26
src/Semi.Avalonia/Controls/Button.axaml
View File

@ -27,7 +27,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="Button"> <ControlTemplate TargetType="Button">
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter" x:Name="PART_ContentPresenter"
Padding="{TemplateBinding Padding}" Padding="{TemplateBinding Padding}"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
@ -102,12 +102,6 @@
x:Key="SolidButton" x:Key="SolidButton"
BasedOn="{StaticResource {x:Type Button}}" BasedOn="{StaticResource {x:Type Button}}"
TargetType="Button"> TargetType="Button">
<Setter Property="FocusAdorner">
<FocusAdornerTemplate>
<Border Theme="{DynamicResource AdornerLayerBorder}"
Classes="Solid" />
</FocusAdornerTemplate>
</Setter>
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter"> <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" /> <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" /> <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
@ -272,20 +266,18 @@
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="InnerIconButton" TargetType="Button"> <ControlTheme x:Key="InnerIconButton" TargetType="Button">
<Setter Property="Width" Value="16"/>
<Setter Property="Height" Value="16"/>
<Setter Property="Foreground" Value="{DynamicResource ButtonInputInnerForeground}" /> <Setter Property="Foreground" Value="{DynamicResource ButtonInputInnerForeground}" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="Cursor" Value="Hand" /> <Setter Property="Cursor" Value="Hand" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="Button"> <ControlTemplate TargetType="Button">
<PathIcon <ContentControl Background="Transparent">
Theme="{DynamicResource InnerPathIcon}" <PathIcon
Width="{TemplateBinding Width}" Width="16"
Height="{TemplateBinding Height}" Height="16"
Data="{TemplateBinding Content}" Margin="{TemplateBinding Padding}"
Foreground="{TemplateBinding Foreground}" Data="{TemplateBinding Content}"
Background="{TemplateBinding Background}" /> Foreground="{TemplateBinding Foreground}" />
</ContentControl>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^:pointerover"> <Style Selector="^:pointerover">

10
src/Semi.Avalonia/Controls/ButtonSpinner.axaml
View File

@ -13,7 +13,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter" x:Name="PART_ContentPresenter"
Padding="{TemplateBinding Padding}" Padding="{TemplateBinding Padding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
@ -73,8 +73,8 @@
Grid.Row="0" Grid.Row="0"
Theme="{StaticResource ButtonSpinnerRepeatButton}"> Theme="{StaticResource ButtonSpinnerRepeatButton}">
<PathIcon <PathIcon
Theme="{DynamicResource InnerPathIcon}" Width="8"
Classes="ExtraSmall" Height="8"
Data="{DynamicResource ButtonSpinnerIncreaseButtonGlyph}" Data="{DynamicResource ButtonSpinnerIncreaseButtonGlyph}"
Foreground="{DynamicResource ButtonSpinnerRepeatButtonForeground}" /> Foreground="{DynamicResource ButtonSpinnerRepeatButtonForeground}" />
</RepeatButton> </RepeatButton>
@ -83,8 +83,8 @@
Grid.Row="1" Grid.Row="1"
Theme="{StaticResource ButtonSpinnerRepeatButton}"> Theme="{StaticResource ButtonSpinnerRepeatButton}">
<PathIcon <PathIcon
Theme="{DynamicResource InnerPathIcon}" Width="8"
Classes="ExtraSmall" Height="8"
Data="{DynamicResource ButtonSpinnerDecreaseButtonGlyph}" Data="{DynamicResource ButtonSpinnerDecreaseButtonGlyph}"
Foreground="{DynamicResource ButtonSpinnerRepeatButtonForeground}" /> Foreground="{DynamicResource ButtonSpinnerRepeatButtonForeground}" />
</RepeatButton> </RepeatButton>

38
src/Semi.Avalonia/Controls/Calendar.axaml
View File

@ -65,8 +65,8 @@
Foreground="{TemplateBinding Foreground}" Foreground="{TemplateBinding Foreground}"
Theme="{DynamicResource BorderlessButton}"> Theme="{DynamicResource BorderlessButton}">
<PathIcon <PathIcon
Theme="{DynamicResource InnerPathIcon}" Width="12"
Classes="Large" Height="12"
Data="{DynamicResource CalendarItemPreviousIconGlyph}" Data="{DynamicResource CalendarItemPreviousIconGlyph}"
Foreground="{DynamicResource CalendarItemIconForeground}" /> Foreground="{DynamicResource CalendarItemIconForeground}" />
</Button> </Button>
@ -85,8 +85,8 @@
Foreground="{TemplateBinding Foreground}" Foreground="{TemplateBinding Foreground}"
Theme="{DynamicResource BorderlessButton}"> Theme="{DynamicResource BorderlessButton}">
<PathIcon <PathIcon
Theme="{DynamicResource InnerPathIcon}" Width="12"
Classes="Large" Height="12"
Data="{DynamicResource CalendarItemNextIconGlyph}" Data="{DynamicResource CalendarItemNextIconGlyph}"
Foreground="{DynamicResource CalendarItemIconForeground}" /> Foreground="{DynamicResource CalendarItemIconForeground}" />
</Button> </Button>
@ -95,8 +95,7 @@
Name="PART_MonthView" Name="PART_MonthView"
Grid.Row="1" Grid.Row="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
IsVisible="False" IsVisible="False">
ColumnDefinitions="*,*,*,*,*,*,*">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="{DynamicResource CalendarItemWeekDayNameHeight}" /> <RowDefinition Height="{DynamicResource CalendarItemWeekDayNameHeight}" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
@ -106,14 +105,33 @@
<RowDefinition Height="*" /> <RowDefinition Height="*" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
</Grid> </Grid>
<Grid <Grid
Name="PART_YearView" Name="PART_YearView"
Grid.Row="1" Grid.Row="1"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
IsVisible="False" IsVisible="False">
ColumnDefinitions="*,*,*,*" <Grid.RowDefinitions>
RowDefinitions="*,*,*" /> <RowDefinition Height="*" />
<RowDefinition Height="*" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
</Grid>
</Grid> </Grid>
</Border> </Border>
</ControlTemplate> </ControlTemplate>
@ -133,7 +151,6 @@
<Setter Property="VerticalContentAlignment" Value="Center" /> <Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="HorizontalAlignment" Value="Stretch" /> <Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="VerticalAlignment" Value="Stretch" /> <Setter Property="VerticalAlignment" Value="Stretch" />
<Setter Property="Cursor" Value="Hand" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="CalendarButton"> <ControlTemplate TargetType="CalendarButton">
<ContentControl <ContentControl
@ -194,7 +211,6 @@
<Setter Property="VerticalAlignment" Value="Stretch" /> <Setter Property="VerticalAlignment" Value="Stretch" />
<Setter Property="HorizontalContentAlignment" Value="Center" /> <Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="VerticalContentAlignment" Value="Center" /> <Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="Cursor" Value="Hand" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="CalendarDayButton"> <ControlTemplate TargetType="CalendarDayButton">
<ContentControl <ContentControl

34
src/Semi.Avalonia/Controls/CalendarDatePicker.axaml
View File

@ -2,11 +2,6 @@
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"
x:CompileBindings="True"> x:CompileBindings="True">
<Design.PreviewWith>
<StackPanel Margin="20" Width="800" Height="400">
<CalendarDatePicker HorizontalAlignment="Center" Classes="ClearButton" />
</StackPanel>
</Design.PreviewWith>
<ControlTheme x:Key="{x:Type CalendarDatePicker}" TargetType="CalendarDatePicker"> <ControlTheme x:Key="{x:Type CalendarDatePicker}" TargetType="CalendarDatePicker">
<Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackground}" /> <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackground}" />
<Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerForeground}" /> <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerForeground}" />
@ -25,11 +20,11 @@
<ControlTemplate TargetType="CalendarDatePicker"> <ControlTemplate TargetType="CalendarDatePicker">
<DataValidationErrors> <DataValidationErrors>
<Panel <Panel
Name="LayoutRoot" x:Name="LayoutRoot"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"> VerticalAlignment="Stretch">
<Border <Border
Name="Background" x:Name="Background"
BackgroundSizing="{TemplateBinding BackgroundSizing}" BackgroundSizing="{TemplateBinding BackgroundSizing}"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
@ -80,38 +75,41 @@
<Button <Button
Name="ClearButton" Name="ClearButton"
Grid.Column="1" Grid.Column="1"
Theme="{DynamicResource InnerIconButton}" Padding="0,0,8,0"
Margin="8 0"
Content="{DynamicResource IconButtonClearData}" Content="{DynamicResource IconButtonClearData}"
Command="{Binding $parent[CalendarDatePicker].Clear}" Command="{Binding $parent[CalendarDatePicker].Clear}"
Focusable="False" Focusable="False"
IsVisible="False" /> IsVisible="False"
Theme="{DynamicResource InnerIconButton}" />
<Button <Button
Name="PART_Button" Name="PART_Button"
Grid.Column="1" Grid.Column="1"
Theme="{DynamicResource InnerIconButton}" Padding="0,0,8,0"
Margin="8 0"
Content="{DynamicResource CalendarDatePickerIconGlyph}" Content="{DynamicResource CalendarDatePickerIconGlyph}"
Focusable="False" /> Focusable="False"
Theme="{DynamicResource InnerIconButton}" />
<Popup <Popup
Name="PART_Popup" Name="PART_Popup"
Grid.Column="0" Grid.Column="0"
HorizontalOffset="-8"
IsLightDismissEnabled="True" IsLightDismissEnabled="True"
Placement="BottomEdgeAlignedLeft" PlacementTarget="{TemplateBinding}"
PlacementTarget="{TemplateBinding}"> VerticalOffset="-4">
<Border <Border
Margin="4" Margin="8"
Background="Transparent"
BoxShadow="{DynamicResource CalendarDatePickerPopupBoxShadows}" BoxShadow="{DynamicResource CalendarDatePickerPopupBoxShadows}"
CornerRadius="{DynamicResource CalendarCornerRadius}"> CornerRadius="{DynamicResource CalendarCornerRadius}">
<Calendar <Calendar
Name="PART_Calendar" Name="PART_Calendar"
BorderThickness="0" CornerRadius="{Binding $parent[Border].CornerRadius}"
DisplayDate="{TemplateBinding DisplayDate}" DisplayDate="{TemplateBinding DisplayDate}"
DisplayDateEnd="{TemplateBinding DisplayDateEnd}" DisplayDateEnd="{TemplateBinding DisplayDateEnd}"
DisplayDateStart="{TemplateBinding DisplayDateStart}" DisplayDateStart="{TemplateBinding DisplayDateStart}"
FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}" FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}" IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
SelectedDate="{TemplateBinding SelectedDate, Mode=TwoWay}" /> SelectedDate="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedDate, Mode=TwoWay}">
</Calendar>
</Border> </Border>
</Popup> </Popup>
</Grid> </Grid>

23
src/Semi.Avalonia/Controls/CaptionButtons.axaml
View File

@ -2,9 +2,6 @@
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"
x:CompileBindings="True"> x:CompileBindings="True">
<Design.PreviewWith>
<CaptionButtons />
</Design.PreviewWith>
<ControlTheme x:Key="CaptionButton" TargetType="Button"> <ControlTheme x:Key="CaptionButton" TargetType="Button">
<Setter Property="Background" Value="{DynamicResource CaptionButtonPointeroverBackground}" /> <Setter Property="Background" Value="{DynamicResource CaptionButtonPointeroverBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource CaptionButtonPressedBackground}" /> <Setter Property="BorderBrush" Value="{DynamicResource CaptionButtonPressedBackground}" />
@ -46,28 +43,31 @@
Orientation="Horizontal" Orientation="Horizontal"
Spacing="2" Spacing="2"
TextElement.FontSize="10"> TextElement.FontSize="10">
<Button Name="PART_FullScreenButton" Theme="{StaticResource CaptionButton}"> <Button x:Name="PART_FullScreenButton" Theme="{StaticResource CaptionButton}">
<PathIcon <PathIcon
Name="PART_FullScreenButtonIcon" Name="PART_FullScreenButtonIcon"
Theme="{DynamicResource InnerPathIcon}" Width="12"
Height="12"
Data="{DynamicResource WindowExpandGlyph}" Data="{DynamicResource WindowExpandGlyph}"
Foreground="{Binding $parent[Button].Foreground}" /> Foreground="{Binding $parent[Button].Foreground}" />
</Button> </Button>
<Button Name="PART_MinimizeButton" Theme="{StaticResource CaptionButton}"> <Button x:Name="PART_MinimizeButton" Theme="{StaticResource CaptionButton}">
<PathIcon <PathIcon
Theme="{DynamicResource InnerPathIcon}" Width="12"
Height="12"
Data="{DynamicResource WindowMinimizeGlyph}" Data="{DynamicResource WindowMinimizeGlyph}"
Foreground="{Binding $parent[Button].Foreground}" /> Foreground="{Binding $parent[Button].Foreground}" />
</Button> </Button>
<Button Name="PART_RestoreButton" Theme="{StaticResource CaptionButton}"> <Button x:Name="PART_RestoreButton" Theme="{StaticResource CaptionButton}">
<PathIcon <PathIcon
Name="PART_RestoreButtonIcon" Name="PART_RestoreButtonIcon"
Theme="{DynamicResource InnerPathIcon}" Width="12"
Height="12"
Data="{DynamicResource WindowMaximizeGlyph}" Data="{DynamicResource WindowMaximizeGlyph}"
Foreground="{Binding $parent[Button].Foreground}" /> Foreground="{Binding $parent[Button].Foreground}" />
</Button> </Button>
<Button <Button
Name="PART_CloseButton" x:Name="PART_CloseButton"
Background="{DynamicResource CaptionButtonClosePointeroverBackground}" Background="{DynamicResource CaptionButtonClosePointeroverBackground}"
BorderBrush="{DynamicResource CaptionButtonClosePressedBackground}" BorderBrush="{DynamicResource CaptionButtonClosePressedBackground}"
Theme="{StaticResource CaptionButton}"> Theme="{StaticResource CaptionButton}">
@ -80,7 +80,8 @@
</Style> </Style>
</Button.Styles> </Button.Styles>
<PathIcon <PathIcon
Theme="{DynamicResource InnerPathIcon}" Width="12"
Height="12"
Data="{DynamicResource WindowCloseIconGlyph}" Data="{DynamicResource WindowCloseIconGlyph}"
Foreground="{Binding $parent[Button].Foreground}" /> Foreground="{Binding $parent[Button].Foreground}" />
</Button> </Button>

240
src/Semi.Avalonia/Controls/Carousel.axaml
View File

@ -1,66 +1,9 @@
<ResourceDictionary <ResourceDictionary
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:converter="clr-namespace:Semi.Avalonia.Converters" xmlns:converters="clr-namespace:Semi.Avalonia.Converters"
x:CompileBindings="True"> x:CompileBindings="True">
<Design.PreviewWith> <converters:ItemToObjectConverter x:Key="ItemsConverter" />
<StackPanel Spacing="20" Width="800" Height="800">
<StackPanel.Styles>
<Style Selector="Carousel">
<Setter Property="Height" Value="200" />
</Style>
<Style Selector="TextBlock">
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Foreground" Value="#1C1F23" />
</Style>
</StackPanel.Styles>
<Carousel Theme="{DynamicResource FullCarousel}">
<Border Background="#EAF5FF">
<TextBlock Text="Text 1" />
</Border>
<Border Background="#F9F9F9">
<TextBlock Text="Text 2" />
</Border>
<Border Background="#FFF8EA">
<TextBlock Text="Text 3" />
</Border>
<Border Background="#FEF2ED">
<TextBlock Text="Text 4" />
</Border>
</Carousel>
<Carousel Theme="{DynamicResource FullCarousel}"
Classes="Line">
<Border Background="#EAF5FF">
<TextBlock Text="Text 1" />
</Border>
<Border Background="#F9F9F9">
<TextBlock Text="Text 2" />
</Border>
<Border Background="#FFF8EA">
<TextBlock Text="Text 3" />
</Border>
<Border Background="#FEF2ED">
<TextBlock Text="Text 4" />
</Border>
</Carousel>
<Carousel Theme="{DynamicResource FullCarousel}"
Classes="Columnar Left">
<Border Background="#EAF5FF">
<TextBlock Text="Text 1" />
</Border>
<Border Background="#F9F9F9">
<TextBlock Text="Text 2" />
</Border>
<Border Background="#FFF8EA">
<TextBlock Text="Text 3" />
</Border>
<Border Background="#FEF2ED">
<TextBlock Text="Text 4" />
</Border>
</Carousel>
</StackPanel>
</Design.PreviewWith>
<ControlTheme x:Key="{x:Type Carousel}" TargetType="Carousel"> <ControlTheme x:Key="{x:Type Carousel}" TargetType="Carousel">
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
@ -82,94 +25,123 @@
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="CarouselIndicatorDotListBoxItem" TargetType="ListBoxItem"> <ControlTheme x:Key="CarouselIndicatorDotListBoxItem" TargetType="ListBoxItem">
<Setter Property="Foreground" Value="{DynamicResource CarouselIndicatorForeground}" /> <!-- Use fit in different color themes, Use Foreground to normal, Background to hover, BorderBrush to Selected -->
<Setter Property="Margin" Value="4 0"/> <Setter Property="ListBoxItem.Cursor" Value="Hand" />
<Setter Property="Cursor" Value="Hand" /> <Setter Property="ListBoxItem.Foreground" Value="{DynamicResource CarouselIndicatorForeground}" />
<Setter Property="Template"> <Setter Property="ListBoxItem.Template">
<ControlTemplate TargetType="ListBoxItem"> <ControlTemplate TargetType="ListBoxItem">
<Ellipse <Panel>
Name="Container" <Border Padding="4" Background="Transparent">
Width="{DynamicResource CarouselIndicatorDotWidth}" <Ellipse
Height="{DynamicResource CarouselIndicatorDotHeight}" Name="Container"
Fill="{TemplateBinding Foreground}" /> Width="{DynamicResource CarouselIndicatorWidth}"
Height="{DynamicResource CarouselIndicatorHeight}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Fill="{TemplateBinding Foreground}" />
</Border>
</Panel>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^:pointerover"> <Style Selector="^:pointerover /template/ Ellipse#Container">
<Setter Property="Foreground" Value="{DynamicResource CarouselIndicatorPointeroverForeground}" /> <Setter Property="Fill" Value="{DynamicResource CarouselIndicatorPointeroverForeground}" />
</Style> </Style>
<Style Selector="^:pressed"> <Style Selector="^:pressed /template/ Ellipse#Container">
<Setter Property="Foreground" Value="{DynamicResource CarouselIndicatorPressedForeground}" /> <Setter Property="Fill" Value="{DynamicResource CarouselIndicatorPressedForeground}" />
</Style> </Style>
<Style Selector="^:selected"> <Style Selector="^:selected /template/ Ellipse#Container">
<Setter Property="Foreground" Value="{DynamicResource CarouselIndicatorSelectedForeground}" /> <Setter Property="Fill" Value="{DynamicResource CarouselIndicatorSelectedForeground}" />
</Style> </Style>
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="CarouselIndicatorLineListBoxItem" <ControlTheme x:Key="CarouselIndicatorLineListBoxItem" TargetType="ListBoxItem">
BasedOn="{StaticResource CarouselIndicatorDotListBoxItem}" <!-- Use fit in different color themes, Use Foreground to normal, Background to hover, BorderBrush to Selected -->
TargetType="ListBoxItem"> <Setter Property="ListBoxItem.Cursor" Value="Hand" />
<Setter Property="Margin" Value="2 0"/> <Setter Property="ListBoxItem.Background" Value="{DynamicResource CarouselIndicatorForeground}" />
<Setter Property="Template"> <Setter Property="ListBoxItem.Template">
<ControlTemplate TargetType="ListBoxItem"> <ControlTemplate TargetType="ListBoxItem">
<Rectangle <Panel Background="Transparent">
Name="Container" <Border Padding="2,0" Background="Transparent">
Height="{DynamicResource CarouselIndicatorLineHeight}" <Border
Fill="{TemplateBinding Foreground}" /> Name="Container"
Width="{DynamicResource CarouselIndicatorLineWidth}"
Height="{DynamicResource CarouselIndicatorLineHeight}"
Background="{TemplateBinding Background}" />
</Border>
</Panel>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^:pointerover /template/ Border#Container">
<Setter Property="Background" Value="{DynamicResource CarouselIndicatorPointeroverForeground}" />
</Style>
<Style Selector="^:pressed /template/ Border#Container">
<Setter Property="Background" Value="{DynamicResource CarouselIndicatorPressedForeground}" />
</Style>
<Style Selector="^:selected /template/ Border#Container">
<Setter Property="Background" Value="{DynamicResource CarouselIndicatorSelectedForeground}" />
</Style>
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="CarouselIndicatorColumnarListBoxItem" <ControlTheme x:Key="CarouselIndicatorColumnarListBoxItem" TargetType="ListBoxItem">
BasedOn="{StaticResource CarouselIndicatorDotListBoxItem}" <Setter Property="ListBoxItem.Cursor" Value="Hand" />
TargetType="ListBoxItem"> <Setter Property="ListBoxItem.Background" Value="{DynamicResource CarouselIndicatorForeground}" />
<Setter Property="Width" Value="{DynamicResource CarouselIndicatorColumnarWidth}"/> <Setter Property="ListBoxItem.Template">
<Setter Property="Height" Value="{DynamicResource CarouselIndicatorColumnarSelectedHeight}"/>
<Setter Property="Margin" Value="2 0"/>
<Setter Property="Template">
<ControlTemplate TargetType="ListBoxItem"> <ControlTemplate TargetType="ListBoxItem">
<Rectangle <Panel Background="Transparent">
Name="Container" <Border Padding="2,0" Background="Transparent">
Width="{DynamicResource CarouselIndicatorColumnarWidth}" <Border Width="{DynamicResource CarouselIndicatorColumnarWidth}" Height="{DynamicResource CarouselIndicatorColumnarSelectedHeight}">
Height="{DynamicResource CarouselIndicatorColumnarHeight}" <Rectangle
VerticalAlignment="Bottom" Name="Container"
Fill="{TemplateBinding Foreground}"> Width="{DynamicResource CarouselIndicatorColumnarWidth}"
<Rectangle.Transitions> Height="{DynamicResource CarouselIndicatorColumnarHeight}"
<Transitions> VerticalAlignment="Bottom"
<DoubleTransition Property="Height" Duration="0:0:0.2" /> Fill="{TemplateBinding Background}">
</Transitions> <Rectangle.Transitions>
</Rectangle.Transitions> <Transitions>
</Rectangle> <DoubleTransition Property="Height" Duration="0:0:0.2" />
</Transitions>
</Rectangle.Transitions>
</Rectangle>
</Border>
</Border>
</Panel>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^:pointerover /template/ Rectangle#Container">
<Setter Property="Fill" Value="{DynamicResource CarouselIndicatorPointeroverForeground}" />
</Style>
<Style Selector="^:pressed /template/ Rectangle#Container">
<Setter Property="Fill" Value="{DynamicResource CarouselIndicatorPressedForeground}" />
</Style>
<Style Selector="^:selected /template/ Rectangle#Container"> <Style Selector="^:selected /template/ Rectangle#Container">
<Setter Property="Fill" Value="{DynamicResource CarouselIndicatorSelectedForeground}" />
<Setter Property="Height" Value="{DynamicResource CarouselIndicatorColumnarSelectedHeight}" /> <Setter Property="Height" Value="{DynamicResource CarouselIndicatorColumnarSelectedHeight}" />
</Style> </Style>
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="CarouselButton" TargetType="Button"> <ControlTheme x:Key="CarouselButton" TargetType="Button">
<Setter Property="Width" Value="32" /> <Setter Property="Button.Cursor" Value="Hand" />
<Setter Property="Height" Value="32" /> <Setter Property="Button.Foreground" Value="{DynamicResource CarouselButtonForeground}" />
<Setter Property="Foreground" Value="{DynamicResource CarouselButtonForeground}" /> <Setter Property="Button.Template">
<Setter Property="Cursor" Value="Hand" />
<Setter Property="Template">
<ControlTemplate TargetType="Button"> <ControlTemplate TargetType="Button">
<PathIcon <Grid Background="Transparent">
Theme="{DynamicResource InnerPathIcon}" <PathIcon
Width="{TemplateBinding Width}" Width="24"
Height="{TemplateBinding Height}" Height="24"
Data="{DynamicResource CarouselButtonGlyph}" Data="{DynamicResource CarouselButtonGlyph}"
Foreground="{TemplateBinding Foreground}" /> Foreground="{TemplateBinding Foreground}" />
</Grid>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^:pointerover /template/ PathIcon"> <Style Selector="^:pointerover /template/ PathIcon">
<Setter Property="Foreground" Value="{DynamicResource CarouselButtonPointeroverForeground}" /> <Setter Property="Foreground" Value="{DynamicResource CarouselButtonPointeroverForeground}" />
</Style> </Style>
<Style Selector="^:pointerover /template/ PathIcon">
<Setter Property="Foreground" Value="{DynamicResource CarouselButtonPressedForeground}" />
</Style>
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="FullCarousel" TargetType="Carousel"> <ControlTheme x:Key="FullCarousel" TargetType="Carousel">
<Setter Property="PageTransition">
<PageSlide Orientation="Horizontal" Duration="0.3" />
</Setter>
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="Carousel"> <ControlTemplate TargetType="Carousel">
<Grid ColumnDefinitions="Auto, *, Auto" RowDefinitions="*, Auto"> <Grid ColumnDefinitions="Auto, *, Auto" RowDefinitions="*, Auto">
@ -192,15 +164,16 @@
<ListBox <ListBox
Name="PART_ItemsPresenter2" Name="PART_ItemsPresenter2"
Grid.Row="1" Grid.Row="1"
Grid.Column="0" Grid.Column="1"
Grid.ColumnSpan="3" MaxHeight="30"
Margin="32" Margin="0,8"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
ItemContainerTheme="{DynamicResource CarouselIndicatorDotListBoxItem}" ItemContainerTheme="{DynamicResource CarouselIndicatorDotListBoxItem}"
ItemsSource="{TemplateBinding ItemCount, Converter={x:Static converter:ItemConverter.ItemToObjectConverter}}" ItemsSource="{TemplateBinding ItemCount,
IsVisible="{TemplateBinding ItemCount, Converter={x:Static converter:ItemConverter.ItemVisibleConverter}}" Mode=OneWay,
SelectedIndex="{TemplateBinding SelectedIndex, Mode=TwoWay}"> Converter={StaticResource ItemsConverter}}"
SelectedIndex="{Binding SelectedIndex, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}">
<ListBox.ItemsPanel> <ListBox.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<StackPanel Orientation="Horizontal" /> <StackPanel Orientation="Horizontal" />
@ -211,31 +184,30 @@
Grid.Row="0" Grid.Row="0"
Grid.RowSpan="2" Grid.RowSpan="2"
Grid.Column="0" Grid.Column="0"
Theme="{DynamicResource CarouselButton}"
Margin="{DynamicResource CarouselButtonMargin}" Margin="{DynamicResource CarouselButtonMargin}"
VerticalAlignment="Center"
Background="{DynamicResource CarouselButtonPointeroverForeground}"
BorderBrush="{DynamicResource CarouselButtonPressedForeground}"
Command="{Binding $parent[Carousel].Previous}"
Foreground="{DynamicResource CarouselButtonForeground}" Foreground="{DynamicResource CarouselButtonForeground}"
IsVisible="{TemplateBinding ItemCount, Converter={x:Static converter:ItemConverter.ItemVisibleConverter}}" Theme="{DynamicResource CarouselButton}" />
Command="{Binding $parent[Carousel].Previous}" />
<Button <Button
Grid.Row="0" Grid.Row="0"
Grid.RowSpan="2" Grid.RowSpan="2"
Grid.Column="2" Grid.Column="2"
Theme="{DynamicResource CarouselButton}"
Margin="{DynamicResource CarouselButtonMargin}" Margin="{DynamicResource CarouselButtonMargin}"
Foreground="{DynamicResource CarouselButtonForeground}" VerticalAlignment="Center"
IsVisible="{TemplateBinding ItemCount, Converter={x:Static converter:ItemConverter.ItemVisibleConverter}}" Background="{DynamicResource CarouselButtonPointeroverForeground}"
BorderBrush="{DynamicResource CarouselButtonPressedForeground}"
Command="{Binding $parent[Carousel].Next}" Command="{Binding $parent[Carousel].Next}"
RenderTransform="rotate(180deg)" /> Foreground="{DynamicResource CarouselButtonForeground}"
RenderTransform="rotate(180deg)"
Theme="{DynamicResource CarouselButton}" />
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^.Line /template/ ListBox#PART_ItemsPresenter2"> <Style Selector="^.Line /template/ ListBox#PART_ItemsPresenter2">
<Setter Property="ItemContainerTheme" Value="{DynamicResource CarouselIndicatorLineListBoxItem}" /> <Setter Property="ItemContainerTheme" Value="{DynamicResource CarouselIndicatorLineListBoxItem}" />
<Setter Property="ItemsPanel">
<ItemsPanelTemplate>
<UniformGrid Columns="{TemplateBinding ItemCount}" Rows="1" Width="240" />
</ItemsPanelTemplate>
</Setter>
</Style> </Style>
<Style Selector="^.Columnar /template/ ListBox#PART_ItemsPresenter2"> <Style Selector="^.Columnar /template/ ListBox#PART_ItemsPresenter2">
<Setter Property="ItemContainerTheme" Value="{DynamicResource CarouselIndicatorColumnarListBoxItem}" /> <Setter Property="ItemContainerTheme" Value="{DynamicResource CarouselIndicatorColumnarListBoxItem}" />

27
src/Semi.Avalonia/Controls/CheckBox.axaml
View File

@ -26,7 +26,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="CheckBox"> <ControlTemplate TargetType="CheckBox">
<Border <Border
Name="RootBorder" x:Name="RootBorder"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
@ -37,7 +37,7 @@
TemplatedControl.IsTemplateFocusTarget="True" TemplatedControl.IsTemplateFocusTarget="True"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"> VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
<Border <Border
Name="NormalRectangle" x:Name="NormalRectangle"
Width="{DynamicResource CheckBoxBoxWidth}" Width="{DynamicResource CheckBoxBoxWidth}"
Height="{DynamicResource CheckBoxBoxHeight}" Height="{DynamicResource CheckBoxBoxHeight}"
Background="{DynamicResource CheckBoxDefaultBackground}" Background="{DynamicResource CheckBoxDefaultBackground}"
@ -46,14 +46,13 @@
CornerRadius="{TemplateBinding CornerRadius}" CornerRadius="{TemplateBinding CornerRadius}"
UseLayoutRounding="False" /> UseLayoutRounding="False" />
<PathIcon <PathIcon
Name="CheckGlyph" x:Name="CheckGlyph"
Theme="{DynamicResource InnerPathIcon}"
Width="{DynamicResource CheckBoxBoxGlyphWidth}" Width="{DynamicResource CheckBoxBoxGlyphWidth}"
Height="{DynamicResource CheckBoxBoxGlyphHeight}" Height="{DynamicResource CheckBoxBoxGlyphHeight}"
Foreground="{DynamicResource CheckBoxGlyphFill}" /> Foreground="{DynamicResource CheckBoxGlyphFill}" />
</Panel> </Panel>
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter" x:Name="PART_ContentPresenter"
Grid.Column="1" Grid.Column="1"
Margin="{DynamicResource CheckBoxContentMargin}" Margin="{DynamicResource CheckBoxContentMargin}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@ -197,7 +196,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="CheckBox"> <ControlTemplate TargetType="CheckBox">
<Border <Border
Name="RootBorder" x:Name="RootBorder"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
@ -208,7 +207,7 @@
TemplatedControl.IsTemplateFocusTarget="True" TemplatedControl.IsTemplateFocusTarget="True"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"> VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
<Border <Border
Name="NormalRectangle" x:Name="NormalRectangle"
Width="{DynamicResource CheckBoxBoxWidth}" Width="{DynamicResource CheckBoxBoxWidth}"
Height="{DynamicResource CheckBoxBoxHeight}" Height="{DynamicResource CheckBoxBoxHeight}"
Background="{DynamicResource CheckBoxDefaultBackground}" Background="{DynamicResource CheckBoxDefaultBackground}"
@ -217,8 +216,7 @@
CornerRadius="{TemplateBinding CornerRadius}" CornerRadius="{TemplateBinding CornerRadius}"
UseLayoutRounding="False" /> UseLayoutRounding="False" />
<PathIcon <PathIcon
Name="CheckGlyph" x:Name="CheckGlyph"
Theme="{DynamicResource InnerPathIcon}"
Width="{DynamicResource CheckBoxBoxGlyphWidth}" Width="{DynamicResource CheckBoxBoxGlyphWidth}"
Height="{DynamicResource CheckBoxBoxGlyphHeight}" Height="{DynamicResource CheckBoxBoxGlyphHeight}"
Foreground="{DynamicResource CheckBoxGlyphFill}" /> Foreground="{DynamicResource CheckBoxGlyphFill}" />
@ -345,7 +343,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="CheckBox"> <ControlTemplate TargetType="CheckBox">
<Border <Border
Name="RootBorder" x:Name="RootBorder"
Padding="{TemplateBinding Padding}" Padding="{TemplateBinding Padding}"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
@ -360,7 +358,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
Margin="{DynamicResource CheckBoxBoxMargin}"> Margin="{DynamicResource CheckBoxBoxMargin}">
<Border <Border
Name="NormalRectangle" x:Name="NormalRectangle"
Width="{DynamicResource CheckBoxBoxWidth}" Width="{DynamicResource CheckBoxBoxWidth}"
Height="{DynamicResource CheckBoxBoxHeight}" Height="{DynamicResource CheckBoxBoxHeight}"
Background="{DynamicResource CheckBoxDefaultBackground}" Background="{DynamicResource CheckBoxDefaultBackground}"
@ -369,15 +367,14 @@
CornerRadius="{DynamicResource CheckBoxBoxCornerRadius}" CornerRadius="{DynamicResource CheckBoxBoxCornerRadius}"
UseLayoutRounding="False" /> UseLayoutRounding="False" />
<PathIcon <PathIcon
Name="CheckGlyph" x:Name="CheckGlyph"
Theme="{DynamicResource InnerPathIcon}"
Width="{DynamicResource CheckBoxBoxGlyphWidth}" Width="{DynamicResource CheckBoxBoxGlyphWidth}"
Height="{DynamicResource CheckBoxBoxGlyphHeight}" Height="{DynamicResource CheckBoxBoxGlyphHeight}"
Foreground="{DynamicResource CheckBoxGlyphFill}" /> Foreground="{DynamicResource CheckBoxGlyphFill}" />
</Panel> </Panel>
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter" x:Name="PART_ContentPresenter"
Grid.Column="1" Grid.Column="1"
Margin="{DynamicResource CheckBoxContentMargin}" Margin="{DynamicResource CheckBoxContentMargin}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@ -549,7 +546,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="CheckBox"> <ControlTemplate TargetType="CheckBox">
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter" x:Name="PART_ContentPresenter"
Padding="{TemplateBinding Padding}" Padding="{TemplateBinding Padding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"

48
src/Semi.Avalonia/Controls/ComboBox.axaml
View File

@ -30,11 +30,11 @@
<ControlTheme x:Key="{x:Type ComboBox}" TargetType="ComboBox"> <ControlTheme x:Key="{x:Type ComboBox}" TargetType="ComboBox">
<Setter Property="Padding" Value="{DynamicResource ComboBoxSelectorDefaultPadding}" /> <Setter Property="Padding" Value="{DynamicResource ComboBoxSelectorDefaultPadding}" />
<Setter Property="FocusAdorner" Value="{x:Null}" /> <Setter Property="FocusAdorner" Value="{x:Null}" />
<Setter Property="MaxDropDownHeight" Value="{DynamicResource ComboBoxPopupMaxDropDownHeight}" /> <Setter Property="MaxDropDownHeight" Value="504" />
<Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" /> <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderBrush}" />
<Setter Property="BackgroundSizing" Value="OuterBorderEdge" /> <Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
<Setter Property="BorderThickness" Value="{DynamicResource ComboBoxSelectorThickness}" /> <Setter Property="BorderThickness" Value="1" />
<Setter Property="Cursor" Value="Hand" /> <Setter Property="Cursor" Value="Hand" />
<Setter Property="CornerRadius" Value="{DynamicResource ComboBoxSelectorCornerRadius}" /> <Setter Property="CornerRadius" Value="{DynamicResource ComboBoxSelectorCornerRadius}" />
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" /> <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
@ -49,7 +49,7 @@
<DataValidationErrors> <DataValidationErrors>
<Grid ColumnDefinitions="*, Auto"> <Grid ColumnDefinitions="*, Auto">
<Border <Border
Name="Background" x:Name="Background"
Grid.Column="0" Grid.Column="0"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
@ -59,39 +59,49 @@
CornerRadius="{TemplateBinding CornerRadius}" CornerRadius="{TemplateBinding CornerRadius}"
MinHeight="{TemplateBinding MinHeight}" /> MinHeight="{TemplateBinding MinHeight}" />
<TextBlock <TextBlock
Name="PlaceholderTextBlock" x:Name="PlaceholderTextBlock"
Grid.Column="0" Grid.Column="0"
Margin="{TemplateBinding Padding}" Margin="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
TextTrimming="CharacterEllipsis" TextTrimming="CharacterEllipsis"
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
Name="ContentPresenter" x:Name="ContentPresenter"
Grid.Column="0" Grid.Column="0"
Margin="{TemplateBinding Padding}" Margin="{TemplateBinding Padding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding SelectionBoxItem}" Content="{TemplateBinding SelectionBoxItem}"
ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" /> ContentTemplate="{TemplateBinding ItemTemplate}" />
<Button <Button
Name="ClearButton" Name="ClearButton"
Grid.Column="1" Grid.Column="1"
Theme="{DynamicResource InnerIconButton}" Margin="0,0,8,0"
Width="{DynamicResource ComboBoxIconWidth}"
Command="{Binding $parent[ComboBox].Clear}" Command="{Binding $parent[ComboBox].Clear}"
Content="{DynamicResource IconButtonClearData}" Content="{DynamicResource IconButtonClearData}"
Focusable="False" Focusable="False"
IsVisible="False"
Theme="{DynamicResource InnerIconButton}" />
<Border
x:Name="DropDownOverlay"
Grid.Column="1"
Width="30"
Margin="0,1,1,1"
HorizontalAlignment="Right"
Background="Transparent"
IsVisible="False" /> IsVisible="False" />
<PathIcon <PathIcon
Name="DropDownGlyph" x:Name="DropDownGlyph"
Grid.Column="1" Grid.Column="1"
Theme="{DynamicResource InnerPathIcon}" Width="12"
Width="{DynamicResource ComboBoxIconWidth}" Height="12"
Margin="0,0,12,0"
Data="{DynamicResource ComboBoxIcon}" Data="{DynamicResource ComboBoxIcon}"
Foreground="{DynamicResource ComboBoxIconDefaultForeground}" Foreground="{DynamicResource ComboBoxIconDefaultForeground}"
IsHitTestVisible="False" IsHitTestVisible="False"
@ -100,29 +110,31 @@
<Popup <Popup
Name="PART_Popup" Name="PART_Popup"
Grid.Column="0" Grid.Column="0"
MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
MaxHeight="{TemplateBinding MaxDropDownHeight}" MaxHeight="{TemplateBinding MaxDropDownHeight}"
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
Name="PopupBorder" x:Name="PopupBorder"
Margin="0,4"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
Margin="{DynamicResource ComboBoxPopupBorderMargin}"
Padding="{DynamicResource ComboBoxPopupBorderPadding}"
Background="{DynamicResource ComboBoxPopupBackground}" Background="{DynamicResource ComboBoxPopupBackground}"
BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}" BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}" BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}"
BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}" BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}"
CornerRadius="{DynamicResource ComboBoxPopupBoxCornerRadius}"> ClipToBounds="True"
CornerRadius="6">
<ScrollViewer <ScrollViewer
HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}" IsDeferredScrollingEnabled="{TemplateBinding (ScrollViewer.IsDeferredScrollingEnabled)}"
VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"> VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
<ItemsPresenter <ItemsPresenter
Name="PART_ItemsPresenter" Name="PART_ItemsPresenter"
Margin="{DynamicResource ComboBoxDropdownContentMargin}"
ItemsPanel="{TemplateBinding ItemsPanel}" /> ItemsPanel="{TemplateBinding ItemsPanel}" />
</ScrollViewer> </ScrollViewer>
</Border> </Border>

22
src/Semi.Avalonia/Controls/ContextMenu.axaml
View File

@ -3,18 +3,18 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:CompileBindings="True"> x:CompileBindings="True">
<ControlTheme x:Key="{x:Type ContextMenu}" TargetType="ContextMenu"> <ControlTheme x:Key="{x:Type ContextMenu}" TargetType="ContextMenu">
<Setter Property="Background" Value="{DynamicResource MenuFlyoutBackground}" /> <Setter Property="ContextMenu.Background" Value="{DynamicResource MenuFlyoutBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutBorderBrush}" /> <Setter Property="ContextMenu.BorderBrush" Value="{DynamicResource MenuFlyoutBorderBrush}" />
<Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutBorderThickness}" /> <Setter Property="ContextMenu.BorderThickness" Value="{DynamicResource MenuFlyoutBorderThickness}" />
<Setter Property="CornerRadius" Value="{DynamicResource MenuFlyoutCornerRadius}" /> <Setter Property="ContextMenu.CornerRadius" Value="{DynamicResource MenuFlyoutCornerRadius}" />
<Setter Property="MaxWidth" Value="{DynamicResource MenuFlyoutMaxWidth}" /> <Setter Property="ContextMenu.MaxWidth" Value="{DynamicResource MenuFlyoutMaxWidth}" />
<Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutMinHeight}" /> <Setter Property="ContextMenu.MinHeight" Value="{DynamicResource MenuFlyoutMinHeight}" />
<Setter Property="Padding" Value="{DynamicResource MenuFlyoutPadding}" /> <Setter Property="ContextMenu.Padding" Value="{DynamicResource MenuFlyoutPadding}" />
<Setter Property="Focusable" Value="True"></Setter> <Setter Property="Focusable" Value="True"></Setter>
<Setter Property="HorizontalAlignment" Value="Stretch" /> <Setter Property="ContextMenu.HorizontalAlignment" Value="Stretch" />
<Setter Property="FontWeight" Value="Normal" /> <Setter Property="TextBlock.FontWeight" Value="Normal" />
<Setter Property="WindowManagerAddShadowHint" Value="False" /> <Setter Property="ContextMenu.WindowManagerAddShadowHint" Value="False" />
<Setter Property="Template"> <Setter Property="ContextMenu.Template">
<ControlTemplate TargetType="ContextMenu"> <ControlTemplate TargetType="ContextMenu">
<Border <Border
MinHeight="{TemplateBinding MinHeight}" MinHeight="{TemplateBinding MinHeight}"

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

@ -7,7 +7,7 @@
<ControlTemplate TargetType="DataValidationErrors"> <ControlTemplate TargetType="DataValidationErrors">
<DockPanel LastChildFill="True"> <DockPanel LastChildFill="True">
<ContentControl <ContentControl
Name="InlineDataValidationContentControl" x:Name="InlineDataValidationContentControl"
Margin="0,4,0,0" Margin="0,4,0,0"
Content="{Binding (DataValidationErrors.Errors)}" Content="{Binding (DataValidationErrors.Errors)}"
ContentTemplate="{TemplateBinding ErrorTemplate}" ContentTemplate="{TemplateBinding ErrorTemplate}"

200
src/Semi.Avalonia/Controls/DatePicker.axaml
View File

@ -23,103 +23,97 @@
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
BoxShadow="{DynamicResource DateTimePickerFlyoutBoxShadow}" BoxShadow="{DynamicResource DateTimePickerFlyoutBoxShadow}"
CornerRadius="{TemplateBinding CornerRadius}"> CornerRadius="{TemplateBinding CornerRadius}">
<Border <Grid Name="ContentPanel" RowDefinitions="*,Auto">
CornerRadius="{TemplateBinding CornerRadius}" <Grid Name="PART_PickerContainer">
ClipToBounds="True"> <Grid.Styles>
<Grid Name="ContentPanel" RowDefinitions="*,Auto"> <Style Selector="DateTimePickerPanel &gt; ListBoxItem">
<Grid Name="PART_PickerContainer"> <Setter Property="Theme" Value="{StaticResource DateTimePickerItem}" />
<Grid.Styles> </Style>
<Style Selector="DateTimePickerPanel > ListBoxItem"> </Grid.Styles>
<Setter Property="Theme" Value="{StaticResource DateTimePickerItem}" /> <!-- Column Definitions set in code, ignore here -->
</Style> <Panel Name="PART_MonthHost">
</Grid.Styles> <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden">
<!-- Column Definitions set in code, ignore here --> <DateTimePickerPanel
<Panel Name="PART_MonthHost"> Name="PART_MonthSelector"
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden"> ItemHeight="{DynamicResource DateTimePickerListBoxItemHeight}"
<DateTimePickerPanel PanelType="Month"
Name="PART_MonthSelector" ShouldLoop="True" />
ItemHeight="{DynamicResource DateTimePickerListBoxItemHeight}" </ScrollViewer>
PanelType="Month" <RepeatButton Name="PART_MonthUpButton" Theme="{StaticResource DateTimePickerUpButton}" />
ShouldLoop="True" /> <RepeatButton Name="PART_MonthDownButton" Theme="{StaticResource DateTimePickerDownButton}" />
</ScrollViewer> </Panel>
<RepeatButton Name="PART_MonthUpButton" Theme="{StaticResource DateTimePickerUpButton}" /> <Panel Name="PART_DayHost">
<RepeatButton Name="PART_MonthDownButton" Theme="{StaticResource DateTimePickerDownButton}" /> <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden">
</Panel> <DateTimePickerPanel
<Panel Name="PART_DayHost"> Name="PART_DaySelector"
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden"> ItemHeight="{DynamicResource DateTimePickerListBoxItemHeight}"
<DateTimePickerPanel PanelType="Day"
Name="PART_DaySelector" ShouldLoop="True" />
ItemHeight="{DynamicResource DateTimePickerListBoxItemHeight}" </ScrollViewer>
PanelType="Day" <RepeatButton Name="PART_DayUpButton" Theme="{StaticResource DateTimePickerUpButton}" />
ShouldLoop="True" /> <RepeatButton Name="PART_DayDownButton" Theme="{StaticResource DateTimePickerDownButton}" />
</ScrollViewer> </Panel>
<RepeatButton Name="PART_DayUpButton" Theme="{StaticResource DateTimePickerUpButton}" /> <Panel Name="PART_YearHost">
<RepeatButton Name="PART_DayDownButton" Theme="{StaticResource DateTimePickerDownButton}" /> <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden">
</Panel> <DateTimePickerPanel
<Panel Name="PART_YearHost"> Name="PART_YearSelector"
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden"> ItemHeight="{DynamicResource DateTimePickerListBoxItemHeight}"
<DateTimePickerPanel PanelType="Year"
Name="PART_YearSelector" ShouldLoop="False" />
ItemHeight="{DynamicResource DateTimePickerListBoxItemHeight}" </ScrollViewer>
PanelType="Year" <RepeatButton Name="PART_YearUpButton" Theme="{StaticResource DateTimePickerUpButton}" />
ShouldLoop="False" /> <RepeatButton Name="PART_YearDownButton" Theme="{StaticResource DateTimePickerDownButton}" />
</ScrollViewer> </Panel>
<RepeatButton Name="PART_YearUpButton" Theme="{StaticResource DateTimePickerUpButton}" /> <Rectangle
<RepeatButton Name="PART_YearDownButton" Theme="{StaticResource DateTimePickerDownButton}" /> Name="PART_FirstSpacer"
</Panel> Grid.Column="1"
<Rectangle Width="1"
Name="PART_FirstSpacer" Margin="0,4"
Grid.Column="1" HorizontalAlignment="Center"
Width="1" Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
HorizontalAlignment="Center" <Rectangle
Fill="{DynamicResource DateTimePickerSeparatorBackground}" /> Name="PART_SecondSpacer"
<Rectangle Grid.Column="3"
Name="PART_SecondSpacer" Width="1"
Grid.Column="3" Margin="0,4"
Width="1" HorizontalAlignment="Center"
HorizontalAlignment="Center" Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
</Grid>
<Grid
Name="AcceptDismissGrid"
Grid.Row="1"
ColumnDefinitions="*,Auto,*">
<Button
Name="PART_AcceptButton"
Grid.Column="0"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Theme="{StaticResource DateTimePickerButton}">
<PathIcon
Width="12"
Height="12"
Data="{DynamicResource DateTimePickerAcceptGlyph}" />
</Button>
<Rectangle
Grid.Column="1"
Width="1"
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
<Button
Name="PART_DismissButton"
Grid.Column="2"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Theme="{StaticResource DateTimePickerButton}">
<PathIcon
Width="12"
Height="12"
Data="{DynamicResource DateTimePickerDismissGlyph}" />
</Button>
<Rectangle
Grid.Column="0"
Grid.ColumnSpan="3"
Height="1"
VerticalAlignment="Top"
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
</Grid>
</Grid> </Grid>
</Border>
<Grid
Name="AcceptDismissGrid"
Grid.Row="1"
ColumnDefinitions="*,*">
<Button
Name="PART_AcceptButton"
Grid.Column="0"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Theme="{StaticResource DateTimePickerButton}">
<PathIcon
Width="12"
Height="12"
Data="{DynamicResource DateTimePickerAcceptGlyph}" />
</Button>
<Button
Name="PART_DismissButton"
Grid.Column="1"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
FontSize="16"
Theme="{StaticResource DateTimePickerButton}">
<PathIcon
Width="12"
Height="12"
Data="{DynamicResource DateTimePickerDismissGlyph}" />
</Button>
<Rectangle
Grid.ColumnSpan="2"
Height="1"
VerticalAlignment="Top"
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
</Grid>
</Grid>
</Border> </Border>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
@ -183,7 +177,6 @@
<TextBlock <TextBlock
Name="PART_MonthTextBlock" Name="PART_MonthTextBlock"
Padding="12,0" Padding="12,0"
HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
FontFamily="{TemplateBinding FontFamily}" FontFamily="{TemplateBinding FontFamily}"
FontSize="{TemplateBinding FontSize}" FontSize="{TemplateBinding FontSize}"
@ -200,7 +193,7 @@
FontWeight="{TemplateBinding FontWeight}" FontWeight="{TemplateBinding FontWeight}"
Text="{DynamicResource STRING_DATEPICKER_YEAR_TEXT}" /> Text="{DynamicResource STRING_DATEPICKER_YEAR_TEXT}" />
<Rectangle <Rectangle
Name="PART_FirstSpacer" x:Name="PART_FirstSpacer"
Grid.Column="1" Grid.Column="1"
Width="1" Width="1"
Height="{TemplateBinding Height}" Height="{TemplateBinding Height}"
@ -208,7 +201,7 @@
HorizontalAlignment="Center" HorizontalAlignment="Center"
Fill="{DynamicResource DateTimePickerSeparatorBackground}" /> Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
<Rectangle <Rectangle
Name="PART_SecondSpacer" x:Name="PART_SecondSpacer"
Grid.Column="3" Grid.Column="3"
Width="1" Width="1"
Height="{TemplateBinding Height}" Height="{TemplateBinding Height}"
@ -219,7 +212,8 @@
<PathIcon <PathIcon
Name="PART_Icon" Name="PART_Icon"
Grid.Column="1" Grid.Column="1"
Theme="{DynamicResource InnerPathIcon}" Width="16"
Height="16"
Margin="0,0,8,0" Margin="0,0,8,0"
Data="{DynamicResource DatePickerIconGlyph}" Data="{DynamicResource DatePickerIconGlyph}"
Foreground="{DynamicResource DateTimePickerIconForeground}" /> Foreground="{DynamicResource DateTimePickerIconForeground}" />
@ -238,11 +232,11 @@
<Button <Button
Name="ClearButton" Name="ClearButton"
Grid.Column="1" Grid.Column="1"
Theme="{DynamicResource InnerIconButton}" Margin="0,0,8,0"
Margin="0,0,9,0"
Command="{Binding $parent[DatePicker].Clear}" Command="{Binding $parent[DatePicker].Clear}"
Content="{DynamicResource IconButtonClearData}" Content="{DynamicResource IconButtonClearData}"
IsVisible="False" /> IsVisible="False"
Theme="{DynamicResource InnerIconButton}" />
</Grid> </Grid>
</DataValidationErrors> </DataValidationErrors>
</ControlTemplate> </ControlTemplate>

8
src/Semi.Avalonia/Controls/DateTimePickerShared.axaml
View File

@ -57,7 +57,7 @@
x:Key="DateTimePickerItem" x:Key="DateTimePickerItem"
BasedOn="{StaticResource {x:Type ListBoxItem}}" BasedOn="{StaticResource {x:Type ListBoxItem}}"
TargetType="ListBoxItem"> TargetType="ListBoxItem">
<Setter Property="CornerRadius" Value="0" /> <Setter Property="ListBoxItem.CornerRadius" Value="0" />
<Setter Property="VerticalContentAlignment" Value="Center" /> <Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="HorizontalContentAlignment" Value="Center" /> <Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="Background" Value="{DynamicResource DateTimePickerListItemBackground}" /> <Setter Property="Background" Value="{DynamicResource DateTimePickerListItemBackground}" />
@ -65,6 +65,10 @@
<Style Selector="^:selected"> <Style Selector="^:selected">
<Setter Property="IsHitTestVisible" Value="False" /> <Setter Property="IsHitTestVisible" Value="False" />
</Style> </Style>
<Style Selector="^.MonthItem">
<Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterMonthPadding}" />
<Setter Property="HorizontalContentAlignment" Value="Left" />
</Style>
</ControlTheme> </ControlTheme>
<!-- This is used for both the accept/dismiss & buttons in the presenter --> <!-- This is used for both the accept/dismiss & buttons in the presenter -->
@ -79,7 +83,7 @@
<ControlTemplate TargetType="Button"> <ControlTemplate TargetType="Button">
<Border Background="{TemplateBinding Background}"> <Border Background="{TemplateBinding Background}">
<ContentPresenter <ContentPresenter
Name="ContentPresenter" x:Name="ContentPresenter"
Padding="{TemplateBinding Padding}" Padding="{TemplateBinding Padding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"

17
src/Semi.Avalonia/Controls/DropDownButton.axaml
View File

@ -22,16 +22,16 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="DropDownButton"> <ControlTemplate TargetType="DropDownButton">
<Border <Border
Name="RootBorder" x:Name="RootBorder"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
BackgroundSizing="{TemplateBinding BackgroundSizing}" BackgroundSizing="{TemplateBinding BackgroundSizing}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
ClipToBounds="True" ClipToBounds="True"
CornerRadius="{TemplateBinding CornerRadius}"> CornerRadius="{TemplateBinding CornerRadius}">
<Grid Name="InnerGrid" ColumnDefinitions="*,Auto"> <Grid x:Name="InnerGrid" ColumnDefinitions="*,Auto">
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter" x:Name="PART_ContentPresenter"
Grid.Column="0" Grid.Column="0"
Padding="{TemplateBinding Padding}" Padding="{TemplateBinding Padding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@ -41,9 +41,10 @@
Foreground="{TemplateBinding Foreground}" Foreground="{TemplateBinding Foreground}"
RecognizesAccessKey="True" /> RecognizesAccessKey="True" />
<PathIcon <PathIcon
Name="DropDownGlyph" x:Name="DropDownGlyph"
Grid.Column="1" Grid.Column="1"
Theme="{DynamicResource InnerPathIcon}" Width="12"
Height="12"
Margin="0,0,8,0" Margin="0,0,8,0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
@ -124,12 +125,6 @@
x:Key="SolidDropDownButton" x:Key="SolidDropDownButton"
BasedOn="{StaticResource {x:Type DropDownButton}}" BasedOn="{StaticResource {x:Type DropDownButton}}"
TargetType="DropDownButton"> TargetType="DropDownButton">
<Setter Property="FocusAdorner">
<FocusAdornerTemplate>
<Border Theme="{DynamicResource AdornerLayerBorder}"
Classes="Solid" />
</FocusAdornerTemplate>
</Setter>
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" /> <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
<Style Selector="^ /template/ Border#RootBorder"> <Style Selector="^ /template/ Border#RootBorder">
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" /> <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />

14
src/Semi.Avalonia/Controls/Expander.axaml
View File

@ -28,9 +28,9 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="Expander"> <ControlTemplate TargetType="Expander">
<DockPanel> <DockPanel>
<LayoutTransformControl Name="ExpanderHeaderLayoutContainer" Margin="{DynamicResource ExpanderHeaderMargin}"> <LayoutTransformControl x:Name="ExpanderHeaderLayoutContainer" Margin="{DynamicResource ExpanderHeaderMargin}">
<ToggleButton <ToggleButton
Name="ExpanderHeader" x:Name="ExpanderHeader"
Padding="{DynamicResource ExpanderHeaderPadding}" Padding="{DynamicResource ExpanderHeaderPadding}"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
HorizontalContentAlignment="Stretch" HorizontalContentAlignment="Stretch"
@ -50,9 +50,9 @@
<PathIcon <PathIcon
Name="PART_PathIcon" Name="PART_PathIcon"
Grid.Column="1" Grid.Column="1"
Theme="{DynamicResource InnerPathIcon}" Width="{DynamicResource ExpanderIconSize}"
Margin="{DynamicResource ExpanderIconMargin}" Height="{DynamicResource ExpanderIconSize}"
Data="{DynamicResource ExpanderIcon}"> Data="M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z">
<PathIcon.Transitions> <PathIcon.Transitions>
<Transitions> <Transitions>
<TransformOperationsTransition Property="RenderTransform" Duration="0.1" /> <TransformOperationsTransition Property="RenderTransform" Duration="0.1" />
@ -64,12 +64,12 @@
</LayoutTransformControl> </LayoutTransformControl>
<LayoutTransformControl Name="ExpanderContentLayoutContainer" MinHeight="1"> <LayoutTransformControl Name="ExpanderContentLayoutContainer" MinHeight="1">
<Border <Border
Name="ExpanderContent" x:Name="ExpanderContent"
MinHeight="2" MinHeight="2"
BorderBrush="{DynamicResource ExpanderSeparatorBorderBrush}" BorderBrush="{DynamicResource ExpanderSeparatorBorderBrush}"
BorderThickness="0,0,0,1"> BorderThickness="0,0,0,1">
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter" x:Name="PART_ContentPresenter"
Margin="{DynamicResource ExpanderContentMargin}" Margin="{DynamicResource ExpanderContentMargin}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"

66
src/Semi.Avalonia/Controls/FlyoutPresenter.axaml
View File

@ -3,24 +3,24 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:CompileBindings="True"> x:CompileBindings="True">
<ControlTheme x:Key="{x:Type FlyoutPresenter}" TargetType="FlyoutPresenter"> <ControlTheme x:Key="{x:Type FlyoutPresenter}" TargetType="FlyoutPresenter">
<Setter Property="HorizontalContentAlignment" Value="Stretch" /> <Setter Property="FlyoutPresenter.HorizontalContentAlignment" Value="Stretch" />
<Setter Property="VerticalContentAlignment" Value="Stretch" /> <Setter Property="FlyoutPresenter.VerticalContentAlignment" Value="Stretch" />
<Setter Property="UseLayoutRounding" Value="False" /> <Setter Property="FlyoutPresenter.UseLayoutRounding" Value="False" />
<Setter Property="FontWeight" Value="{DynamicResource FlyoutFontWeight}" /> <Setter Property="FlyoutPresenter.FontWeight" Value="{DynamicResource FlyoutFontWeight}" />
<Setter Property="Background" Value="{DynamicResource FlyoutBackground}" /> <Setter Property="FlyoutPresenter.Background" Value="{DynamicResource FlyoutBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource FlyoutBorderBrush}" /> <Setter Property="FlyoutPresenter.BorderBrush" Value="{DynamicResource FlyoutBorderBrush}" />
<Setter Property="BorderThickness" Value="{DynamicResource FlyoutBorderThickness}" /> <Setter Property="FlyoutPresenter.BorderThickness" Value="{DynamicResource FlyoutBorderThickness}" />
<Setter Property="Padding" Value="{DynamicResource FlyoutPadding}" /> <Setter Property="FlyoutPresenter.Padding" Value="{DynamicResource FlyoutPadding}" />
<Setter Property="MinWidth" Value="{DynamicResource FlyoutMinWidth}" /> <Setter Property="FlyoutPresenter.MinWidth" Value="{DynamicResource FlyoutMinWidth}" />
<Setter Property="MaxWidth" Value="{DynamicResource FlyoutMaxWidth}" /> <Setter Property="FlyoutPresenter.MaxWidth" Value="{DynamicResource FlyoutMaxWidth}" />
<Setter Property="MinHeight" Value="{DynamicResource FlyoutMinHeight}" /> <Setter Property="FlyoutPresenter.MinHeight" Value="{DynamicResource FlyoutMinHeight}" />
<Setter Property="MaxHeight" Value="{DynamicResource FlyoutMaxHeight}" /> <Setter Property="FlyoutPresenter.MaxHeight" Value="{DynamicResource FlyoutMaxHeight}" />
<Setter Property="Foreground" Value="{DynamicResource FlyoutForeground}" /> <Setter Property="FlyoutPresenter.Foreground" Value="{DynamicResource FlyoutForeground}" />
<Setter Property="ClipToBounds" Value="False" /> <Setter Property="FlyoutPresenter.ClipToBounds" Value="False" />
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" /> <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" /> <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
<Setter Property="CornerRadius" Value="{DynamicResource FlyoutCornerRadius}" /> <Setter Property="FlyoutPresenter.CornerRadius" Value="{DynamicResource FlyoutCornerRadius}" />
<Setter Property="Template"> <Setter Property="FlyoutPresenter.Template">
<ControlTemplate TargetType="FlyoutPresenter"> <ControlTemplate TargetType="FlyoutPresenter">
<Border <Border
Name="LayoutRoot" Name="LayoutRoot"
@ -48,25 +48,25 @@
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="LightFlyout" TargetType="FlyoutPresenter"> <ControlTheme x:Key="LightFlyout" TargetType="FlyoutPresenter">
<Setter Property="HorizontalContentAlignment" Value="Stretch" /> <Setter Property="FlyoutPresenter.HorizontalContentAlignment" Value="Stretch" />
<Setter Property="VerticalContentAlignment" Value="Stretch" /> <Setter Property="FlyoutPresenter.VerticalContentAlignment" Value="Stretch" />
<Setter Property="UseLayoutRounding" Value="False" /> <Setter Property="FlyoutPresenter.UseLayoutRounding" Value="False" />
<Setter Property="FontWeight" Value="{DynamicResource FlyoutFontWeight}" /> <Setter Property="FlyoutPresenter.FontWeight" Value="{DynamicResource FlyoutFontWeight}" />
<Setter Property="Background" Value="Transparent" /> <Setter Property="FlyoutPresenter.Background" Value="Transparent" />
<Setter Property="BorderBrush" Value="Transparent" /> <Setter Property="FlyoutPresenter.BorderBrush" Value="Transparent" />
<Setter Property="BorderThickness" Value="0" /> <Setter Property="FlyoutPresenter.BorderThickness" Value="0" />
<Setter Property="Padding" Value="{DynamicResource FlyoutPadding}" /> <Setter Property="FlyoutPresenter.Padding" Value="{DynamicResource FlyoutPadding}" />
<Setter Property="MinWidth" Value="{DynamicResource FlyoutMinWidth}" /> <Setter Property="FlyoutPresenter.MinWidth" Value="{DynamicResource FlyoutMinWidth}" />
<Setter Property="MaxWidth" Value="{DynamicResource FlyoutMaxWidth}" /> <Setter Property="FlyoutPresenter.MaxWidth" Value="{DynamicResource FlyoutMaxWidth}" />
<Setter Property="MinHeight" Value="{DynamicResource FlyoutMinHeight}" /> <Setter Property="FlyoutPresenter.MinHeight" Value="{DynamicResource FlyoutMinHeight}" />
<Setter Property="MaxHeight" Value="{DynamicResource FlyoutMaxHeight}" /> <Setter Property="FlyoutPresenter.MaxHeight" Value="{DynamicResource FlyoutMaxHeight}" />
<Setter Property="Foreground" Value="{DynamicResource FlyoutForeground}" /> <Setter Property="FlyoutPresenter.Foreground" Value="{DynamicResource FlyoutForeground}" />
<Setter Property="ClipToBounds" Value="False" /> <Setter Property="FlyoutPresenter.ClipToBounds" Value="False" />
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" /> <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" /> <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
<Setter Property="CornerRadius" Value="{DynamicResource FlyoutCornerRadius}" /> <Setter Property="FlyoutPresenter.CornerRadius" Value="{DynamicResource FlyoutCornerRadius}" />
<Setter Property="Margin" Value="4" /> <Setter Property="FlyoutPresenter.Margin" Value="4" />
<Setter Property="Template"> <Setter Property="FlyoutPresenter.Template">
<ControlTemplate TargetType="FlyoutPresenter"> <ControlTemplate TargetType="FlyoutPresenter">
<Border <Border
Name="LayoutRoot" Name="LayoutRoot"

84
src/Semi.Avalonia/Controls/HeaderedContentControl.axaml
View File

@ -1,31 +1,7 @@
<ResourceDictionary <ResourceDictionary
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="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
x:CompileBindings="True"> x:CompileBindings="True">
<Design.PreviewWith>
<StackPanel Spacing="20">
<HeaderedContentControl
Theme="{DynamicResource GroupBox}"
Header="Header" />
<HeaderedContentControl
Theme="{DynamicResource GroupBox}"
Content="Content" />
<HeaderedContentControl
Theme="{DynamicResource GroupBox}"
MaxWidth="360"
Content="Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统。设计系统包含设计语言以及一整套可复用的前端组件，帮助设计师与开发者更容易地打造高质量的、用户体验一致的、符合设计规范的 Web 应用。">
<HeaderedContentControl.Header>
<Panel>
<SelectableTextBlock Text="Semi Design" />
<HyperlinkButton HorizontalAlignment="Right" Content="更多" />
</Panel>
</HeaderedContentControl.Header>
</HeaderedContentControl>
</StackPanel>
</Design.PreviewWith>
<converters:MarginMultiplierConverter x:Key="SeparatorBorderMultiplier" Top="True" Indent="1" />
<ControlTheme x:Key="{x:Type HeaderedContentControl}" TargetType="HeaderedContentControl"> <ControlTheme x:Key="{x:Type HeaderedContentControl}" TargetType="HeaderedContentControl">
<Setter Property="Padding" Value="3" /> <Setter Property="Padding" Value="3" />
<Setter Property="Template"> <Setter Property="Template">
@ -36,31 +12,31 @@
CornerRadius="{TemplateBinding CornerRadius}" CornerRadius="{TemplateBinding CornerRadius}"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
Padding="{TemplateBinding Padding}"> Padding="{TemplateBinding Padding}">
<Grid RowDefinitions="Auto,*"> <Grid RowDefinitions="auto *">
<ContentPresenter <ContentPresenter
Name="PART_HeaderPresenter" Name="PART_HeaderPresenter"
Grid.Row="0"
Content="{TemplateBinding Header}" Content="{TemplateBinding Header}"
ContentTemplate="{TemplateBinding HeaderTemplate}"
RecognizesAccessKey="True" RecognizesAccessKey="True"
ContentTemplate="{TemplateBinding HeaderTemplate}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
FontSize="{TemplateBinding FontSize}" FontSize="{TemplateBinding FontSize}"
FontWeight="{TemplateBinding FontWeight}" FontWeight="{TemplateBinding FontWeight}"
FontFamily="{TemplateBinding FontFamily}" FontFamily="{TemplateBinding FontFamily}"
FontStyle="{TemplateBinding FontStyle}" /> FontStyle="{TemplateBinding FontStyle}"
Grid.Row="0" />
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter" Name="PART_ContentPresenter"
Grid.Row="1"
ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplate="{TemplateBinding ContentTemplate}"
Content="{TemplateBinding Content}" Content="{TemplateBinding Content}"
RecognizesAccessKey="True" RecognizesAccessKey="True"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
FontSize="{TemplateBinding FontSize}" FontSize="{TemplateBinding FontSize}"
FontWeight="{TemplateBinding FontWeight}" FontWeight="{TemplateBinding FontWeight}"
FontFamily="{TemplateBinding FontFamily}" FontFamily="{TemplateBinding FontFamily}"
FontStyle="{TemplateBinding FontStyle}" /> FontStyle="{TemplateBinding FontStyle}"
Grid.Row="1" />
</Grid> </Grid>
</Border> </Border>
</ControlTemplate> </ControlTemplate>
@ -68,46 +44,42 @@
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="GroupBox" TargetType="HeaderedContentControl"> <ControlTheme x:Key="GroupBox" TargetType="HeaderedContentControl">
<Setter Property="Background" Value="{DynamicResource HeaderedContentControlBackground}" /> <Setter Property="Background" Value="{DynamicResource HeaderedContentControlDefaultBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource HeaderedContentControlBorderBrush}" /> <Setter Property="BorderThickness" Value="1" />
<Setter Property="BorderThickness" Value="{DynamicResource HeaderedContentControlBorderThickness}" /> <Setter Property="BorderBrush" Value="{DynamicResource HeaderedContentControlDefaultBorderBrush}" />
<Setter Property="CornerRadius" Value="{DynamicResource HeaderedContentControlCornerRadius}" /> <Setter Property="CornerRadius" Value="{DynamicResource HeaderedContentControlCornerRadius}" />
<Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="HorizontalContentAlignment" Value="Left" />
<Setter Property="VerticalContentAlignment" Value="Stretch" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="HeaderedContentControl"> <ControlTemplate TargetType="HeaderedContentControl">
<Border <Border
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Width="{TemplateBinding Width}"
Height="{TemplateBinding Height}"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}"
CornerRadius="{TemplateBinding CornerRadius}"> BorderThickness="{TemplateBinding BorderThickness}">
<Grid RowDefinitions="Auto,Auto,Auto"> <Grid RowDefinitions="Auto,Auto,Auto">
<ContentPresenter <ContentPresenter
Name="PART_HeaderPresenter"
Grid.Row="0" Grid.Row="0"
Padding="{DynamicResource HeaderedContentControlHeaderPadding}" FontWeight="Bold"
FontWeight="{DynamicResource HeaderedContentControlHeaderFontWeight}" HorizontalAlignment="Left"
IsVisible="{TemplateBinding Header,Converter={x:Static ObjectConverters.IsNotNull}}" VerticalAlignment="Stretch"
Content="{TemplateBinding Header}" Content="{TemplateBinding Header}"
ContentTemplate="{TemplateBinding HeaderTemplate}" /> ContentTemplate="{TemplateBinding HeaderTemplate}"
<Border Margin="16" />
Name="SeparatorBorder" <Rectangle
Grid.Row="1" Grid.Row="1"
BorderBrush="{TemplateBinding BorderBrush}" Fill="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource SeparatorBorderMultiplier}}"> Height="1" />
<Border.IsVisible>
<MultiBinding Converter="{x:Static BoolConverters.And}">
<TemplateBinding Property="Header" Converter="{x:Static ObjectConverters.IsNotNull}" />
<TemplateBinding Property="Content" Converter="{x:Static ObjectConverters.IsNotNull}" />
</MultiBinding>
</Border.IsVisible>
</Border>
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter"
Grid.Row="2" Grid.Row="2"
IsVisible="{TemplateBinding Content,Converter={x:Static ObjectConverters.IsNotNull}}"
Padding="{DynamicResource HeaderedContentControlContentPadding}"
Content="{TemplateBinding Content}" Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplate="{TemplateBinding ContentTemplate}"
TextWrapping="Wrap" /> Margin="16" />
</Grid> </Grid>
</Border> </Border>
</ControlTemplate> </ControlTemplate>

143
src/Semi.Avalonia/Controls/HyperlinkButton.axaml
View File

@ -1,101 +1,118 @@
<ResourceDictionary <ResourceDictionary
x:CompileBindings="True"
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">
x:CompileBindings="True">
<Design.PreviewWith>
<StackPanel>
<HyperlinkButton NavigateUri="http://www.irihi.tech/">
链接文本
</HyperlinkButton>
<HyperlinkButton NavigateUri="http://www.irihi.tech/" Classes="WithIcon Underline">
网页链接
</HyperlinkButton>
<HyperlinkButton NavigateUri="http://www.irihi.tech/" Classes="OnlyIcon">
OnlyIcon
</HyperlinkButton>
</StackPanel>
</Design.PreviewWith>
<ControlTheme TargetType="HyperlinkButton" x:Key="{x:Type HyperlinkButton}"> <ControlTheme TargetType="HyperlinkButton" x:Key="{x:Type HyperlinkButton}">
<Setter Property="Padding" Value="0,0,0,0" />
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Top" /> <Setter Property="VerticalAlignment" Value="Top" />
<Setter Property="Cursor" Value="Hand" />
<Setter Property="HorizontalContentAlignment" Value="Left" /> <Setter Property="HorizontalContentAlignment" Value="Left" />
<Setter Property="VerticalContentAlignment" Value="Center" /> <Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="FontSize" Value="{DynamicResource HyperlinkButtonFontSize}" /> <Setter Property="FontSize" Value="{DynamicResource HyperlinkButtonFontSize}" />
<Setter Property="FontWeight" Value="{DynamicResource HyperlinkButtonFontWeight}" /> <Setter Property="MinHeight" Value="32" />
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonForeground}" /> <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonForeground}" />
<Setter Property="Cursor" Value="Hand" /> <Setter Property="Background" Value="{DynamicResource HyperlinkButtonDefaultBackground}" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="HyperlinkButton"> <ControlTemplate TargetType="HyperlinkButton">
<DockPanel> <Grid ColumnDefinitions="Auto,*" x:Name="RootGrid">
<PathIcon <Grid
Name="PART_LinkGlyph" Grid.Column="0"
Theme="{DynamicResource InnerPathIcon}"
Margin="{DynamicResource HyperlinkButtonLinkGlyphMargin}"
IsVisible="False" IsVisible="False"
Data="{DynamicResource HyperlinkButtonLinkGlyph}" Margin="0,0,8,0"
Foreground="{TemplateBinding Foreground}" VerticalAlignment="Center"
Width="{DynamicResource HyperlinkButtonLinkGlyphWidth}" x:Name="IconGrid">
Height="{DynamicResource HyperlinkButtonLinkGlyphHeight}" /> <Border
Background="{DynamicResource HyperlinkButtonDefaultBackground}"
Height="{DynamicResource HyperlinkButtonIconHeight}"
Opacity="0"
UseLayoutRounding="False"
Width="{DynamicResource HyperlinkButtonIconWidth}"
x:Name="BackgroundRectangle" />
<PathIcon
Data="{DynamicResource HyperlinkButtonLinkGlyph}"
Foreground="{DynamicResource HyperlinkButtonForeground}"
Height="{DynamicResource HyperlinkButtonLinkGlyphHeight}"
Name="LinkGlyph"
VerticalAlignment="Center"
Width="{DynamicResource HyperlinkButtonLinkGlyphWidth}" />
</Grid>
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter"
Content="{TemplateBinding Content}" Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplate="{TemplateBinding ContentTemplate}"
Cursor="{TemplateBinding Cursor}"
Grid.Column="1"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
RecognizesAccessKey="True" /> Padding="0,0,0,0"
</DockPanel> RecognizesAccessKey="True"
VerticalAlignment="Center"
x:Name="ContentPresenter" />
</Grid>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^:pointerover"> <Style Selector="^:pointerover">
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonPointeroverForeground}" /> <Style Selector="^ /template/ PathIcon#LinkGlyph">
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
</Style>
<Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
</Style>
</Style> </Style>
<!-- Unvisited Pressed State -->
<Style Selector="^:pressed"> <Style Selector="^:pressed">
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonPressedForeground}" />
<Setter Property="RenderTransform" Value="scale(0.98)" /> <Setter Property="RenderTransform" Value="scale(0.98)" />
</Style> </Style>
<!-- Unvisited Disabled state -->
<Style Selector="^:disabled"> <Style Selector="^:disabled">
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" /> <Style Selector="^ /template/ PathIcon#LinkGlyph">
</Style> <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
<Style Selector="^:visited">
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonVisitedForeground}" />
<Style Selector="^:pointerover">
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonPointeroverForeground}" />
</Style> </Style>
<Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Style Selector="^:pressed">
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonPressedForeground}" />
<Setter Property="RenderTransform" Value="scale(0.98)" />
</Style>
<Style Selector="^:disabled">
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" /> <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
</Style> </Style>
</Style> </Style>
<Style Selector="^:visited">
<Style Selector="^ /template/ PathIcon#LinkGlyph">
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonVisitedForeground}" />
</Style>
<Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonVisitedForeground}" />
</Style>
<!-- Visited Pointerover State -->
<Style Selector="^:pointerover">
<Style Selector="^ /template/ PathIcon#LinkGlyph">
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
</Style>
<Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
</Style>
</Style>
<!-- Visited Pressed State -->
<Style Selector="^:pressed">
<Setter Property="RenderTransform" Value="scale(0.98)" />
</Style>
<!-- Visited Disabled State -->
<Style Selector="^:disabled">
<Style Selector="^ /template/ PathIcon#LinkGlyph">
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
</Style>
<Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
</Style>
</Style>
</Style>
<Style Selector="^.WithIcon"> <Style Selector="^.WithIcon">
<Style Selector="^ /template/ PathIcon#PART_LinkGlyph"> <Style Selector="^ /template/ Grid#IconGrid">
<Setter Property="IsVisible" Value="True" /> <Setter Property="IsVisible" Value="True" />
</Style> </Style>
</Style> </Style>
<Style Selector="^.Underline">
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter:pointerover">
<Setter Property="TextBlock.TextDecorations" Value="Underline" />
</Style>
</Style>
<Style Selector="^.OnlyIcon">
<Style Selector="^ /template/ PathIcon#PART_LinkGlyph">
<Setter Property="Margin" Value="0" />
<Setter Property="IsVisible" Value="True" />
</Style>
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="IsVisible" Value="False" />
</Style>
</Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

22
src/Semi.Avalonia/Controls/Label.axaml
View File

@ -80,8 +80,8 @@
</StackPanel> </StackPanel>
</Design.PreviewWith> </Design.PreviewWith>
<ControlTheme x:Key="{x:Type Label}" TargetType="Label"> <ControlTheme x:Key="{x:Type Label}" TargetType="Label">
<Setter Property="Foreground" Value="{DynamicResource TextBlockDefaultForeground}" /> <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockDefaultForeground}" />
<Setter Property="FontSize" Value="{DynamicResource TextBlockFontSize}" /> <Setter Property="Label.FontSize" Value="{DynamicResource TextBlockFontSize}" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="Label"> <ControlTemplate TargetType="Label">
<ContentPresenter <ContentPresenter
@ -138,7 +138,7 @@
x:Key="TitleLabel" x:Key="TitleLabel"
BasedOn="{StaticResource {x:Type Label}}" BasedOn="{StaticResource {x:Type Label}}"
TargetType="Label"> TargetType="Label">
<Setter Property="FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" /> <Setter Property="Label.FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" />
<Style Selector="^.H1"> <Style Selector="^.H1">
<Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH1FontSize}" /> <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH1FontSize}" />
</Style> </Style>
@ -164,14 +164,14 @@
<!-- Size: Small, Large. Default is Small --> <!-- Size: Small, Large. Default is Small -->
<!-- Color: Red, Pink, Purple, Violet, Indigo, Blue, LightBlue, Cyan, Teal, Green, LightGreen, Lime, Yellow, Amber, Orange, Grey, White. Default is Grey --> <!-- Color: Red, Pink, Purple, Violet, Indigo, Blue, LightBlue, Cyan, Teal, Green, LightGreen, Lime, Yellow, Amber, Orange, Grey, White. Default is Grey -->
<ControlTheme x:Key="TagLabel" TargetType="Label"> <ControlTheme x:Key="TagLabel" TargetType="Label">
<Setter Property="BorderThickness" Value="{DynamicResource LabelTagBorderThickness}" /> <Setter Property="Label.BorderThickness" Value="{DynamicResource LabelTagBorderThickness}" />
<Setter Property="MinHeight" Value="{DynamicResource LabelTagSmallHeight}" /> <Setter Property="Label.MinHeight" Value="{DynamicResource LabelTagSmallHeight}" />
<Setter Property="CornerRadius" Value="{DynamicResource LabelTagSquareCornerRadius}" /> <Setter Property="Label.CornerRadius" Value="{DynamicResource LabelTagSquareCornerRadius}" />
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="Label.HorizontalAlignment" Value="Left" />
<Setter Property="UseLayoutRounding" Value="False" /> <Setter Property="Label.UseLayoutRounding" Value="False" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="Label.VerticalAlignment" Value="Center" />
<Setter Property="Padding" Value="{DynamicResource LabelTagSmallPadding}" /> <Setter Property="Label.Padding" Value="{DynamicResource LabelTagSmallPadding}" />
<Setter Property="FontSize" Value="{DynamicResource LabelTagFontSize}" /> <Setter Property="Label.FontSize" Value="{DynamicResource LabelTagFontSize}" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="Label"> <ControlTemplate TargetType="Label">
<ContentPresenter <ContentPresenter

562
src/Semi.Avalonia/Controls/ListBox.axaml
View File

File diff suppressed because it is too large Load Diff

19
src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
View File

@ -21,7 +21,7 @@
<StreamGeometry x:Key="Icon_Volume">M6,2H18A2,2 0 0,1 20,4V20A2,2 0 0,1 18,22H6A2,2 0 0,1 4,20V4A2,2 0 0,1 6,2M12,4A6,6 0 0,0 6,10C6,13.31 8.69,16 12.1,16L11.22,13.77C10.95,13.29 11.11,12.68 11.59,12.4L12.45,11.9C12.93,11.63 13.54,11.79 13.82,12.27L15.74,14.69C17.12,13.59 18,11.9 18,10A6,6 0 0,0 12,4M12,9A1,1 0 0,1 13,10A1,1 0 0,1 12,11A1,1 0 0,1 11,10A1,1 0 0,1 12,9M7,18A1,1 0 0,0 6,19A1,1 0 0,0 7,20A1,1 0 0,0 8,19A1,1 0 0,0 7,18M12.09,13.27L14.58,19.58L17.17,18.08L12.95,12.77L12.09,13.27Z</StreamGeometry> <StreamGeometry x:Key="Icon_Volume">M6,2H18A2,2 0 0,1 20,4V20A2,2 0 0,1 18,22H6A2,2 0 0,1 4,20V4A2,2 0 0,1 6,2M12,4A6,6 0 0,0 6,10C6,13.31 8.69,16 12.1,16L11.22,13.77C10.95,13.29 11.11,12.68 11.59,12.4L12.45,11.9C12.93,11.63 13.54,11.79 13.82,12.27L15.74,14.69C17.12,13.59 18,11.9 18,10A6,6 0 0,0 12,4M12,9A1,1 0 0,1 13,10A1,1 0 0,1 12,11A1,1 0 0,1 11,10A1,1 0 0,1 12,9M7,18A1,1 0 0,0 6,19A1,1 0 0,0 7,20A1,1 0 0,0 8,19A1,1 0 0,0 7,18M12.09,13.27L14.58,19.58L17.17,18.08L12.95,12.77L12.09,13.27Z</StreamGeometry>
</converters:KeyToPathConverter> </converters:KeyToPathConverter>
<ControlTheme x:Key="{x:Type dialogs:ManagedFileChooser}" TargetType="dialogs:ManagedFileChooser"> <ControlTheme x:Key="{x:Type dialogs:ManagedFileChooser}" TargetType="dialogs:ManagedFileChooser">
<Setter Property="Template"> <Setter Property="dialogs:ManagedFileChooser.Template">
<ControlTemplate x:DataType="internal:ManagedFileChooserViewModel" TargetType="dialogs:ManagedFileChooser"> <ControlTemplate x:DataType="internal:ManagedFileChooserViewModel" TargetType="dialogs:ManagedFileChooser">
<DockPanel> <DockPanel>
<Border <Border
@ -30,7 +30,7 @@
DockPanel.Dock="Left" DockPanel.Dock="Left"
Theme="{DynamicResource CardBorder}"> Theme="{DynamicResource CardBorder}">
<ListBox <ListBox
Name="PART_QuickLinks" x:Name="PART_QuickLinks"
Focusable="False" Focusable="False"
ItemsSource="{Binding QuickLinks}" ItemsSource="{Binding QuickLinks}"
SelectedIndex="{Binding QuickLinksSelectedIndex}"> SelectedIndex="{Binding QuickLinksSelectedIndex}">
@ -38,7 +38,8 @@
<DataTemplate> <DataTemplate>
<StackPanel Orientation="Horizontal" Spacing="4"> <StackPanel Orientation="Horizontal" Spacing="4">
<PathIcon <PathIcon
Theme="{DynamicResource InnerPathIcon}" Width="16"
Height="16"
Data="{Binding IconKey, Converter={StaticResource Icons}}" Data="{Binding IconKey, Converter={StaticResource Icons}}"
Foreground="{DynamicResource ManagedFileChooserIconForeground}" /> Foreground="{DynamicResource ManagedFileChooserIconForeground}" />
<TextBlock Foreground="{DynamicResource ManagedFileChooserTextForeground}" Text="{Binding DisplayName}" /> <TextBlock Foreground="{DynamicResource ManagedFileChooserTextForeground}" Text="{Binding DisplayName}" />
@ -48,7 +49,7 @@
</ListBox> </ListBox>
</Border> </Border>
<DockPanel <DockPanel
Name="NavBar" x:Name="NavBar"
Margin="8,8,8,0" Margin="8,8,8,0"
VerticalAlignment="Center" VerticalAlignment="Center"
DockPanel.Dock="Top"> DockPanel.Dock="Top">
@ -57,11 +58,12 @@
DockPanel.Dock="Left" DockPanel.Dock="Left"
Theme="{DynamicResource BorderlessButton}"> Theme="{DynamicResource BorderlessButton}">
<PathIcon <PathIcon
Theme="{DynamicResource InnerPathIcon}" Width="16"
Height="16"
Data="{DynamicResource ManagedFileChooserUpButtonGlyph}" Data="{DynamicResource ManagedFileChooserUpButtonGlyph}"
Foreground="{DynamicResource ManagedFileChooserIconForeground}" /> Foreground="{DynamicResource ManagedFileChooserIconForeground}" />
</Button> </Button>
<TextBox Name="Location" Text="{Binding Location}"> <TextBox x:Name="Location" Text="{Binding Location}">
<TextBox.KeyBindings> <TextBox.KeyBindings>
<KeyBinding Command="{Binding EnterPressed}" Gesture="Enter" /> <KeyBinding Command="{Binding EnterPressed}" Gesture="Enter" />
</TextBox.KeyBindings> </TextBox.KeyBindings>
@ -86,7 +88,7 @@
DockPanel.Dock="Left" DockPanel.Dock="Left"
IsChecked="{Binding ShowHiddenFiles}" /> IsChecked="{Binding ShowHiddenFiles}" />
<UniformGrid <UniformGrid
Name="Finalize" x:Name="Finalize"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Rows="1"> Rows="1">
<Button <Button
@ -157,7 +159,8 @@
<ColumnDefinition SharedSizeGroup="Size" /> <ColumnDefinition SharedSizeGroup="Size" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<PathIcon <PathIcon
Theme="{DynamicResource InnerPathIcon}" Width="16"
Height="16"
Data="{Binding IconKey, Converter={StaticResource Icons}}" Data="{Binding IconKey, Converter={StaticResource Icons}}"
Foreground="{DynamicResource ManagedFileChooserIconForeground}" /> Foreground="{DynamicResource ManagedFileChooserIconForeground}" />
<TextBlock <TextBlock

155
src/Semi.Avalonia/Controls/Menu.axaml
View File

@ -10,77 +10,83 @@
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="ScrollViewer"> <ControlTemplate TargetType="ScrollViewer">
<DockPanel> <Border
<DockPanel.Styles> ClipToBounds="True"
<Style Selector="RepeatButton:pressed"> CornerRadius="{TemplateBinding CornerRadius}">
<Setter Property="RenderTransform" Value="{x:Null}" /> <DockPanel>
</Style> <DockPanel.Styles>
</DockPanel.Styles> <Style Selector="RepeatButton:pressed">
<RepeatButton <Setter Property="RenderTransform" Value="{x:Null}" />
HorizontalAlignment="Stretch" </Style>
HorizontalContentAlignment="Center" </DockPanel.Styles>
Background="Transparent" <RepeatButton
BorderThickness="0" HorizontalAlignment="Stretch"
Command="{Binding LineUp, RelativeSource={RelativeSource TemplatedParent}}" HorizontalContentAlignment="Center"
CornerRadius="0" Background="Transparent"
DockPanel.Dock="Top" BorderThickness="0"
RenderTransform="{x:Null}"> Command="{Binding LineUp, RelativeSource={RelativeSource TemplatedParent}}"
<RepeatButton.IsVisible> CornerRadius="0"
<MultiBinding DockPanel.Dock="Top"
Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}" RenderTransform="{x:Null}">
ConverterParameter="0"> <RepeatButton.IsVisible>
<Binding Path="VerticalScrollBarVisibility" <MultiBinding
RelativeSource="{RelativeSource TemplatedParent}" /> Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}"
<Binding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" /> ConverterParameter="0">
<Binding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" /> <Binding Path="VerticalScrollBarVisibility"
<Binding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" /> RelativeSource="{RelativeSource TemplatedParent}" />
</MultiBinding> <Binding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
</RepeatButton.IsVisible> <Binding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
<PathIcon <Binding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
Theme="{DynamicResource InnerPathIcon}" </MultiBinding>
Data="{DynamicResource MenuScrollViewerUpButtonGlyph}" </RepeatButton.IsVisible>
Foreground="{DynamicResource MenuFlyoutScrollViewerIconForeground}" /> <PathIcon
</RepeatButton> Width="8"
<RepeatButton Height="8"
HorizontalAlignment="Stretch" Data="{DynamicResource MenuScrollViewerUpButtonGlyph}"
HorizontalContentAlignment="Center" Foreground="{DynamicResource MenuFlyoutScrollViewerIconForeground}" />
Background="Transparent" </RepeatButton>
BorderThickness="0" <RepeatButton
Command="{Binding LineDown, RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch"
CornerRadius="0" HorizontalContentAlignment="Center"
DockPanel.Dock="Bottom" Background="Transparent"
RenderTransform="{x:Null}"> BorderThickness="0"
<RepeatButton.IsVisible> Command="{Binding LineDown, RelativeSource={RelativeSource TemplatedParent}}"
<MultiBinding CornerRadius="0"
Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}" DockPanel.Dock="Bottom"
ConverterParameter="100"> RenderTransform="{x:Null}">
<Binding Path="VerticalScrollBarVisibility" <RepeatButton.IsVisible>
RelativeSource="{RelativeSource TemplatedParent}" /> <MultiBinding
<Binding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" /> Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}"
<Binding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" /> ConverterParameter="100">
<Binding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" /> <Binding Path="VerticalScrollBarVisibility"
</MultiBinding> RelativeSource="{RelativeSource TemplatedParent}" />
</RepeatButton.IsVisible> <Binding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
<PathIcon <Binding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
Theme="{DynamicResource InnerPathIcon}" <Binding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
Data="{DynamicResource MenuScrollViewerDownButtonGlyph}" </MultiBinding>
Foreground="{DynamicResource MenuFlyoutScrollViewerIconForeground}" /> </RepeatButton.IsVisible>
</RepeatButton> <PathIcon
<ScrollContentPresenter Width="8"
Name="PART_ContentPresenter" Height="8"
Margin="{TemplateBinding Padding}" Data="{DynamicResource MenuScrollViewerDownButtonGlyph}"
HorizontalSnapPointsAlignment="{TemplateBinding HorizontalSnapPointsAlignment}" Foreground="{DynamicResource MenuFlyoutScrollViewerIconForeground}" />
HorizontalSnapPointsType="{TemplateBinding HorizontalSnapPointsType}" </RepeatButton>
VerticalSnapPointsAlignment="{TemplateBinding VerticalSnapPointsAlignment}" <ScrollContentPresenter
VerticalSnapPointsType="{TemplateBinding VerticalSnapPointsType}"> Name="PART_ContentPresenter"
<ScrollContentPresenter.GestureRecognizers> Margin="{TemplateBinding Padding}"
<ScrollGestureRecognizer HorizontalSnapPointsAlignment="{TemplateBinding HorizontalSnapPointsAlignment}"
CanHorizontallyScroll="{Binding CanHorizontallyScroll, ElementName=PART_ContentPresenter}" HorizontalSnapPointsType="{TemplateBinding HorizontalSnapPointsType}"
CanVerticallyScroll="{Binding CanVerticallyScroll, ElementName=PART_ContentPresenter}" VerticalSnapPointsAlignment="{TemplateBinding VerticalSnapPointsAlignment}"
IsScrollInertiaEnabled="{Binding IsScrollInertiaEnabled, RelativeSource={RelativeSource TemplatedParent}}" /> VerticalSnapPointsType="{TemplateBinding VerticalSnapPointsType}">
</ScrollContentPresenter.GestureRecognizers> <ScrollContentPresenter.GestureRecognizers>
</ScrollContentPresenter> <ScrollGestureRecognizer
</DockPanel> CanHorizontallyScroll="{Binding CanHorizontallyScroll, ElementName=PART_ContentPresenter}"
CanVerticallyScroll="{Binding CanVerticallyScroll, ElementName=PART_ContentPresenter}"
IsScrollInertiaEnabled="{Binding IsScrollInertiaEnabled, RelativeSource={RelativeSource TemplatedParent}}" />
</ScrollContentPresenter.GestureRecognizers>
</ScrollContentPresenter>
</DockPanel>
</Border>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
</ControlTheme> </ControlTheme>
@ -109,6 +115,7 @@
<ControlTheme x:Key="{x:Type MenuItem}" TargetType="MenuItem"> <ControlTheme x:Key="{x:Type MenuItem}" TargetType="MenuItem">
<Setter Property="Background" Value="{DynamicResource MenuItemBackground}" /> <Setter Property="Background" Value="{DynamicResource MenuItemBackground}" />
<Setter Property="Foreground" Value="{DynamicResource MenuItemForeground}" /> <Setter Property="Foreground" Value="{DynamicResource MenuItemForeground}" />
<Setter Property="CornerRadius" Value="{DynamicResource MenuItemCornerRadius}" />
<Setter Property="Cursor" Value="Hand" /> <Setter Property="Cursor" Value="Hand" />
<!-- Narrow padding should be used for mouse input, when non-narrow one should be used for touch input in future. --> <!-- Narrow padding should be used for mouse input, when non-narrow one should be used for touch input in future. -->
<Setter Property="Padding" Value="{DynamicResource MenuItemPadding}" /> <Setter Property="Padding" Value="{DynamicResource MenuItemPadding}" />
@ -166,7 +173,7 @@
ContentTemplate="{TemplateBinding HeaderTemplate}" ContentTemplate="{TemplateBinding HeaderTemplate}"
RecognizesAccessKey="True" /> RecognizesAccessKey="True" />
<TextBlock <TextBlock
Name="PART_InputGestureText" x:Name="PART_InputGestureText"
Grid.Column="3" Grid.Column="3"
Margin="{DynamicResource MenuItemInputGestureTextMargin}" Margin="{DynamicResource MenuItemInputGestureTextMargin}"
HorizontalAlignment="Right" HorizontalAlignment="Right"
@ -177,7 +184,8 @@
<PathIcon <PathIcon
Name="PART_ExpandIcon" Name="PART_ExpandIcon"
Grid.Column="4" Grid.Column="4"
Theme="{DynamicResource InnerPathIcon}" Width="8"
Height="8"
Margin="{DynamicResource MenuItemExpandIconMargin}" Margin="{DynamicResource MenuItemExpandIconMargin}"
VerticalAlignment="Center" VerticalAlignment="Center"
Data="{DynamicResource MenuItemExpandIconGlyph}" Data="{DynamicResource MenuItemExpandIconGlyph}"
@ -275,7 +283,6 @@
<Setter Property="Content"> <Setter Property="Content">
<Template> <Template>
<PathIcon <PathIcon
Theme="{DynamicResource InnerPathIcon}"
Foreground="{Binding $parent[MenuItem].Foreground}" Foreground="{Binding $parent[MenuItem].Foreground}"
Data="{StaticResource MenuCheckGlyph}" /> Data="{StaticResource MenuCheckGlyph}" />
</Template> </Template>

19
src/Semi.Avalonia/Controls/MenuFlyoutPresenter.axaml
View File

@ -18,17 +18,17 @@
</Design.PreviewWith> </Design.PreviewWith>
<ControlTheme x:Key="{x:Type MenuFlyoutPresenter}" TargetType="MenuFlyoutPresenter"> <ControlTheme x:Key="{x:Type MenuFlyoutPresenter}" TargetType="MenuFlyoutPresenter">
<Setter Property="Background" Value="{DynamicResource MenuFlyoutBackground}" /> <Setter Property="MenuFlyoutPresenter.Background" Value="{DynamicResource MenuFlyoutBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutBorderBrush}" /> <Setter Property="MenuFlyoutPresenter.BorderBrush" Value="{DynamicResource MenuFlyoutBorderBrush}" />
<Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutBorderThickness}" /> <Setter Property="MenuFlyoutPresenter.BorderThickness" Value="{DynamicResource MenuFlyoutBorderThickness}" />
<Setter Property="Padding" Value="{DynamicResource MenuFlyoutPadding}" /> <Setter Property="MenuFlyoutPresenter.Padding" Value="{DynamicResource MenuFlyoutPadding}" />
<Setter Property="FontSize" Value="{DynamicResource TextBlockFontSize}" /> <Setter Property="MenuFlyoutPresenter.FontSize" Value="{DynamicResource TextBlockFontSize}" />
<Setter Property="FontWeight" Value="{DynamicResource TextBlockFontWeight}" /> <Setter Property="MenuFlyoutPresenter.FontWeight" Value="{DynamicResource TextBlockFontWeight}" />
<Setter Property="Foreground" Value="{DynamicResource TextBlockDefaultForeground}" /> <Setter Property="MenuFlyoutPresenter.Foreground" Value="{DynamicResource TextBlockDefaultForeground}" />
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" /> <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" /> <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
<Setter Property="CornerRadius" Value="{DynamicResource MenuFlyoutCornerRadius}" /> <Setter Property="MenuFlyoutPresenter.CornerRadius" Value="{DynamicResource MenuFlyoutCornerRadius}" />
<Setter Property="Template"> <Setter Property="MenuFlyoutPresenter.Template">
<ControlTemplate TargetType="MenuFlyoutPresenter"> <ControlTemplate TargetType="MenuFlyoutPresenter">
<Border <Border
Name="LayoutRoot" Name="LayoutRoot"
@ -37,6 +37,7 @@
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
BoxShadow="{DynamicResource MenuFlyoutBorderBoxShadow}" BoxShadow="{DynamicResource MenuFlyoutBorderBoxShadow}"
ClipToBounds="True"
CornerRadius="{TemplateBinding CornerRadius}" CornerRadius="{TemplateBinding CornerRadius}"
UseLayoutRounding="False"> UseLayoutRounding="False">
<ScrollViewer <ScrollViewer

3
src/Semi.Avalonia/Controls/NotificationCard.axaml
View File

@ -34,7 +34,7 @@
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
CornerRadius="{TemplateBinding CornerRadius}"> CornerRadius="{TemplateBinding CornerRadius}">
<Border <Border
Name="PART_RootBorder" x:Name="PART_RootBorder"
Padding="{DynamicResource NotificationCardPadding}" Padding="{DynamicResource NotificationCardPadding}"
BoxShadow="{DynamicResource NotificationCardBoxShadows}" BoxShadow="{DynamicResource NotificationCardBoxShadows}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
@ -43,7 +43,6 @@
<DockPanel MinWidth="{DynamicResource NotificationCardMinWidth}"> <DockPanel MinWidth="{DynamicResource NotificationCardMinWidth}">
<PathIcon <PathIcon
Name="NotificationIcon" Name="NotificationIcon"
Theme="{DynamicResource InnerPathIcon}"
Width="{DynamicResource NotificationCardIconWidth}" Width="{DynamicResource NotificationCardIconWidth}"
Height="{DynamicResource NotificationCardIconHeight}" Height="{DynamicResource NotificationCardIconHeight}"
Margin="{DynamicResource NotificationCardIconMargin}" Margin="{DynamicResource NotificationCardIconMargin}"

10
src/Semi.Avalonia/Controls/NumericUpDown.axaml
View File

@ -3,11 +3,11 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:CompileBindings="True"> x:CompileBindings="True">
<ControlTheme x:Key="{x:Type NumericUpDown}" TargetType="NumericUpDown"> <ControlTheme x:Key="{x:Type NumericUpDown}" TargetType="NumericUpDown">
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="NumericUpDown.VerticalAlignment" Value="Center" />
<Setter Property="VerticalContentAlignment" Value="Center" /> <Setter Property="NumericUpDown.VerticalContentAlignment" Value="Center" />
<Setter Property="CornerRadius" Value="{DynamicResource NumericUpDownCornerRadius}" /> <Setter Property="NumericUpDown.CornerRadius" Value="{DynamicResource NumericUpDownCornerRadius}" />
<Setter Property="MinHeight" Value="{DynamicResource NumericUpDownDefaultHeight}" /> <Setter Property="NumericUpDown.MinHeight" Value="{DynamicResource NumericUpDownDefaultHeight}" />
<Setter Property="Template"> <Setter Property="NumericUpDown.Template">
<ControlTemplate TargetType="NumericUpDown"> <ControlTemplate TargetType="NumericUpDown">
<DataValidationErrors> <DataValidationErrors>
<ButtonSpinner <ButtonSpinner

51
src/Semi.Avalonia/Controls/PathIcon.axaml
View File

@ -3,9 +3,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:CompileBindings="True"> x:CompileBindings="True">
<ControlTheme x:Key="{x:Type PathIcon}" TargetType="PathIcon"> <ControlTheme x:Key="{x:Type PathIcon}" TargetType="PathIcon">
<Setter Property="Background" Value="Transparent" /> <Setter Property="PathIcon.Background" Value="Transparent" />
<Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" /> <Setter Property="PathIcon.Height" Value="{DynamicResource IconElementThemeHeight}" />
<Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" /> <Setter Property="PathIcon.Width" Value="{DynamicResource IconElementThemeWidth}" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="PathIcon"> <ControlTemplate TargetType="PathIcon">
<Border Background="{TemplateBinding Background}"> <Border Background="{TemplateBinding Background}">
@ -20,48 +20,7 @@
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^.Active /template/ Path#PART_Path"> <Style Selector="^.Active /template/ Path#PART_Path">
<Setter Property="Fill" Value="{TemplateBinding BorderBrush}" /> <Setter Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderBrush}"></Setter>
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary>
<ControlTheme x:Key="InnerPathIcon" TargetType="PathIcon">
<Setter Property="Height" Value="16" />
<Setter Property="Width" Value="16" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="Template">
<ControlTemplate TargetType="PathIcon">
<Border Background="{TemplateBinding Background}">
<Viewbox
Width="{TemplateBinding Width}"
Height="{TemplateBinding Height}">
<Path
Name="PART_Path"
Width="24"
Height="24"
Data="{TemplateBinding Data}"
Fill="{TemplateBinding Foreground}" />
</Viewbox>
</Border>
</ControlTemplate>
</Setter>
<Style Selector="^.Active /template/ Path#PART_Path">
<Setter Property="Fill" Value="{TemplateBinding BorderBrush}" />
</Style>
<Style Selector="^.ExtraSmall">
<Setter Property="Height" Value="8" />
<Setter Property="Width" Value="8" />
</Style>
<Style Selector="^.Small">
<Setter Property="Height" Value="12" />
<Setter Property="Width" Value="12" />
</Style>
<Style Selector="^.Large">
<Setter Property="Height" Value="20" />
<Setter Property="Width" Value="20" />
</Style>
<Style Selector="^.ExtraLarge">
<Setter Property="Height" Value="24" />
<Setter Property="Width" Value="24" />
</Style>
</ControlTheme>
</ResourceDictionary>

14
src/Semi.Avalonia/Controls/ProgressBar.axaml
View File

@ -104,7 +104,7 @@
<ControlTemplate TargetType="ProgressBar"> <ControlTemplate TargetType="ProgressBar">
<Grid ColumnDefinitions="Auto, *, Auto" RowDefinitions="Auto, *, Auto"> <Grid ColumnDefinitions="Auto, *, Auto" RowDefinitions="Auto, *, Auto">
<Border <Border
Name="ProgressBarRoot" x:Name="ProgressBarRoot"
Grid.Row="1" Grid.Row="1"
Grid.Column="1" Grid.Column="1"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
@ -113,31 +113,31 @@
ClipToBounds="True" ClipToBounds="True"
CornerRadius="{TemplateBinding CornerRadius}"> CornerRadius="{TemplateBinding CornerRadius}">
<Panel> <Panel>
<Panel Name="DeterminateRoot" Opacity="1"> <Panel x:Name="DeterminateRoot" Opacity="1">
<Panel.Transitions> <Panel.Transitions>
<Transitions> <Transitions>
<DoubleTransition Property="Opacity" Duration="0:0:0.197" /> <DoubleTransition Property="Opacity" Duration="0:0:0.197" />
</Transitions> </Transitions>
</Panel.Transitions> </Panel.Transitions>
<Border <Border
Name="PART_Indicator" x:Name="PART_Indicator"
Margin="{TemplateBinding Padding}" Margin="{TemplateBinding Padding}"
Background="{TemplateBinding Foreground}" Background="{TemplateBinding Foreground}"
CornerRadius="{TemplateBinding CornerRadius}" /> CornerRadius="{TemplateBinding CornerRadius}" />
</Panel> </Panel>
<Panel Name="IndeterminateRoot" Opacity="0"> <Panel x:Name="IndeterminateRoot" Opacity="0">
<Panel.Transitions> <Panel.Transitions>
<Transitions> <Transitions>
<DoubleTransition Property="Opacity" Duration="0:0:0.197" /> <DoubleTransition Property="Opacity" Duration="0:0:0.197" />
</Transitions> </Transitions>
</Panel.Transitions> </Panel.Transitions>
<Border <Border
Name="IndeterminateProgressBarIndicator" x:Name="IndeterminateProgressBarIndicator"
Margin="{TemplateBinding Padding}" Margin="{TemplateBinding Padding}"
Background="{TemplateBinding Foreground}" Background="{TemplateBinding Foreground}"
CornerRadius="{TemplateBinding CornerRadius}" /> CornerRadius="{TemplateBinding CornerRadius}" />
<Border <Border
Name="IndeterminateProgressBarIndicator2" x:Name="IndeterminateProgressBarIndicator2"
Margin="{TemplateBinding Padding}" Margin="{TemplateBinding Padding}"
Background="{TemplateBinding Foreground}" Background="{TemplateBinding Foreground}"
CornerRadius="{TemplateBinding CornerRadius}" /> CornerRadius="{TemplateBinding CornerRadius}" />
@ -145,7 +145,7 @@
</Panel> </Panel>
</Border> </Border>
<LayoutTransformControl <LayoutTransformControl
Name="PART_LayoutTransformControl" x:Name="PART_LayoutTransformControl"
Grid.Row="1" Grid.Row="1"
Grid.Column="1" Grid.Column="1"
Margin="0" Margin="0"

20
src/Semi.Avalonia/Controls/RadioButton.axaml
View File

@ -27,7 +27,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="RadioButton"> <ControlTemplate TargetType="RadioButton">
<Border <Border
Name="RootBorder" x:Name="RootBorder"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
@ -38,7 +38,7 @@
TemplatedControl.IsTemplateFocusTarget="True" TemplatedControl.IsTemplateFocusTarget="True"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"> VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
<Ellipse <Ellipse
Name="OuterEllipse" x:Name="OuterEllipse"
Width="{DynamicResource RadioButtonIconRadius}" Width="{DynamicResource RadioButtonIconRadius}"
Height="{DynamicResource RadioButtonIconRadius}" Height="{DynamicResource RadioButtonIconRadius}"
Fill="{DynamicResource RadioButtonUncheckIconDefaultBackground}" Fill="{DynamicResource RadioButtonUncheckIconDefaultBackground}"
@ -47,7 +47,7 @@
UseLayoutRounding="False" /> UseLayoutRounding="False" />
<Ellipse <Ellipse
Name="CheckGlyph" x:Name="CheckGlyph"
Width="{DynamicResource RadioButtonGlyphRadius}" Width="{DynamicResource RadioButtonGlyphRadius}"
Height="{DynamicResource RadioButtonGlyphRadius}" Height="{DynamicResource RadioButtonGlyphRadius}"
Fill="{DynamicResource RadioButtonCheckGlyphFill}" Fill="{DynamicResource RadioButtonCheckGlyphFill}"
@ -55,7 +55,7 @@
UseLayoutRounding="False" /> UseLayoutRounding="False" />
</Panel> </Panel>
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter" x:Name="PART_ContentPresenter"
Grid.Column="1" Grid.Column="1"
Margin="{DynamicResource RadioButtonContentMargin}" Margin="{DynamicResource RadioButtonContentMargin}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@ -166,7 +166,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="RadioButton"> <ControlTemplate TargetType="RadioButton">
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter" x:Name="PART_ContentPresenter"
Margin="{TemplateBinding Margin}" Margin="{TemplateBinding Margin}"
Padding="{TemplateBinding Padding}" Padding="{TemplateBinding Padding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@ -221,7 +221,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="RadioButton"> <ControlTemplate TargetType="RadioButton">
<Border <Border
Name="RootBorder" x:Name="RootBorder"
Padding="{TemplateBinding Padding}" Padding="{TemplateBinding Padding}"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
@ -236,7 +236,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
Margin="{DynamicResource RadioButtonIconMargin}"> Margin="{DynamicResource RadioButtonIconMargin}">
<Ellipse <Ellipse
Name="OuterEllipse" x:Name="OuterEllipse"
Width="{DynamicResource RadioButtonIconRadius}" Width="{DynamicResource RadioButtonIconRadius}"
Height="{DynamicResource RadioButtonIconRadius}" Height="{DynamicResource RadioButtonIconRadius}"
Fill="{DynamicResource RadioButtonUncheckIconDefaultBackground}" Fill="{DynamicResource RadioButtonUncheckIconDefaultBackground}"
@ -245,7 +245,7 @@
UseLayoutRounding="False" /> UseLayoutRounding="False" />
<Ellipse <Ellipse
Name="CheckGlyph" x:Name="CheckGlyph"
Width="{DynamicResource RadioButtonGlyphRadius}" Width="{DynamicResource RadioButtonGlyphRadius}"
Height="{DynamicResource RadioButtonGlyphRadius}" Height="{DynamicResource RadioButtonGlyphRadius}"
Fill="{DynamicResource RadioButtonCheckGlyphFill}" Fill="{DynamicResource RadioButtonCheckGlyphFill}"
@ -254,7 +254,7 @@
</Panel> </Panel>
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter" x:Name="PART_ContentPresenter"
Grid.Column="1" Grid.Column="1"
Margin="{DynamicResource RadioButtonContentMargin}" Margin="{DynamicResource RadioButtonContentMargin}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@ -372,7 +372,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="RadioButton"> <ControlTemplate TargetType="RadioButton">
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter" x:Name="PART_ContentPresenter"
Padding="{TemplateBinding Padding}" Padding="{TemplateBinding Padding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"

8
src/Semi.Avalonia/Controls/RepeatButton.axaml
View File

@ -22,7 +22,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="RepeatButton"> <ControlTemplate TargetType="RepeatButton">
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter" x:Name="PART_ContentPresenter"
Padding="{TemplateBinding Padding}" Padding="{TemplateBinding Padding}"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
@ -97,12 +97,6 @@
x:Key="SolidRepeatButton" x:Key="SolidRepeatButton"
BasedOn="{StaticResource {x:Type RepeatButton}}" BasedOn="{StaticResource {x:Type RepeatButton}}"
TargetType="RepeatButton"> TargetType="RepeatButton">
<Setter Property="FocusAdorner">
<FocusAdornerTemplate>
<Border Theme="{DynamicResource AdornerLayerBorder}"
Classes="Solid" />
</FocusAdornerTemplate>
</Setter>
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter"> <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" /> <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" /> <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />

10
src/Semi.Avalonia/Controls/ScrollViewer.axaml
View File

@ -205,13 +205,13 @@
<Setter Property="MinHeight" Value="{DynamicResource ScrollBarThickness}" /> <Setter Property="MinHeight" Value="{DynamicResource ScrollBarThickness}" />
<Setter Property="Width" Value="{DynamicResource ScrollBarThumbThickness}" /> <Setter Property="Width" Value="{DynamicResource ScrollBarThumbThickness}" />
</Style> </Style>
<Style Selector="^ /template/ RepeatButton > PathIcon"> <Style Selector="^ /template/ RepeatButton &gt; PathIcon">
<Setter Property="Foreground" Value="{DynamicResource ScrollBarButtonDefaultForeground}" /> <Setter Property="Foreground" Value="{DynamicResource ScrollBarButtonDefaultForeground}" />
</Style> </Style>
<Style Selector="^ /template/ RepeatButton:pointerover > PathIcon"> <Style Selector="^ /template/ RepeatButton:pointerover &gt; PathIcon">
<Setter Property="Foreground" Value="{DynamicResource ScrollBarButtonPointeroverForeground}" /> <Setter Property="Foreground" Value="{DynamicResource ScrollBarButtonPointeroverForeground}" />
</Style> </Style>
<Style Selector="^ /template/ RepeatButton:pressed > PathIcon"> <Style Selector="^ /template/ RepeatButton:pressed &gt; PathIcon">
<Setter Property="RenderTransform" Value="scale(0.92)" /> <Setter Property="RenderTransform" Value="scale(0.92)" />
</Style> </Style>
@ -346,11 +346,11 @@
</DockPanel> </DockPanel>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^ /template/ RepeatButton > Path"> <Style Selector="^ /template/ RepeatButton &gt; Path">
<Setter Property="Fill" Value="{DynamicResource ColorScrollBarButtonDefaultForeground}" /> <Setter Property="Fill" Value="{DynamicResource ColorScrollBarButtonDefaultForeground}" />
</Style> </Style>
<Style Selector="^ /template/ RepeatButton:pointerover > Path"> <Style Selector="^ /template/ RepeatButton:pointerover &gt; Path">
<Setter Property="Fill" Value="{DynamicResource ColorScrollBarButtonPointeroverForeground}" /> <Setter Property="Fill" Value="{DynamicResource ColorScrollBarButtonPointeroverForeground}" />
</Style> </Style>
</ControlTheme> </ControlTheme>

10
src/Semi.Avalonia/Controls/SelectableTextBlock.axaml
View File

@ -12,11 +12,11 @@
</MenuFlyout> </MenuFlyout>
<ControlTheme x:Key="{x:Type SelectableTextBlock}" TargetType="SelectableTextBlock"> <ControlTheme x:Key="{x:Type SelectableTextBlock}" TargetType="SelectableTextBlock">
<Setter Property="Foreground" Value="{DynamicResource TextBlockDefaultForeground}" /> <Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockDefaultForeground}" />
<Setter Property="FontSize" Value="{DynamicResource TextBlockFontSize}" /> <Setter Property="SelectableTextBlock.FontSize" Value="{DynamicResource TextBlockFontSize}" />
<Setter Property="Cursor" Value="Ibeam" /> <Setter Property="SelectableTextBlock.Cursor" Value="Ibeam" />
<Setter Property="SelectionBrush" Value="{DynamicResource TextBlockSelectionBackground}" /> <Setter Property="SelectableTextBlock.SelectionBrush" Value="{DynamicResource TextBlockSelectionBackground}" />
<Setter Property="SelectionForegroundBrush" Value="{DynamicResource TextBlockSelectionForeground}" /> <Setter Property="SelectableTextBlock.SelectionForegroundBrush" Value="{DynamicResource TextBlockSelectionForeground}" />
<Style Selector="^.Secondary"> <Style Selector="^.Secondary">
<Setter Property="Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" /> <Setter Property="Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
</Style> </Style>

14
src/Semi.Avalonia/Controls/Slider.axaml
View File

@ -43,11 +43,11 @@
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="SliderThumbTheme" TargetType="Thumb"> <ControlTheme x:Key="SliderThumbTheme" TargetType="Thumb">
<Setter Property="CornerRadius" Value="{DynamicResource SliderThumbCornerRadius}" /> <Setter Property="Thumb.CornerRadius" Value="{DynamicResource SliderThumbCornerRadius}" />
<Setter Property="Cursor" Value="Hand" /> <Setter Property="Thumb.Cursor" Value="Hand" />
<Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" /> <Setter Property="Thumb.Background" Value="{DynamicResource SliderThumbBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource SliderThumbBorderBrush}" /> <Setter Property="Thumb.BorderBrush" Value="{DynamicResource SliderThumbBorderBrush}" />
<Setter Property="BorderThickness" Value="{DynamicResource SliderThumbBorderThickness}" /> <Setter Property="Thumb.BorderThickness" Value="{DynamicResource SliderThumbBorderThickness}" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="Thumb"> <ControlTemplate TargetType="Thumb">
<Border <Border
@ -76,7 +76,7 @@
<ControlTemplate TargetType="Slider"> <ControlTemplate TargetType="Slider">
<DataValidationErrors> <DataValidationErrors>
<Grid <Grid
Name="SliderContainer" x:Name="SliderContainer"
Margin="{TemplateBinding Padding}" Margin="{TemplateBinding Padding}"
Background="Transparent" Background="Transparent"
RowDefinitions="Auto,Auto,Auto"> RowDefinitions="Auto,Auto,Auto">
@ -153,7 +153,7 @@
<ControlTemplate> <ControlTemplate>
<DataValidationErrors> <DataValidationErrors>
<Grid <Grid
Name="SliderContainer" x:Name="SliderContainer"
Margin="{TemplateBinding Padding}" Margin="{TemplateBinding Padding}"
Background="{DynamicResource SliderContainerBackground}" Background="{DynamicResource SliderContainerBackground}"
ColumnDefinitions="Auto,Auto,Auto"> ColumnDefinitions="Auto,Auto,Auto">

65
src/Semi.Avalonia/Controls/SplitButton.axaml
View File

@ -25,7 +25,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="Button"> <ControlTemplate TargetType="Button">
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter" x:Name="PART_ContentPresenter"
Padding="{TemplateBinding Padding}" Padding="{TemplateBinding Padding}"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
@ -69,7 +69,32 @@
CornerRadius="{TemplateBinding CornerRadius}"> CornerRadius="{TemplateBinding CornerRadius}">
<DockPanel> <DockPanel>
<Button <Button
Name="PART_PrimaryButton" x:Name="PART_SecondaryButton"
Padding="4,0"
VerticalAlignment="Stretch"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="0"
DockPanel.Dock="Right"
Focusable="False"
KeyboardNavigation.IsTabStop="False"
Theme="{DynamicResource SemiSplitButtonElement}">
<PathIcon
Width="12"
Height="12"
Data="{DynamicResource SplitButtonIconGlyph}"
Foreground="{Binding $parent[Button].Foreground}" />
</Button>
<Rectangle
x:Name="SeparatorBorder"
Width="{DynamicResource SplitButtonSeparatorWidth}"
VerticalAlignment="Stretch"
DockPanel.Dock="Right"
Fill="{TemplateBinding BorderBrush}"
StrokeThickness="0" />
<Button
x:Name="PART_PrimaryButton"
Padding="{TemplateBinding Padding}" Padding="{TemplateBinding Padding}"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
@ -81,32 +106,12 @@
Content="{TemplateBinding Content}" Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplate="{TemplateBinding ContentTemplate}"
CornerRadius="0" CornerRadius="0"
Focusable="False"
FontFamily="{TemplateBinding FontFamily}" FontFamily="{TemplateBinding FontFamily}"
FontSize="{TemplateBinding FontSize}" FontSize="{TemplateBinding FontSize}"
FontWeight="{TemplateBinding FontWeight}" FontWeight="{TemplateBinding FontWeight}"
DockPanel.Dock="Left" KeyboardNavigation.IsTabStop="False"
Theme="{DynamicResource SemiSplitButtonElement}" /> Theme="{DynamicResource SemiSplitButtonElement}" />
<Rectangle
Name="SeparatorBorder"
Width="{DynamicResource SplitButtonSeparatorWidth}"
VerticalAlignment="Stretch"
DockPanel.Dock="Left"
Fill="Transparent"
StrokeThickness="0" />
<Button
Name="PART_SecondaryButton"
Padding="4,0"
VerticalAlignment="Stretch"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="0"
Theme="{DynamicResource SemiSplitButtonElement}">
<PathIcon
Theme="{DynamicResource InnerPathIcon}"
Data="{DynamicResource SplitButtonIconGlyph}"
Foreground="{Binding $parent[Button].Foreground}" />
</Button>
</DockPanel> </DockPanel>
</Border> </Border>
</ControlTemplate> </ControlTemplate>
@ -144,12 +149,6 @@
</Style> </Style>
<Style Selector="^:checked"> <Style Selector="^:checked">
<Style Selector="^ /template/ Button"> <Style Selector="^ /template/ Button">
<Setter Property="FocusAdorner">
<FocusAdornerTemplate>
<Border Theme="{DynamicResource AdornerLayerBorder}"
Classes="Solid" />
</FocusAdornerTemplate>
</Setter>
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" /> <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" /> <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
<Style Selector="^:pointerover"> <Style Selector="^:pointerover">
@ -234,12 +233,6 @@
BasedOn="{StaticResource {x:Type SplitButton}}" BasedOn="{StaticResource {x:Type SplitButton}}"
TargetType="SplitButton"> TargetType="SplitButton">
<Style Selector="^ /template/ Button"> <Style Selector="^ /template/ Button">
<Setter Property="FocusAdorner">
<FocusAdornerTemplate>
<Border Theme="{DynamicResource AdornerLayerBorder}"
Classes="Solid" />
</FocusAdornerTemplate>
</Setter>
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" /> <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" /> <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />

8
src/Semi.Avalonia/Controls/SplitView.axaml
View File

@ -21,7 +21,7 @@
ClipToBounds="True" ClipToBounds="True"
ZIndex="100"> ZIndex="100">
<ContentPresenter <ContentPresenter
Name="PART_PanePresenter" x:Name="PART_PanePresenter"
Content="{TemplateBinding Pane}" Content="{TemplateBinding Pane}"
ContentTemplate="{TemplateBinding PaneTemplate}" /> ContentTemplate="{TemplateBinding PaneTemplate}" />
<Rectangle <Rectangle
@ -33,7 +33,7 @@
<Panel Name="ContentRoot"> <Panel Name="ContentRoot">
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter" x:Name="PART_ContentPresenter"
Content="{TemplateBinding Content}" Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}" /> ContentTemplate="{TemplateBinding ContentTemplate}" />
<Rectangle <Rectangle
@ -112,7 +112,7 @@
ClipToBounds="True" ClipToBounds="True"
ZIndex="100"> ZIndex="100">
<ContentPresenter <ContentPresenter
Name="PART_PanePresenter" x:Name="PART_PanePresenter"
Content="{TemplateBinding Pane}" Content="{TemplateBinding Pane}"
ContentTemplate="{TemplateBinding PaneTemplate}" /> ContentTemplate="{TemplateBinding PaneTemplate}" />
<Rectangle <Rectangle
@ -124,7 +124,7 @@
<Panel Name="ContentRoot"> <Panel Name="ContentRoot">
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter" x:Name="PART_ContentPresenter"
Content="{TemplateBinding Content}" Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}" /> ContentTemplate="{TemplateBinding ContentTemplate}" />
<Rectangle Name="LightDismissLayer" IsVisible="False" /> <Rectangle Name="LightDismissLayer" IsVisible="False" />

4
src/Semi.Avalonia/Controls/TabControl.axaml
View File

@ -32,10 +32,10 @@
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^[TabStripPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel"> <Style Selector="^[TabStripPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter &gt; WrapPanel">
<Setter Property="Orientation" Value="Vertical" /> <Setter Property="Orientation" Value="Vertical" />
</Style> </Style>
<Style Selector="^[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel"> <Style Selector="^[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter &gt; WrapPanel">
<Setter Property="Orientation" Value="Vertical" /> <Setter Property="Orientation" Value="Vertical" />
</Style> </Style>
<Style Selector="^[TabStripPlacement=Left] /template/ Border#PART_BorderSeparator"> <Style Selector="^[TabStripPlacement=Left] /template/ Border#PART_BorderSeparator">

14
src/Semi.Avalonia/Controls/TabItem.axaml
View File

@ -12,13 +12,13 @@
</Design.PreviewWith> </Design.PreviewWith>
<ControlTheme x:Key="{x:Type TabItem}" TargetType="TabItem"> <ControlTheme x:Key="{x:Type TabItem}" TargetType="TabItem">
<Setter Property="Background" Value="{DynamicResource TabItemLinePipeBackground}" /> <Setter Property="TabItem.Background" Value="{DynamicResource TabItemLinePipeBackground}" />
<Setter Property="Foreground" Value="{DynamicResource TabItemLineHeaderForeground}" /> <Setter Property="TabItem.Foreground" Value="{DynamicResource TabItemLineHeaderForeground}" />
<Setter Property="Margin" Value="0" /> <Setter Property="TabItem.Margin" Value="0" />
<Setter Property="Padding" Value="8 4" /> <Setter Property="TabItem.Padding" Value="8 4" />
<Setter Property="MinHeight" Value="5" /> <Setter Property="TabItem.MinHeight" Value="5" />
<Setter Property="VerticalContentAlignment" Value="Center" /> <Setter Property="TabItem.VerticalContentAlignment" Value="Center" />
<Setter Property="Template"> <Setter Property="TabItem.Template">
<ControlTemplate TargetType="TabItem"> <ControlTemplate TargetType="TabItem">
<Border <Border
Name="PART_LayoutRoot" Name="PART_LayoutRoot"

14
src/Semi.Avalonia/Controls/TabStrip.axaml
View File

@ -31,13 +31,13 @@
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="{x:Type TabStripItem}" TargetType="TabStripItem"> <ControlTheme x:Key="{x:Type TabStripItem}" TargetType="TabStripItem">
<Setter Property="Background" Value="{DynamicResource TabItemLinePipeBackground}" /> <Setter Property="TabStripItem.Background" Value="{DynamicResource TabItemLinePipeBackground}" />
<Setter Property="Foreground" Value="{DynamicResource TabItemLineHeaderForeground}" /> <Setter Property="TabStripItem.Foreground" Value="{DynamicResource TabItemLineHeaderForeground}" />
<Setter Property="Margin" Value="0" /> <Setter Property="TabStripItem.Margin" Value="0" />
<Setter Property="Padding" Value="8 4" /> <Setter Property="TabStripItem.Padding" Value="8 4" />
<Setter Property="MinHeight" Value="5" /> <Setter Property="TabStripItem.MinHeight" Value="5" />
<Setter Property="VerticalContentAlignment" Value="Center" /> <Setter Property="TabStripItem.VerticalContentAlignment" Value="Center" />
<Setter Property="Template"> <Setter Property="TabStripItem.Template">
<ControlTemplate TargetType="TabStripItem"> <ControlTemplate TargetType="TabStripItem">
<Border <Border
Name="PART_LayoutRoot" Name="PART_LayoutRoot"

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

@ -52,7 +52,7 @@
x:Key="TitleTextBlock" x:Key="TitleTextBlock"
BasedOn="{StaticResource {x:Type TextBlock}}" BasedOn="{StaticResource {x:Type TextBlock}}"
TargetType="TextBlock"> TargetType="TextBlock">
<Setter Property="FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" /> <Setter Property="TextBlock.FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" />
<Style Selector="^.H1"> <Style Selector="^.H1">
<Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH1FontSize}" /> <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH1FontSize}" />
</Style> </Style>

26
src/Semi.Avalonia/Controls/TextBox.axaml
View File

@ -510,26 +510,22 @@
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="InputToggleButton" TargetType="ToggleButton"> <ControlTheme x:Key="InputToggleButton" TargetType="ToggleButton">
<Setter Property="Width" Value="16"/> <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ButtonInputInnerForeground}" />
<Setter Property="Height" Value="16"/> <Setter Property="ToggleButton.Cursor" Value="Hand" />
<Setter Property="Foreground" Value="{DynamicResource ButtonInputInnerForeground}" /> <Setter Property="ToggleButton.Template">
<!-- Background must be transparent or hit test will fail -->
<Setter Property="Background" Value="Transparent" />
<Setter Property="Cursor" Value="Hand" />
<Setter Property="Template">
<ControlTemplate TargetType="ToggleButton"> <ControlTemplate TargetType="ToggleButton">
<Panel <!-- Background must be transparent or hit test will fail -->
Width="{TemplateBinding Width}" <Panel Background="Transparent">
Height="{TemplateBinding Height}"
Background="{TemplateBinding Background}">
<PathIcon <PathIcon
Theme="{DynamicResource InnerPathIcon}" Width="16"
Height="16"
Data="{DynamicResource PasswordBoxRevealButtonData}" Data="{DynamicResource PasswordBoxRevealButtonData}"
IsVisible="{TemplateBinding IsChecked, Converter={x:Static BoolConverters.Not}}" /> IsVisible="{Binding $parent[ToggleButton].IsChecked, Converter={x:Static BoolConverters.Not}}" />
<PathIcon <PathIcon
Theme="{DynamicResource InnerPathIcon}" Width="16"
Height="16"
Data="{DynamicResource PasswordBoxHideButtonData}" Data="{DynamicResource PasswordBoxHideButtonData}"
IsVisible="{TemplateBinding IsChecked}" /> IsVisible="{Binding $parent[ToggleButton].IsChecked}" />
</Panel> </Panel>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>

251
src/Semi.Avalonia/Controls/TimePicker.axaml
View File

@ -23,125 +23,119 @@
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
BoxShadow="{DynamicResource DateTimePickerFlyoutBoxShadow}" BoxShadow="{DynamicResource DateTimePickerFlyoutBoxShadow}"
CornerRadius="{TemplateBinding CornerRadius}"> CornerRadius="{TemplateBinding CornerRadius}">
<Border <Grid Name="ContentPanel" RowDefinitions="*,Auto">
CornerRadius="{TemplateBinding CornerRadius}" <Grid Name="PART_PickerContainer">
ClipToBounds="True"> <Grid.Styles>
<Grid Name="ContentPanel" RowDefinitions="*,Auto"> <Style Selector="DateTimePickerPanel &gt; ListBoxItem">
<Grid Name="PART_PickerContainer"> <Setter Property="Theme" Value="{StaticResource DateTimePickerItem}" />
<Grid.Styles> </Style>
<Style Selector="DateTimePickerPanel > ListBoxItem"> </Grid.Styles>
<Setter Property="Theme" Value="{StaticResource DateTimePickerItem}" /> <!-- Ignore col defs here, set in code -->
</Style> <Panel Name="PART_HourHost" Grid.Column="0">
</Grid.Styles> <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden">
<!-- Ignore col defs here, set in code --> <DateTimePickerPanel
<Panel Name="PART_HourHost" Grid.Column="0"> Name="PART_HourSelector"
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden"> ItemHeight="{DynamicResource DateTimePickerListBoxItemHeight}"
<DateTimePickerPanel PanelType="Hour"
Name="PART_HourSelector" ShouldLoop="True" />
ItemHeight="{DynamicResource DateTimePickerListBoxItemHeight}" </ScrollViewer>
PanelType="Hour" <RepeatButton Name="PART_HourUpButton" Theme="{StaticResource DateTimePickerUpButton}" />
ShouldLoop="True" /> <RepeatButton Name="PART_HourDownButton" Theme="{StaticResource DateTimePickerDownButton}" />
</ScrollViewer> </Panel>
<RepeatButton Name="PART_HourUpButton" Theme="{StaticResource DateTimePickerUpButton}" />
<RepeatButton Name="PART_HourDownButton" Theme="{StaticResource DateTimePickerDownButton}" />
</Panel>
<Panel Name="PART_MinuteHost" Grid.Column="2"> <Panel Name="PART_MinuteHost" Grid.Column="2">
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden"> <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden">
<DateTimePickerPanel <DateTimePickerPanel
Name="PART_MinuteSelector" Name="PART_MinuteSelector"
ItemHeight="{DynamicResource DateTimePickerListBoxItemHeight}" ItemHeight="{DynamicResource DateTimePickerListBoxItemHeight}"
PanelType="Minute" PanelType="Minute"
ShouldLoop="True" /> ShouldLoop="True" />
</ScrollViewer> </ScrollViewer>
<RepeatButton Name="PART_MinuteUpButton" Theme="{StaticResource DateTimePickerUpButton}" /> <RepeatButton Name="PART_MinuteUpButton" Theme="{StaticResource DateTimePickerUpButton}" />
<RepeatButton Name="PART_MinuteDownButton" Theme="{StaticResource DateTimePickerDownButton}" /> <RepeatButton Name="PART_MinuteDownButton" Theme="{StaticResource DateTimePickerDownButton}" />
</Panel> </Panel>
<Panel Name="PART_SecondHost" Grid.Column="4">
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden">
<DateTimePickerPanel
Name="PART_SecondSelector"
ItemHeight="{DynamicResource DateTimePickerListBoxItemHeight}"
PanelType="Second"
ShouldLoop="True" />
</ScrollViewer>
<RepeatButton Name="PART_SecondUpButton" Theme="{StaticResource DateTimePickerUpButton}" />
<RepeatButton Name="PART_SecondDownButton" Theme="{StaticResource DateTimePickerDownButton}" />
</Panel>
<Panel Name="PART_SecondHost" Grid.Column="4"> <Panel Name="PART_PeriodHost" Grid.Column="6">
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden"> <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden">
<DateTimePickerPanel <DateTimePickerPanel
Name="PART_SecondSelector" Name="PART_PeriodSelector"
ItemHeight="{DynamicResource DateTimePickerListBoxItemHeight}" ItemHeight="{DynamicResource DateTimePickerListBoxItemHeight}"
PanelType="Second" PanelType="TimePeriod"
ShouldLoop="True" /> ShouldLoop="False" />
</ScrollViewer> </ScrollViewer>
<RepeatButton Name="PART_SecondUpButton" Theme="{StaticResource DateTimePickerUpButton}" /> <RepeatButton Name="PART_PeriodUpButton" Theme="{StaticResource DateTimePickerUpButton}" />
<RepeatButton Name="PART_SecondDownButton" Theme="{StaticResource DateTimePickerDownButton}" /> <RepeatButton Name="PART_PeriodDownButton" Theme="{StaticResource DateTimePickerDownButton}" />
</Panel> </Panel>
<Panel Name="PART_PeriodHost" Grid.Column="6"> <Rectangle
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden"> Name="PART_FirstSpacer"
<DateTimePickerPanel Grid.Column="1"
Name="PART_PeriodSelector" Width="1"
ItemHeight="{DynamicResource DateTimePickerListBoxItemHeight}" Margin="0,4"
PanelType="TimePeriod" HorizontalAlignment="Center"
ShouldLoop="False" /> Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
</ScrollViewer> <Rectangle
<RepeatButton Name="PART_PeriodUpButton" Theme="{StaticResource DateTimePickerUpButton}" /> Name="PART_SecondSpacer"
<RepeatButton Name="PART_PeriodDownButton" Theme="{StaticResource DateTimePickerDownButton}" /> Grid.Column="3"
</Panel> Width="1"
Margin="0,4"
<Rectangle HorizontalAlignment="Center"
Name="PART_FirstSpacer" Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
Grid.Column="1" <Rectangle
Width="1" Name="PART_ThirdSpacer"
HorizontalAlignment="Center" Grid.Column="5"
Fill="{DynamicResource DateTimePickerSeparatorBackground}" /> Width="1"
<Rectangle Margin="0,4"
Name="PART_SecondSpacer" HorizontalAlignment="Center"
Grid.Column="3" Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
Width="1"
HorizontalAlignment="Center"
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
<Rectangle
Name="PART_ThirdSpacer"
Grid.Column="5"
Width="1"
HorizontalAlignment="Center"
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
</Grid>
<Grid
Name="AcceptDismissGrid"
Grid.Row="1"
ColumnDefinitions="*,Auto,*">
<Button
Name="PART_AcceptButton"
Grid.Column="0"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Theme="{StaticResource DateTimePickerButton}">
<PathIcon
Width="12"
Height="12"
Data="{DynamicResource DateTimePickerAcceptGlyph}" />
</Button>
<Rectangle
Grid.Column="1"
Width="1"
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
<Button
Name="PART_DismissButton"
Grid.Column="2"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
FontSize="16"
Theme="{StaticResource DateTimePickerButton}">
<PathIcon
Width="12"
Height="12"
Data="{DynamicResource DateTimePickerDismissGlyph}" />
</Button>
<Rectangle
Grid.Column="0"
Grid.ColumnSpan="3"
Height="1"
VerticalAlignment="Top"
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
</Grid>
</Grid> </Grid>
</Border>
<Grid
Name="AcceptDismissGrid"
Grid.Row="1"
ColumnDefinitions="*,*">
<Button
Name="PART_AcceptButton"
Grid.Column="0"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Theme="{StaticResource DateTimePickerButton}">
<PathIcon
Width="12"
Height="12"
Data="{DynamicResource DateTimePickerAcceptGlyph}" />
</Button>
<Button
Name="PART_DismissButton"
Grid.Column="1"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
FontSize="16"
Theme="{StaticResource DateTimePickerButton}">
<PathIcon
Width="12"
Height="12"
Data="{DynamicResource DateTimePickerDismissGlyph}" />
</Button>
<Rectangle
Grid.ColumnSpan="2"
Height="1"
VerticalAlignment="Top"
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
</Grid>
</Grid>
</Border> </Border>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
@ -170,7 +164,7 @@
Margin="{TemplateBinding Padding}" Margin="{TemplateBinding Padding}"
ColumnDefinitions="*, Auto"> ColumnDefinitions="*, Auto">
<Button <Button
Name="PART_FlyoutButton" x:Name="PART_FlyoutButton"
Grid.Column="0" Grid.Column="0"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Width="242" Width="242"
@ -191,12 +185,12 @@
<Grid Name="PART_FlyoutButtonContentGrid" Grid.Column="0"> <Grid Name="PART_FlyoutButtonContentGrid" Grid.Column="0">
<!-- Ignore col defs here, set in code --> <!-- Ignore col defs here, set in code -->
<Border <Border
Name="PART_FirstPickerHost" x:Name="PART_FirstPickerHost"
Grid.Column="0" Grid.Column="0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"> VerticalAlignment="Stretch">
<TextBlock <TextBlock
Name="PART_HourTextBlock" x:Name="PART_HourTextBlock"
Padding="12,0" Padding="12,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
@ -214,12 +208,12 @@
Fill="{DynamicResource DateTimePickerSeparatorBackground}" /> Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
<Border <Border
Name="PART_SecondPickerHost" x:Name="PART_SecondPickerHost"
Grid.Column="2" Grid.Column="2"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"> VerticalAlignment="Stretch">
<TextBlock <TextBlock
Name="PART_MinuteTextBlock" x:Name="PART_MinuteTextBlock"
Padding="12,0" Padding="12,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
@ -237,12 +231,12 @@
Fill="{DynamicResource DateTimePickerSeparatorBackground}" /> Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
<Border <Border
Name="PART_ThirdPickerHost" x:Name="PART_ThirdPickerHost"
Grid.Column="4" Grid.Column="4"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"> VerticalAlignment="Stretch">
<TextBlock <TextBlock
Name="PART_SecondTextBlock" x:Name="PART_SecondTextBlock"
Padding="12,0" Padding="12,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
@ -260,12 +254,12 @@
Fill="{DynamicResource DateTimePickerSeparatorBackground}" /> Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
<Border <Border
Name="PART_FourthPickerHost" x:Name="PART_FourthPickerHost"
Grid.Column="6" Grid.Column="6"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"> VerticalAlignment="Stretch">
<TextBlock <TextBlock
Name="PART_PeriodTextBlock" x:Name="PART_PeriodTextBlock"
Padding="12,0" Padding="12,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
@ -277,7 +271,8 @@
<PathIcon <PathIcon
Name="PART_Icon" Name="PART_Icon"
Grid.Column="1" Grid.Column="1"
Theme="{DynamicResource InnerPathIcon}" Width="16"
Height="16"
Margin="0,0,8,0" Margin="0,0,8,0"
Data="{DynamicResource TimePickerIconGlyph}" Data="{DynamicResource TimePickerIconGlyph}"
Foreground="{DynamicResource DateTimePickerIconForeground}" /> Foreground="{DynamicResource DateTimePickerIconForeground}" />
@ -299,11 +294,11 @@
<Button <Button
Name="ClearButton" Name="ClearButton"
Grid.Column="1" Grid.Column="1"
Theme="{DynamicResource InnerIconButton}" Margin="0,0,8,0"
Margin="0,0,9,0"
Command="{Binding $parent[TimePicker].Clear}" Command="{Binding $parent[TimePicker].Clear}"
Content="{DynamicResource IconButtonClearData}" Content="{DynamicResource IconButtonClearData}"
IsVisible="False" /> IsVisible="False"
Theme="{DynamicResource InnerIconButton}" />
</Grid> </Grid>
</DataValidationErrors> </DataValidationErrors>
</ControlTemplate> </ControlTemplate>

8
src/Semi.Avalonia/Controls/TitleBar.axaml
View File

@ -10,16 +10,16 @@
<ControlTemplate> <ControlTemplate>
<Panel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="Stretch"> <Panel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="Stretch">
<Panel <Panel
Name="PART_MouseTracker" x:Name="PART_MouseTracker"
Height="1" Height="1"
VerticalAlignment="Top" /> VerticalAlignment="Top" />
<Panel Name="PART_Container"> <Panel x:Name="PART_Container">
<Border <Border
Name="PART_Background" x:Name="PART_Background"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
IsHitTestVisible="False" /> IsHitTestVisible="False" />
<CaptionButtons <CaptionButtons
Name="PART_CaptionButtons" x:Name="PART_CaptionButtons"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Top" VerticalAlignment="Top"
Foreground="{TemplateBinding Foreground}" /> Foreground="{TemplateBinding Foreground}" />

8
src/Semi.Avalonia/Controls/ToggleButton.axaml
View File

@ -39,7 +39,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="ToggleButton"> <ControlTemplate TargetType="ToggleButton">
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter" x:Name="PART_ContentPresenter"
BackgroundSizing="{TemplateBinding BackgroundSizing}" BackgroundSizing="{TemplateBinding BackgroundSizing}"
Padding="{TemplateBinding Padding}" Padding="{TemplateBinding Padding}"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
@ -96,12 +96,6 @@
</Style> </Style>
<Style Selector="^:checked"> <Style Selector="^:checked">
<Setter Property="FocusAdorner">
<FocusAdornerTemplate>
<Border Theme="{DynamicResource AdornerLayerBorder}"
Classes="Solid" />
</FocusAdornerTemplate>
</Setter>
<Setter Property="Foreground" Value="{DynamicResource ToggleButtonCheckedForeground}" /> <Setter Property="Foreground" Value="{DynamicResource ToggleButtonCheckedForeground}" />
<Setter Property="Background" Value="{DynamicResource ToggleButtonPrimaryCheckedBackground}" /> <Setter Property="Background" Value="{DynamicResource ToggleButtonPrimaryCheckedBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonPrimaryCheckedBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonPrimaryCheckedBorderBrush}" />

264
src/Semi.Avalonia/Controls/ToggleSwitch.axaml
View File

@ -3,45 +3,23 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:CompileBindings="True"> x:CompileBindings="True">
<Design.PreviewWith> <Design.PreviewWith>
<ThemeVariantScope RequestedThemeVariant="Dark"> <StackPanel Margin="20">
<StackPanel Spacing="8" Background="{DynamicResource SemiBackground0Color}"> <ToggleSwitch
<StackPanel Orientation="Horizontal"> Content="Content"
<ToggleSwitch Classes="Small" /> OffContent="OffContent"
<ToggleSwitch Classes="Small" IsChecked="True" /> OnContent="OnContent" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal">
<ToggleSwitch />
<ToggleSwitch IsChecked="True" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<ToggleSwitch Classes="Large" />
<ToggleSwitch Classes="Large" IsChecked="True" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<ToggleSwitch Theme="{DynamicResource SimpleToggleSwitch}" OnContent="是" OffContent="否" Classes="Small" />
<ToggleSwitch Theme="{DynamicResource SimpleToggleSwitch}" OnContent="是" OffContent="否" Classes="Small" IsChecked="True" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<ToggleSwitch Theme="{DynamicResource SimpleToggleSwitch}" OnContent="是" OffContent="否" />
<ToggleSwitch Theme="{DynamicResource SimpleToggleSwitch}" OnContent="是" OffContent="否" IsChecked="True" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<ToggleSwitch Theme="{DynamicResource SimpleToggleSwitch}" OnContent="是" OffContent="否" Classes="Large" />
<ToggleSwitch Theme="{DynamicResource SimpleToggleSwitch}" OnContent="是" OffContent="否" Classes="Large" IsChecked="True" />
</StackPanel>
</StackPanel>
</ThemeVariantScope>
</Design.PreviewWith> </Design.PreviewWith>
<ControlTheme x:Key="{x:Type ToggleSwitch}" TargetType="ToggleSwitch"> <ControlTheme x:Key="{x:Type ToggleSwitch}" TargetType="ToggleSwitch">
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
<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="Cursor" Value="Hand" />
<Setter Property="FocusAdorner"> <Setter Property="FocusAdorner">
<FocusAdornerTemplate> <FocusAdornerTemplate>
<Border Theme="{DynamicResource AdornerLayerBorder}" <Border BorderThickness="{DynamicResource AdornerLayerBorderThickness}"
CornerRadius="{DynamicResource ToggleSwitchIndicatorCornerRadius}" /> BorderBrush="{DynamicResource AdornerLayerStroke}"
CornerRadius="100"/>
</FocusAdornerTemplate> </FocusAdornerTemplate>
</Setter> </Setter>
<Setter Property="KnobTransitions"> <Setter Property="KnobTransitions">
@ -55,10 +33,12 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="ToggleSwitch"> <ControlTemplate TargetType="ToggleSwitch">
<Grid <Grid
RowDefinitions="Auto, *" Background="{TemplateBinding Background}"
Cursor="Hand"
RowDefinitions="Auto,*"
ColumnDefinitions="Auto, *"> ColumnDefinitions="Auto, *">
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter" x:Name="PART_ContentPresenter"
Grid.Row="0" Grid.Column="0" Grid.Row="0" Grid.Column="0"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Margin="{DynamicResource ToggleSwitchHeaderMargin}" Margin="{DynamicResource ToggleSwitchHeaderMargin}"
@ -69,39 +49,38 @@
RecognizesAccessKey="True" /> RecognizesAccessKey="True" />
<Border <Border
Name="SwitchBackgroundBorder" x:Name="SwitchBackgroundBorder"
Grid.Row="1" Grid.Column="0" Grid.Row="1" Grid.Column="0"
TemplatedControl.IsTemplateFocusTarget="True" TemplatedControl.IsTemplateFocusTarget="True"
Width="{DynamicResource ToggleSwitchDefaultWidth}" Width="{DynamicResource ToggleSwitchDefaultWidth}"
Height="{DynamicResource ToggleSwitchDefaultHeight}" Height="{DynamicResource ToggleSwitchDefaultHeight}"
BackgroundSizing="OuterBorderEdge"
BorderBrush="{DynamicResource ToggleSwitchDefaultBorderBrush}" BorderBrush="{DynamicResource ToggleSwitchDefaultBorderBrush}"
BorderThickness="{DynamicResource ToggleSwitchDefaultBorderThickness}" BorderThickness="1"
CornerRadius="{DynamicResource ToggleSwitchDefaultCornerRadius}"> CornerRadius="100">
<Border.Transitions> <Border.Transitions>
<Transitions> <Transitions>
<BrushTransition Property="Background" Duration="0:0:0.2" /> <BrushTransition Property="Background" Duration="0:0:0.2" />
</Transitions> </Transitions>
</Border.Transitions> </Border.Transitions>
<Canvas <Canvas
Name="PART_SwitchKnob" x:Name="PART_SwitchKnob"
Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}" Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}" Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
HorizontalAlignment="Left"> HorizontalAlignment="Left">
<Panel <Grid
Name="PART_MovingKnobs" x:Name="PART_MovingKnobs"
Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}" Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}" Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
Margin="{DynamicResource ToggleSwitchIndicatorDefaultMargin}"> Margin="{DynamicResource ToggleSwitchIndicatorDefaultMargin}">
<Border <Border
Name="SwitchKnobIndicator" x:Name="SwitchKnobIndicator"
Background="White" Background="White"
BoxShadow="{DynamicResource ToggleSwitchIndicatorBoxShadow}" BoxShadow="0 0 1 1 #222E3238"
CornerRadius="{DynamicResource ToggleSwitchIndicatorCornerRadius}" /> CornerRadius="100" />
<Arc <Arc
Name="SwitchKnobLoadingIndicator" x:Name="SwitchKnobLoadingIndicator"
IsVisible="False" IsVisible="False"
StrokeThickness="{DynamicResource ToggleSwitchLoadingIndicatorDefaultStrokeThickness}" StrokeThickness="2"
StartAngle="0" StartAngle="0"
SweepAngle="140" SweepAngle="140"
StrokeJoin="Round" StrokeJoin="Round"
@ -129,12 +108,12 @@
</Style> </Style>
</Arc.Styles> </Arc.Styles>
</Arc> </Arc>
</Panel> </Grid>
</Canvas> </Canvas>
</Border> </Border>
<ContentPresenter <ContentPresenter
Name="PART_OnContentPresenter" x:Name="PART_OnContentPresenter"
Grid.Row="1" Grid.Column="1" Grid.Row="1" Grid.Column="1"
Margin="{DynamicResource ToggleSwitchOnContentMargin}" Margin="{DynamicResource ToggleSwitchOnContentMargin}"
HorizontalAlignment="Left" HorizontalAlignment="Left"
@ -143,7 +122,7 @@
Content="{TemplateBinding OnContent}" Content="{TemplateBinding OnContent}"
ContentTemplate="{TemplateBinding OnContentTemplate}" /> ContentTemplate="{TemplateBinding OnContentTemplate}" />
<ContentPresenter <ContentPresenter
Name="PART_OffContentPresenter" x:Name="PART_OffContentPresenter"
Grid.Row="1" Grid.Column="1" Grid.Row="1" Grid.Column="1"
Margin="{DynamicResource ToggleSwitchOnContentMargin}" Margin="{DynamicResource ToggleSwitchOnContentMargin}"
HorizontalAlignment="Left" HorizontalAlignment="Left"
@ -178,6 +157,7 @@
<Style Selector="^:disabled /template/ Border#SwitchBackgroundBorder"> <Style Selector="^:disabled /template/ Border#SwitchBackgroundBorder">
<Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerUnCheckedDisabledBackground}" /> <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerUnCheckedDisabledBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchContainerUnCheckedDisabledBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchContainerUnCheckedDisabledBorderBrush}" />
<Setter Property="BorderThickness" Value="1" />
</Style> </Style>
</Style> </Style>
@ -221,16 +201,15 @@
<Style Selector="^ /template/ Border#SwitchBackgroundBorder"> <Style Selector="^ /template/ Border#SwitchBackgroundBorder">
<Setter Property="Width" Value="{DynamicResource ToggleSwitchSmallWidth}" /> <Setter Property="Width" Value="{DynamicResource ToggleSwitchSmallWidth}" />
<Setter Property="Height" Value="{DynamicResource ToggleSwitchSmallHeight}" /> <Setter Property="Height" Value="{DynamicResource ToggleSwitchSmallHeight}" />
<Setter Property="CornerRadius" Value="{DynamicResource ToggleSwitchSmallCornerRadius}" />
</Style> </Style>
<Style Selector="^ /template/ Canvas#PART_SwitchKnob"> <Style Selector="^ /template/ Canvas#PART_SwitchKnob">
<Setter Property="Width" Value="{DynamicResource ToggleSwitchIndicatorSmallWidth}" /> <Setter Property="Width" Value="{DynamicResource ToggleSwitchIndicatorSmallWidth}" />
<Setter Property="Height" Value="{DynamicResource ToggleSwitchIndicatorSmallWidth}" /> <Setter Property="Height" Value="{DynamicResource ToggleSwitchIndicatorSmallWidth}" />
</Style> </Style>
<Style Selector="^ /template/ Panel#PART_MovingKnobs"> <Style Selector="^ /template/ Grid#PART_MovingKnobs">
<Setter Property="Width" Value="{DynamicResource ToggleSwitchIndicatorSmallWidth}" /> <Setter Property="Width" Value="{DynamicResource ToggleSwitchIndicatorSmallWidth}" />
<Setter Property="Height" Value="{DynamicResource ToggleSwitchIndicatorSmallWidth}" /> <Setter Property="Height" Value="{DynamicResource ToggleSwitchIndicatorSmallWidth}" />
<Setter Property="Margin" Value="{DynamicResource ToggleSwitchIndicatorSmallMargin}" /> <Setter Property="Margin" Value="{DynamicResource ToggleSwitchIndicatorSmallMargin}"/>
</Style> </Style>
<Style Selector="^ /template/ Arc#SwitchKnobLoadingIndicator"> <Style Selector="^ /template/ Arc#SwitchKnobLoadingIndicator">
<Setter Property="StrokeThickness" Value="{DynamicResource ToggleSwitchLoadingIndicatorSmallStrokeThickness}" /> <Setter Property="StrokeThickness" Value="{DynamicResource ToggleSwitchLoadingIndicatorSmallStrokeThickness}" />
@ -240,16 +219,15 @@
<Style Selector="^ /template/ Border#SwitchBackgroundBorder"> <Style Selector="^ /template/ Border#SwitchBackgroundBorder">
<Setter Property="Width" Value="{DynamicResource ToggleSwitchLargeWidth}" /> <Setter Property="Width" Value="{DynamicResource ToggleSwitchLargeWidth}" />
<Setter Property="Height" Value="{DynamicResource ToggleSwitchLargeHeight}" /> <Setter Property="Height" Value="{DynamicResource ToggleSwitchLargeHeight}" />
<Setter Property="CornerRadius" Value="{DynamicResource ToggleSwitchLargeCornerRadius}" />
</Style> </Style>
<Style Selector="^ /template/ Canvas#PART_SwitchKnob"> <Style Selector="^ /template/ Canvas#PART_SwitchKnob">
<Setter Property="Width" Value="{DynamicResource ToggleSwitchIndicatorLargeWidth}" /> <Setter Property="Width" Value="{DynamicResource ToggleSwitchIndicatorLargeWidth}" />
<Setter Property="Height" Value="{DynamicResource ToggleSwitchIndicatorLargeWidth}" /> <Setter Property="Height" Value="{DynamicResource ToggleSwitchIndicatorLargeWidth}" />
</Style> </Style>
<Style Selector="^ /template/ Panel#PART_MovingKnobs"> <Style Selector="^ /template/ Grid#PART_MovingKnobs">
<Setter Property="Width" Value="{DynamicResource ToggleSwitchIndicatorLargeWidth}" /> <Setter Property="Width" Value="{DynamicResource ToggleSwitchIndicatorLargeWidth}" />
<Setter Property="Height" Value="{DynamicResource ToggleSwitchIndicatorLargeWidth}" /> <Setter Property="Height" Value="{DynamicResource ToggleSwitchIndicatorLargeWidth}" />
<Setter Property="Margin" Value="{DynamicResource ToggleSwitchIndicatorLargeMargin}" /> <Setter Property="Margin" Value="{DynamicResource ToggleSwitchIndicatorLargeMargin}"/>
</Style> </Style>
<Style Selector="^ /template/ Arc#SwitchKnobLoadingIndicator"> <Style Selector="^ /template/ Arc#SwitchKnobLoadingIndicator">
<Setter Property="StrokeThickness" Value="{DynamicResource ToggleSwitchLoadingIndicatorLargeStrokeThickness}" /> <Setter Property="StrokeThickness" Value="{DynamicResource ToggleSwitchLoadingIndicatorLargeStrokeThickness}" />
@ -257,25 +235,70 @@
</Style> </Style>
</ControlTheme> </ControlTheme>
<ControlTheme
x:Key="ButtonToggleSwitch"
BasedOn="{StaticResource {x:Type ToggleSwitch}}"
TargetType="ToggleSwitch">
<Setter Property="Padding" Value="8" />
<Setter Property="CornerRadius" Value="3" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="FocusAdorner">
<FocusAdornerTemplate>
<Border BorderThickness="{DynamicResource AdornerLayerBorderThickness}"
BorderBrush="{DynamicResource AdornerLayerStroke}" />
</FocusAdornerTemplate>
</Setter>
<Setter Property="Template">
<ControlTemplate TargetType="ToggleSwitch">
<Border
Name="Background"
Padding="{TemplateBinding Padding}"
Background="{TemplateBinding Background}"
CornerRadius="{TemplateBinding CornerRadius}"
Cursor="Hand">
<Panel>
<Panel x:Name="PART_SwitchKnob" />
<Panel x:Name="PART_MovingKnobs" />
<ContentPresenter
x:Name="PART_OnContentPresenter"
Margin="{DynamicResource ToggleSwitchOnContentMargin}"
Content="{TemplateBinding OnContent}"
ContentTemplate="{TemplateBinding OnContentTemplate}" />
<ContentPresenter
x:Name="PART_OffContentPresenter"
Margin="{DynamicResource ToggleSwitchOnContentMargin}"
Content="{TemplateBinding OffContent}"
ContentTemplate="{TemplateBinding OffContentTemplate}" />
</Panel>
</Border>
</ControlTemplate>
</Setter>
<Style Selector="^:pointerover">
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
</Style>
<Style Selector="^:pressed">
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
</Style>
</ControlTheme>
<ControlTheme <ControlTheme
x:Key="SimpleToggleSwitch" x:Key="SimpleToggleSwitch"
BasedOn="{StaticResource {x:Type ToggleSwitch}}" BasedOn="{StaticResource {x:Type ToggleSwitch}}"
TargetType="ToggleSwitch"> TargetType="ToggleSwitch">
<Setter Property="OnContent" Value="{x:Null}" /> <Setter Property="OnContent" Value="{x:Null}" />
<Setter Property="OffContent" Value="{x:Null}" /> <Setter Property="OffContent" Value="{x:Null}" />
<Setter Property="Content" Value="{x:Null}" />
<Setter Property="FontSize" Value="{DynamicResource SimpleToggleSwitchFontSize}" /> <Setter Property="FontSize" Value="{DynamicResource SimpleToggleSwitchFontSize}" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="ToggleSwitch"> <ControlTemplate TargetType="ToggleSwitch">
<Border <Border
Name="SwitchBackgroundBorder" x:Name="SwitchBackgroundBorder"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
Cursor="Hand"
Width="{DynamicResource ToggleSwitchDefaultWidth}" Width="{DynamicResource ToggleSwitchDefaultWidth}"
Height="{DynamicResource ToggleSwitchDefaultHeight}" Height="{DynamicResource ToggleSwitchDefaultHeight}"
BackgroundSizing="OuterBorderEdge"
BorderBrush="{DynamicResource ToggleSwitchDefaultBorderBrush}" BorderBrush="{DynamicResource ToggleSwitchDefaultBorderBrush}"
BorderThickness="{DynamicResource ToggleSwitchDefaultBorderThickness}" BorderThickness="1"
CornerRadius="{DynamicResource ToggleSwitchDefaultCornerRadius}"> CornerRadius="100">
<Border.Transitions> <Border.Transitions>
<Transitions> <Transitions>
<BrushTransition Property="Background" Duration="0:0:0.2" /> <BrushTransition Property="Background" Duration="0:0:0.2" />
@ -284,26 +307,26 @@
<Grid <Grid
ColumnDefinitions="*,*"> ColumnDefinitions="*,*">
<Canvas <Canvas
Name="PART_SwitchKnob" x:Name="PART_SwitchKnob"
Grid.Column="0" Grid.Column="0"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}" Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}" Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
HorizontalAlignment="Left"> HorizontalAlignment="Left">
<Panel <Grid
Name="PART_MovingKnobs" x:Name="PART_MovingKnobs"
Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}" Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}" Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
Margin="{DynamicResource ToggleSwitchIndicatorDefaultMargin}"> Margin="{DynamicResource ToggleSwitchIndicatorDefaultMargin}">
<Border <Border
Name="SwitchKnobIndicator" x:Name="SwitchKnobIndicator"
Background="White" Background="White"
BoxShadow="{DynamicResource ToggleSwitchIndicatorBoxShadow}" BoxShadow="0 0 1 1 #222E3238"
CornerRadius="{DynamicResource ToggleSwitchIndicatorCornerRadius}" /> CornerRadius="100" />
<Arc <Arc
Name="SwitchKnobLoadingIndicator" x:Name="SwitchKnobLoadingIndicator"
IsVisible="False" IsVisible="False"
StrokeThickness="{DynamicResource ToggleSwitchLoadingIndicatorDefaultStrokeThickness}" StrokeThickness="2"
StartAngle="0" StartAngle="0"
SweepAngle="140" SweepAngle="140"
StrokeJoin="Round" StrokeJoin="Round"
@ -331,10 +354,10 @@
</Style> </Style>
</Arc.Styles> </Arc.Styles>
</Arc> </Arc>
</Panel> </Grid>
</Canvas> </Canvas>
<ContentPresenter <ContentPresenter
Name="PART_OnContentPresenter" x:Name="PART_OnContentPresenter"
Grid.Column="0" Grid.Column="0"
VerticalAlignment="Center" VerticalAlignment="Center"
HorizontalAlignment="Center" HorizontalAlignment="Center"
@ -343,7 +366,7 @@
Content="{TemplateBinding OnContent}" Content="{TemplateBinding OnContent}"
ContentTemplate="{TemplateBinding OnContentTemplate}" /> ContentTemplate="{TemplateBinding OnContentTemplate}" />
<ContentPresenter <ContentPresenter
Name="PART_OffContentPresenter" x:Name="PART_OffContentPresenter"
Grid.Column="1" Grid.Column="1"
VerticalAlignment="Center" VerticalAlignment="Center"
HorizontalAlignment="Center" HorizontalAlignment="Center"
@ -370,105 +393,4 @@
</Style> </Style>
</Style> </Style>
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="ButtonToggleSwitch" TargetType="ToggleSwitch">
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="Padding" Value="{DynamicResource ButtonDefaultPadding}" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultBorderBrush}" />
<Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThickness}" />
<Setter Property="CornerRadius" Value="{DynamicResource ButtonCornerRadius}" />
<Setter Property="Cursor" Value="Hand" />
<Setter Property="OnContent" Value="{x:Null}" />
<Setter Property="OffContent" Value="{x:Null}" />
<Setter Property="Content" Value="{x:Null}" />
<Setter Property="MinHeight" Value="{DynamicResource ButtonDefaultHeight}" />
<Setter Property="FontSize" Value="{DynamicResource ButtonDefaultFontSize}" />
<Setter Property="FontWeight" Value="{DynamicResource ButtonDefaultFontWeight}" />
<Setter Property="Template">
<ControlTemplate TargetType="ToggleSwitch">
<Border
Name="Background"
Padding="{TemplateBinding Padding}"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}">
<Panel>
<Panel Name="PART_SwitchKnob" />
<Panel Name="PART_MovingKnobs" />
<ContentPresenter
Name="PART_OnContentPresenter"
IsVisible="{TemplateBinding IsChecked}"
Content="{TemplateBinding OnContent}"
ContentTemplate="{TemplateBinding OnContentTemplate}" />
<ContentPresenter
Name="PART_OffContentPresenter"
IsVisible="{TemplateBinding IsChecked, Converter={x:Static BoolConverters.Not}}"
Content="{TemplateBinding OffContent}"
ContentTemplate="{TemplateBinding OffContentTemplate}" />
<ContentPresenter
Name="PART_ContentPresenter"
Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}">
<ContentPresenter.IsVisible>
<MultiBinding Converter="{x:Static BoolConverters.And}">
<TemplateBinding Property="Content" Converter="{x:Static ObjectConverters.IsNotNull}" />
<TemplateBinding Property="OnContent" Converter="{x:Static ObjectConverters.IsNull}" />
<TemplateBinding Property="OffContent" Converter="{x:Static ObjectConverters.IsNull}" />
</MultiBinding>
</ContentPresenter.IsVisible>
</ContentPresenter>
</Panel>
</Border>
</ControlTemplate>
</Setter>
<Style Selector="^:pressed">
<Setter Property="RenderTransform" Value="scale(0.98)" />
</Style>
<Style Selector="^ /template/ Border#Background">
<Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush}" />
<Setter Property="Background" Value="{TemplateBinding Background}" />
</Style>
<Style Selector="^:pointerover /template/ Border#Background">
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
</Style>
<Style Selector="^:pressed /template/ Border#Background">
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
</Style>
<Style Selector="^:disabled /template/ Border#Background">
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
<!-- <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" /> -->
</Style>
<Style Selector="^.Large">
<Setter Property="MinHeight" Value="{DynamicResource ButtonLargeHeight}" />
<Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
</Style>
<Style Selector="^.Small">
<Setter Property="MinHeight" Value="{DynamicResource ButtonSmallHeight}" />
<Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
</Style>
<Style Selector="^ /template/ Border#Background">
<Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderlessBorderBrush}" />
<Setter Property="Background" Value="{DynamicResource ButtonBorderlessBackground}" />
</Style>
<Style Selector="^:disabled /template/ Border#Background">
<Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderlessBorderBrush}" />
<Setter Property="Background" Value="{DynamicResource ButtonBorderlessBackground}" />
<!-- <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" /> -->
</Style>
</ControlTheme>
</ResourceDictionary> </ResourceDictionary>

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

@ -59,7 +59,7 @@
Left="True" /> Left="True" />
<ControlTheme x:Key="ToggleButtonTreeViewItemIconButton" TargetType="ToggleButton"> <ControlTheme x:Key="ToggleButtonTreeViewItemIconButton" TargetType="ToggleButton">
<Setter Property="Margin" Value="0" /> <Setter Property="Margin" Value="0" />
<Setter Property="Cursor" Value="Hand" /> <Setter Property="ToggleButton.Cursor" Value="Hand" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="ToggleButton"> <ControlTemplate TargetType="ToggleButton">
<Border <Border

14
src/Semi.Avalonia/Converters/ItemConverter.cs
View File

@ -1,14 +0,0 @@
using System.Collections;
using System.Linq;
using Avalonia.Data.Converters;
namespace Semi.Avalonia.Converters;
public static class ItemConverter
{
public static readonly IValueConverter ItemVisibleConverter =
new FuncValueConverter<int?, bool>(count => count is > 1);
public static readonly IValueConverter ItemToObjectConverter =
new FuncValueConverter<int?, IEnumerable>(count => Enumerable.Repeat(new object(), count ?? 0));
}

26
src/Semi.Avalonia/Converters/ItemToObjectConverter.cs Normal file
View File

@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using Avalonia.Collections;
using Avalonia.Controls;
using Avalonia.Data.Converters;
namespace Semi.Avalonia.Converters;
public class ItemToObjectConverter: IValueConverter
{
public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
{
if (value is int i)
{
return Enumerable.Repeat(new object(), i).ToList();
}
return new List<object>();
}
public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}

2
src/Semi.Avalonia/Locale/uk-ua.axaml → src/Semi.Avalonia/Locale/uk-uk.axaml
View File

@ -1,5 +1,5 @@
<ResourceDictionary <ResourceDictionary
x:Class="Semi.Avalonia.Locale.uk_ua" x:Class="Semi.Avalonia.Locale.uk_uk"
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">
<!-- DatePicker --> <!-- DatePicker -->

Some files were not shown because too many files have changed in this diff Show More