Compare commits
No commits in common. "main" and "v11.2.1" have entirely different histories.
@ -68,7 +68,7 @@ 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.1 | 11.2.1 |
|
||||||
| 11.2.0 | 11.2.0 |
|
| 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 |
|
||||||
|
|||||||
@ -68,7 +68,7 @@ dotnet add package Semi.Avalonia.TreeDataGrid
|
|||||||
|
|
||||||
| Semi Design Version | Avalonia Version |
|
| Semi Design Version | Avalonia Version |
|
||||||
|:--------------------|:-----------------|
|
|:--------------------|:-----------------|
|
||||||
| 11.2.1 | >=11.2.1 |
|
| 11.2.1 | 11.2.1 |
|
||||||
| 11.2.0 | 11.2.0 |
|
| 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 |
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<Project>
|
<Project>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<AvaloniaVersion>11.2.2</AvaloniaVersion>
|
<AvaloniaVersion>11.2.1</AvaloniaVersion>
|
||||||
<CommunityToolkitVersion>8.3.2</CommunityToolkitVersion>
|
<CommunityToolkitVersion>8.3.2</CommunityToolkitVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@ -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>
|
||||||
|
|||||||
@ -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" />
|
||||||
|
|||||||
@ -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>
|
||||||
@ -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();
|
||||||
}
|
}
|
||||||
@ -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.2.1";
|
||||||
|
|
||||||
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.2.1";
|
||||||
|
|
||||||
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.2.1";
|
||||||
|
|
||||||
public string DataGridStyle { get; set; } =
|
public string DataGridStyle { get; set; } =
|
||||||
"""
|
"""
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
<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" />
|
||||||
@ -34,11 +34,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
|
||||||
|
|||||||
@ -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>
|
||||||
|
|||||||
@ -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>
|
||||||
|
|||||||
@ -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>
|
||||||
@ -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
26
demo/Semi.Avalonia.Demo/Themes/ToggleButton.axaml
Normal 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>
|
||||||
@ -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>
|
|
||||||
@ -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>
|
||||||
|
|||||||
@ -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; } =
|
||||||
public ICommand? Command { get; set; }
|
[
|
||||||
public object? CommandParameter { get; set; }
|
new("Default", ThemeVariant.Default),
|
||||||
public IList<MenuItemViewModel>? Items { get; set; }
|
new("Light", ThemeVariant.Light),
|
||||||
|
new("Dark", ThemeVariant.Dark),
|
||||||
|
new("Aquatic", SemiTheme.Aquatic),
|
||||||
|
new("Desert", SemiTheme.Desert),
|
||||||
|
new("Dust", SemiTheme.Dust),
|
||||||
|
new("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;
|
||||||
}
|
}
|
||||||
@ -3,7 +3,7 @@
|
|||||||
<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.1</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>
|
||||||
|
|||||||
@ -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.1</PackageReleaseNotes>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
|
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
|
||||||
|
|||||||
@ -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.1</PackageReleaseNotes>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
|
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
|
||||||
|
|||||||
@ -27,25 +27,28 @@
|
|||||||
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
|
<Border
|
||||||
Name="PART_SelectingItemsControl"
|
CornerRadius="{DynamicResource AutoCompleteBoxPopupCornerRadius}"
|
||||||
Foreground="{TemplateBinding Foreground}"
|
ClipToBounds="True">
|
||||||
ItemTemplate="{TemplateBinding ItemTemplate}"
|
<ListBox
|
||||||
ScrollViewer.HorizontalScrollBarVisibility="Auto"
|
Name="PART_SelectingItemsControl"
|
||||||
ScrollViewer.VerticalScrollBarVisibility="Auto" />
|
Foreground="{TemplateBinding Foreground}"
|
||||||
|
ItemTemplate="{TemplateBinding ItemTemplate}"
|
||||||
|
ScrollViewer.HorizontalScrollBarVisibility="Auto"
|
||||||
|
ScrollViewer.VerticalScrollBarVisibility="Auto" />
|
||||||
|
</Border>
|
||||||
</Border>
|
</Border>
|
||||||
</Popup>
|
</Popup>
|
||||||
</Panel>
|
</Panel>
|
||||||
@ -66,25 +69,28 @@
|
|||||||
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}">
|
||||||
|
<Border
|
||||||
|
CornerRadius="{DynamicResource AutoCompleteBoxPopupCornerRadius}"
|
||||||
|
ClipToBounds="True">
|
||||||
<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>
|
</Border>
|
||||||
</Popup>
|
</Popup>
|
||||||
</Panel>
|
</Panel>
|
||||||
|
|||||||
@ -272,20 +272,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">
|
||||||
|
|||||||
@ -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>
|
||||||
|
|||||||
@ -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
|
||||||
|
|||||||
@ -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}" />
|
||||||
@ -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>
|
||||||
|
|||||||
@ -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}" />
|
||||||
@ -49,20 +46,23 @@
|
|||||||
<Button Name="PART_FullScreenButton" Theme="{StaticResource CaptionButton}">
|
<Button 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 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 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>
|
||||||
@ -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>
|
||||||
|
|||||||
@ -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="Cursor" Value="Hand" />
|
<Setter Property="Cursor" Value="Hand" />
|
||||||
|
<Setter Property="Foreground" Value="{DynamicResource CarouselIndicatorForeground}" />
|
||||||
<Setter Property="Template">
|
<Setter Property="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="Cursor" Value="Hand" />
|
||||||
<Setter Property="Margin" Value="2 0"/>
|
<Setter Property="Background" Value="{DynamicResource CarouselIndicatorForeground}" />
|
||||||
<Setter Property="Template">
|
<Setter Property="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="Cursor" Value="Hand" />
|
||||||
TargetType="ListBoxItem">
|
<Setter Property="Background" Value="{DynamicResource CarouselIndicatorForeground}" />
|
||||||
<Setter Property="Width" Value="{DynamicResource CarouselIndicatorColumnarWidth}"/>
|
|
||||||
<Setter Property="Height" Value="{DynamicResource CarouselIndicatorColumnarSelectedHeight}"/>
|
|
||||||
<Setter Property="Margin" Value="2 0"/>
|
|
||||||
<Setter Property="Template">
|
<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="Height" Value="32" />
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource CarouselButtonForeground}" />
|
|
||||||
<Setter Property="Cursor" Value="Hand" />
|
<Setter Property="Cursor" Value="Hand" />
|
||||||
|
<Setter Property="Foreground" Value="{DynamicResource CarouselButtonForeground}" />
|
||||||
<Setter Property="Template">
|
<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}" />
|
||||||
|
|||||||
@ -47,7 +47,6 @@
|
|||||||
UseLayoutRounding="False" />
|
UseLayoutRounding="False" />
|
||||||
<PathIcon
|
<PathIcon
|
||||||
Name="CheckGlyph"
|
Name="CheckGlyph"
|
||||||
Theme="{DynamicResource InnerPathIcon}"
|
|
||||||
Width="{DynamicResource CheckBoxBoxGlyphWidth}"
|
Width="{DynamicResource CheckBoxBoxGlyphWidth}"
|
||||||
Height="{DynamicResource CheckBoxBoxGlyphHeight}"
|
Height="{DynamicResource CheckBoxBoxGlyphHeight}"
|
||||||
Foreground="{DynamicResource CheckBoxGlyphFill}" />
|
Foreground="{DynamicResource CheckBoxGlyphFill}" />
|
||||||
@ -218,7 +217,6 @@
|
|||||||
UseLayoutRounding="False" />
|
UseLayoutRounding="False" />
|
||||||
<PathIcon
|
<PathIcon
|
||||||
Name="CheckGlyph"
|
Name="CheckGlyph"
|
||||||
Theme="{DynamicResource InnerPathIcon}"
|
|
||||||
Width="{DynamicResource CheckBoxBoxGlyphWidth}"
|
Width="{DynamicResource CheckBoxBoxGlyphWidth}"
|
||||||
Height="{DynamicResource CheckBoxBoxGlyphHeight}"
|
Height="{DynamicResource CheckBoxBoxGlyphHeight}"
|
||||||
Foreground="{DynamicResource CheckBoxGlyphFill}" />
|
Foreground="{DynamicResource CheckBoxGlyphFill}" />
|
||||||
@ -370,7 +368,6 @@
|
|||||||
UseLayoutRounding="False" />
|
UseLayoutRounding="False" />
|
||||||
<PathIcon
|
<PathIcon
|
||||||
Name="CheckGlyph"
|
Name="CheckGlyph"
|
||||||
Theme="{DynamicResource InnerPathIcon}"
|
|
||||||
Width="{DynamicResource CheckBoxBoxGlyphWidth}"
|
Width="{DynamicResource CheckBoxBoxGlyphWidth}"
|
||||||
Height="{DynamicResource CheckBoxBoxGlyphHeight}"
|
Height="{DynamicResource CheckBoxBoxGlyphHeight}"
|
||||||
Foreground="{DynamicResource CheckBoxGlyphFill}" />
|
Foreground="{DynamicResource CheckBoxGlyphFill}" />
|
||||||
|
|||||||
@ -76,22 +76,23 @@
|
|||||||
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="{DynamicResource ComboBoxClearButtonMargin}"
|
||||||
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" />
|
IsVisible="False"
|
||||||
|
Theme="{DynamicResource InnerIconButton}" />
|
||||||
|
|
||||||
<PathIcon
|
<PathIcon
|
||||||
Name="DropDownGlyph"
|
Name="DropDownGlyph"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Theme="{DynamicResource InnerPathIcon}"
|
|
||||||
Width="{DynamicResource ComboBoxIconWidth}"
|
Width="{DynamicResource ComboBoxIconWidth}"
|
||||||
|
Height="{DynamicResource ComboBoxIconHeight}"
|
||||||
|
Margin="{DynamicResource ComboBoxIconMargin}"
|
||||||
Data="{DynamicResource ComboBoxIcon}"
|
Data="{DynamicResource ComboBoxIcon}"
|
||||||
Foreground="{DynamicResource ComboBoxIconDefaultForeground}"
|
Foreground="{DynamicResource ComboBoxIconDefaultForeground}"
|
||||||
IsHitTestVisible="False"
|
IsHitTestVisible="False"
|
||||||
@ -100,7 +101,9 @@
|
|||||||
<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}"
|
||||||
@ -109,22 +112,24 @@
|
|||||||
<Border
|
<Border
|
||||||
Name="PopupBorder"
|
Name="PopupBorder"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
|
|
||||||
Margin="{DynamicResource ComboBoxPopupBorderMargin}"
|
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}">
|
CornerRadius="{DynamicResource ComboBoxPopupBoxCornerRadius}">
|
||||||
<ScrollViewer
|
<Border
|
||||||
HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
|
CornerRadius="{DynamicResource ComboBoxPopupBoxCornerRadius}"
|
||||||
IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
|
ClipToBounds="True">
|
||||||
VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
|
<ScrollViewer
|
||||||
<ItemsPresenter
|
HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
|
||||||
Name="PART_ItemsPresenter"
|
IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
|
||||||
ItemsPanel="{TemplateBinding ItemsPanel}" />
|
VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
|
||||||
</ScrollViewer>
|
<ItemsPresenter
|
||||||
|
Name="PART_ItemsPresenter"
|
||||||
|
ItemsPanel="{TemplateBinding ItemsPanel}" />
|
||||||
|
</ScrollViewer>
|
||||||
|
</Border>
|
||||||
</Border>
|
</Border>
|
||||||
</Popup>
|
</Popup>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@ -71,12 +71,14 @@
|
|||||||
Name="PART_FirstSpacer"
|
Name="PART_FirstSpacer"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Width="1"
|
Width="1"
|
||||||
|
Margin="0,4"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
|
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
|
||||||
<Rectangle
|
<Rectangle
|
||||||
Name="PART_SecondSpacer"
|
Name="PART_SecondSpacer"
|
||||||
Grid.Column="3"
|
Grid.Column="3"
|
||||||
Width="1"
|
Width="1"
|
||||||
|
Margin="0,4"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
|
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
@ -105,6 +107,7 @@
|
|||||||
Grid.Column="2"
|
Grid.Column="2"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
|
FontSize="16"
|
||||||
Theme="{StaticResource DateTimePickerButton}">
|
Theme="{StaticResource DateTimePickerButton}">
|
||||||
<PathIcon
|
<PathIcon
|
||||||
Width="12"
|
Width="12"
|
||||||
@ -219,7 +222,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 +242,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>
|
||||||
|
|||||||
@ -43,7 +43,8 @@
|
|||||||
<PathIcon
|
<PathIcon
|
||||||
Name="DropDownGlyph"
|
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"
|
||||||
|
|||||||
@ -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" />
|
||||||
|
|||||||
@ -29,7 +29,6 @@
|
|||||||
<DockPanel>
|
<DockPanel>
|
||||||
<PathIcon
|
<PathIcon
|
||||||
Name="PART_LinkGlyph"
|
Name="PART_LinkGlyph"
|
||||||
Theme="{DynamicResource InnerPathIcon}"
|
|
||||||
Margin="{DynamicResource HyperlinkButtonLinkGlyphMargin}"
|
Margin="{DynamicResource HyperlinkButtonLinkGlyphMargin}"
|
||||||
IsVisible="False"
|
IsVisible="False"
|
||||||
Data="{DynamicResource HyperlinkButtonLinkGlyph}"
|
Data="{DynamicResource HyperlinkButtonLinkGlyph}"
|
||||||
@ -83,7 +82,7 @@
|
|||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^.Underline">
|
<Style Selector="^.Underline">
|
||||||
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter:pointerover">
|
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
|
||||||
<Setter Property="TextBlock.TextDecorations" Value="Underline" />
|
<Setter Property="TextBlock.TextDecorations" Value="Underline" />
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
|
|||||||
@ -572,7 +572,6 @@
|
|||||||
UseLayoutRounding="False" />
|
UseLayoutRounding="False" />
|
||||||
<PathIcon
|
<PathIcon
|
||||||
Name="CheckGlyph"
|
Name="CheckGlyph"
|
||||||
Theme="{DynamicResource InnerPathIcon}"
|
|
||||||
Width="{DynamicResource CheckBoxBoxGlyphWidth}"
|
Width="{DynamicResource CheckBoxBoxGlyphWidth}"
|
||||||
Height="{DynamicResource CheckBoxBoxGlyphHeight}"
|
Height="{DynamicResource CheckBoxBoxGlyphHeight}"
|
||||||
Foreground="{DynamicResource CheckBoxGlyphFill}" />
|
Foreground="{DynamicResource CheckBoxGlyphFill}" />
|
||||||
@ -751,7 +750,6 @@
|
|||||||
UseLayoutRounding="False" />
|
UseLayoutRounding="False" />
|
||||||
<PathIcon
|
<PathIcon
|
||||||
Name="CheckGlyph"
|
Name="CheckGlyph"
|
||||||
Theme="{DynamicResource InnerPathIcon}"
|
|
||||||
Width="{DynamicResource CheckBoxBoxGlyphWidth}"
|
Width="{DynamicResource CheckBoxBoxGlyphWidth}"
|
||||||
Height="{DynamicResource CheckBoxBoxGlyphHeight}"
|
Height="{DynamicResource CheckBoxBoxGlyphHeight}"
|
||||||
Foreground="{DynamicResource CheckBoxGlyphFill}" />
|
Foreground="{DynamicResource CheckBoxGlyphFill}" />
|
||||||
|
|||||||
@ -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}" />
|
||||||
@ -57,7 +58,8 @@
|
|||||||
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>
|
||||||
@ -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
|
||||||
|
|||||||
@ -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}" />
|
||||||
@ -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>
|
||||||
|
|||||||
@ -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}"
|
||||||
|
|||||||
@ -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>
|
|
||||||
|
|||||||
@ -91,7 +91,7 @@
|
|||||||
Width="{DynamicResource SplitButtonSeparatorWidth}"
|
Width="{DynamicResource SplitButtonSeparatorWidth}"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
DockPanel.Dock="Left"
|
DockPanel.Dock="Left"
|
||||||
Fill="Transparent"
|
Fill="{TemplateBinding BorderBrush}"
|
||||||
StrokeThickness="0" />
|
StrokeThickness="0" />
|
||||||
<Button
|
<Button
|
||||||
Name="PART_SecondaryButton"
|
Name="PART_SecondaryButton"
|
||||||
@ -103,7 +103,8 @@
|
|||||||
CornerRadius="0"
|
CornerRadius="0"
|
||||||
Theme="{DynamicResource SemiSplitButtonElement}">
|
Theme="{DynamicResource SemiSplitButtonElement}">
|
||||||
<PathIcon
|
<PathIcon
|
||||||
Theme="{DynamicResource InnerPathIcon}"
|
Width="12"
|
||||||
|
Height="12"
|
||||||
Data="{DynamicResource SplitButtonIconGlyph}"
|
Data="{DynamicResource SplitButtonIconGlyph}"
|
||||||
Foreground="{Binding $parent[Button].Foreground}" />
|
Foreground="{Binding $parent[Button].Foreground}" />
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
@ -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="Height" Value="16"/>
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonInputInnerForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonInputInnerForeground}" />
|
||||||
<!-- Background must be transparent or hit test will fail -->
|
|
||||||
<Setter Property="Background" Value="Transparent" />
|
|
||||||
<Setter Property="Cursor" Value="Hand" />
|
<Setter Property="Cursor" Value="Hand" />
|
||||||
<Setter Property="Template">
|
<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>
|
||||||
|
|||||||
@ -86,18 +86,21 @@
|
|||||||
Name="PART_FirstSpacer"
|
Name="PART_FirstSpacer"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Width="1"
|
Width="1"
|
||||||
|
Margin="0,4"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
|
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
|
||||||
<Rectangle
|
<Rectangle
|
||||||
Name="PART_SecondSpacer"
|
Name="PART_SecondSpacer"
|
||||||
Grid.Column="3"
|
Grid.Column="3"
|
||||||
Width="1"
|
Width="1"
|
||||||
|
Margin="0,4"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
|
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
|
||||||
<Rectangle
|
<Rectangle
|
||||||
Name="PART_ThirdSpacer"
|
Name="PART_ThirdSpacer"
|
||||||
Grid.Column="5"
|
Grid.Column="5"
|
||||||
Width="1"
|
Width="1"
|
||||||
|
Margin="0,4"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
|
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
@ -277,7 +280,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 +303,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>
|
||||||
|
|||||||
@ -3,45 +3,22 @@
|
|||||||
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 Theme="{DynamicResource AdornerLayerBorder}"
|
||||||
CornerRadius="{DynamicResource ToggleSwitchIndicatorCornerRadius}" />
|
CornerRadius="{DynamicResource ToggleSwitchIndicatorCornerRadius}"/>
|
||||||
</FocusAdornerTemplate>
|
</FocusAdornerTemplate>
|
||||||
</Setter>
|
</Setter>
|
||||||
<Setter Property="KnobTransitions">
|
<Setter Property="KnobTransitions">
|
||||||
@ -55,7 +32,9 @@
|
|||||||
<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"
|
Name="PART_ContentPresenter"
|
||||||
@ -74,10 +53,9 @@
|
|||||||
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="{DynamicResource ToggleSwitchIndicatorCornerRadius}">
|
||||||
<Border.Transitions>
|
<Border.Transitions>
|
||||||
<Transitions>
|
<Transitions>
|
||||||
<BrushTransition Property="Background" Duration="0:0:0.2" />
|
<BrushTransition Property="Background" Duration="0:0:0.2" />
|
||||||
@ -88,7 +66,7 @@
|
|||||||
Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
|
Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
|
||||||
Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
|
Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
|
||||||
HorizontalAlignment="Left">
|
HorizontalAlignment="Left">
|
||||||
<Panel
|
<Grid
|
||||||
Name="PART_MovingKnobs"
|
Name="PART_MovingKnobs"
|
||||||
Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
|
Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
|
||||||
Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
|
Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
|
||||||
@ -101,7 +79,7 @@
|
|||||||
<Arc
|
<Arc
|
||||||
Name="SwitchKnobLoadingIndicator"
|
Name="SwitchKnobLoadingIndicator"
|
||||||
IsVisible="False"
|
IsVisible="False"
|
||||||
StrokeThickness="{DynamicResource ToggleSwitchLoadingIndicatorDefaultStrokeThickness}"
|
StrokeThickness="2"
|
||||||
StartAngle="0"
|
StartAngle="0"
|
||||||
SweepAngle="140"
|
SweepAngle="140"
|
||||||
StrokeJoin="Round"
|
StrokeJoin="Round"
|
||||||
@ -129,7 +107,7 @@
|
|||||||
</Style>
|
</Style>
|
||||||
</Arc.Styles>
|
</Arc.Styles>
|
||||||
</Arc>
|
</Arc>
|
||||||
</Panel>
|
</Grid>
|
||||||
</Canvas>
|
</Canvas>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
@ -178,6 +156,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 +200,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 +218,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 +234,69 @@
|
|||||||
</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 Theme="{StaticResource AdornerLayerBorder}" />
|
||||||
|
</FocusAdornerTemplate>
|
||||||
|
</Setter>
|
||||||
|
<Setter Property="Template">
|
||||||
|
<ControlTemplate TargetType="ToggleSwitch">
|
||||||
|
<Border
|
||||||
|
Name="Background"
|
||||||
|
Padding="{TemplateBinding Padding}"
|
||||||
|
Background="{TemplateBinding Background}"
|
||||||
|
CornerRadius="{TemplateBinding CornerRadius}"
|
||||||
|
Cursor="Hand">
|
||||||
|
<Panel>
|
||||||
|
<Panel Name="PART_SwitchKnob" />
|
||||||
|
<Panel Name="PART_MovingKnobs" />
|
||||||
|
<ContentPresenter
|
||||||
|
Name="PART_OnContentPresenter"
|
||||||
|
Margin="{DynamicResource ToggleSwitchOnContentMargin}"
|
||||||
|
Content="{TemplateBinding OnContent}"
|
||||||
|
ContentTemplate="{TemplateBinding OnContentTemplate}" />
|
||||||
|
<ContentPresenter
|
||||||
|
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"
|
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="{DynamicResource ToggleSwitchIndicatorCornerRadius}">
|
||||||
<Border.Transitions>
|
<Border.Transitions>
|
||||||
<Transitions>
|
<Transitions>
|
||||||
<BrushTransition Property="Background" Duration="0:0:0.2" />
|
<BrushTransition Property="Background" Duration="0:0:0.2" />
|
||||||
@ -290,7 +311,7 @@
|
|||||||
Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
|
Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
|
||||||
Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
|
Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
|
||||||
HorizontalAlignment="Left">
|
HorizontalAlignment="Left">
|
||||||
<Panel
|
<Grid
|
||||||
Name="PART_MovingKnobs"
|
Name="PART_MovingKnobs"
|
||||||
Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
|
Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
|
||||||
Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
|
Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
|
||||||
@ -303,7 +324,7 @@
|
|||||||
<Arc
|
<Arc
|
||||||
Name="SwitchKnobLoadingIndicator"
|
Name="SwitchKnobLoadingIndicator"
|
||||||
IsVisible="False"
|
IsVisible="False"
|
||||||
StrokeThickness="{DynamicResource ToggleSwitchLoadingIndicatorDefaultStrokeThickness}"
|
StrokeThickness="2"
|
||||||
StartAngle="0"
|
StartAngle="0"
|
||||||
SweepAngle="140"
|
SweepAngle="140"
|
||||||
StrokeJoin="Round"
|
StrokeJoin="Round"
|
||||||
@ -331,7 +352,7 @@
|
|||||||
</Style>
|
</Style>
|
||||||
</Arc.Styles>
|
</Arc.Styles>
|
||||||
</Arc>
|
</Arc>
|
||||||
</Panel>
|
</Grid>
|
||||||
</Canvas>
|
</Canvas>
|
||||||
<ContentPresenter
|
<ContentPresenter
|
||||||
Name="PART_OnContentPresenter"
|
Name="PART_OnContentPresenter"
|
||||||
@ -370,105 +391,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>
|
||||||
@ -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
26
src/Semi.Avalonia/Converters/ItemToObjectConverter.cs
Normal 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();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -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 -->
|
||||||
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
namespace Semi.Avalonia.Locale;
|
namespace Semi.Avalonia.Locale;
|
||||||
|
|
||||||
public class uk_ua : ResourceDictionary
|
public class uk_uk : ResourceDictionary
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Title>Semi.Avalonia</Title>
|
<Title>Semi.Avalonia</Title>
|
||||||
<PackageReleaseNotes>Update to Semi.Avalonia 11.2.1.1</PackageReleaseNotes>
|
<PackageReleaseNotes>Update to Avalonia 11.2.1</PackageReleaseNotes>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
|
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
|
||||||
|
|||||||
@ -1,8 +1,9 @@
|
|||||||
<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">
|
||||||
<SolidColorBrush x:Key="CarouselButtonForeground" Opacity="0.5" Color="Black" />
|
<SolidColorBrush x:Key="CarouselButtonForeground" Opacity="0.5" Color="Black" />
|
||||||
<SolidColorBrush x:Key="CarouselButtonPointeroverForeground" Color="Black" />
|
<SolidColorBrush x:Key="CarouselButtonPointeroverForeground" Opacity="0.7" Color="Black" />
|
||||||
|
<SolidColorBrush x:Key="CarouselButtonPressedForeground" Opacity="0.7" Color="Black" />
|
||||||
<SolidColorBrush x:Key="CarouselIndicatorForeground" Opacity="0.5" Color="Black" />
|
<SolidColorBrush x:Key="CarouselIndicatorForeground" Opacity="0.5" Color="Black" />
|
||||||
<SolidColorBrush x:Key="CarouselIndicatorPointeroverForeground" Opacity="0.7" Color="Black" />
|
<SolidColorBrush x:Key="CarouselIndicatorPointeroverForeground" Opacity="0.7" Color="Black" />
|
||||||
<SolidColorBrush x:Key="CarouselIndicatorPressedForeground" Color="Black" />
|
<SolidColorBrush x:Key="CarouselIndicatorPressedForeground" Opacity="0.7" Color="Black" />
|
||||||
<SolidColorBrush x:Key="CarouselIndicatorSelectedForeground" Color="Black" />
|
<SolidColorBrush x:Key="CarouselIndicatorSelectedForeground" Color="Black" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@ -1,8 +1,9 @@
|
|||||||
<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">
|
||||||
<SolidColorBrush x:Key="CarouselButtonForeground" Opacity="0.5" Color="Black" />
|
<SolidColorBrush x:Key="CarouselButtonForeground" Opacity="0.5" Color="Black" />
|
||||||
<SolidColorBrush x:Key="CarouselButtonPointeroverForeground" Color="Black" />
|
<SolidColorBrush x:Key="CarouselButtonPointeroverForeground" Opacity="0.7" Color="Black" />
|
||||||
|
<SolidColorBrush x:Key="CarouselButtonPressedForeground" Opacity="0.7" Color="Black" />
|
||||||
<SolidColorBrush x:Key="CarouselIndicatorForeground" Opacity="0.5" Color="Black" />
|
<SolidColorBrush x:Key="CarouselIndicatorForeground" Opacity="0.5" Color="Black" />
|
||||||
<SolidColorBrush x:Key="CarouselIndicatorPointeroverForeground" Opacity="0.7" Color="Black" />
|
<SolidColorBrush x:Key="CarouselIndicatorPointeroverForeground" Opacity="0.7" Color="Black" />
|
||||||
<SolidColorBrush x:Key="CarouselIndicatorPressedForeground" Color="Black" />
|
<SolidColorBrush x:Key="CarouselIndicatorPressedForeground" Opacity="0.7" Color="Black" />
|
||||||
<SolidColorBrush x:Key="CarouselIndicatorSelectedForeground" Color="Black" />
|
<SolidColorBrush x:Key="CarouselIndicatorSelectedForeground" Color="Black" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@ -20,7 +20,7 @@ public class SemiTheme : Styles
|
|||||||
{ new CultureInfo("zh-cn"), new zh_cn() },
|
{ new CultureInfo("zh-cn"), new zh_cn() },
|
||||||
{ new CultureInfo("en-us"), new en_us() },
|
{ new CultureInfo("en-us"), new en_us() },
|
||||||
{ new CultureInfo("ja-jp"), new ja_jp() },
|
{ new CultureInfo("ja-jp"), new ja_jp() },
|
||||||
{ new CultureInfo("uk-ua"), new uk_ua() },
|
{ new CultureInfo("uk-uk"), new uk_uk() },
|
||||||
{ new CultureInfo("ru-ru"), new ru_ru() },
|
{ new CultureInfo("ru-ru"), new ru_ru() },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +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">
|
||||||
<Thickness x:Key="AutoCompleteBoxPopupBorderThickness">1</Thickness>
|
<Thickness x:Key="AutoCompleteBoxPopupBorderThickness">1</Thickness>
|
||||||
<Thickness x:Key="AutoCompleteBoxPopupMargin">4</Thickness>
|
<Thickness x:Key="AutoCompleteBoxPopupMargin">4</Thickness>
|
||||||
<Thickness x:Key="AutoCompleteBoxPopupPadding">0 4</Thickness>
|
|
||||||
<CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius>
|
<CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius>
|
||||||
<x:Double x:Key="AutoCompleteBoxDefaultHeight">32</x:Double>
|
<x:Double x:Key="AutoCompleteBoxDefaultHeight">32</x:Double>
|
||||||
<x:Double x:Key="AutoCompleteBoxSmallHeight">24</x:Double>
|
<x:Double x:Key="AutoCompleteBoxSmallHeight">24</x:Double>
|
||||||
|
|||||||
@ -1,14 +1,15 @@
|
|||||||
<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">
|
||||||
<StreamGeometry x:Key="CarouselButtonGlyph">M16.2782 4.23933C16.864 4.82511 16.864 5.77486 16.2782 6.36065L10.6213 12.0175L16.2782 17.6744C16.864 18.2601 16.864 19.2099 16.2782 19.7957C15.6924 20.3815 14.7426 20.3815 14.1569 19.7957L7.43934 13.0782C6.85355 12.4924 6.85355 11.5426 7.43934 10.9568L14.1569 4.23933C14.7426 3.65354 15.6924 3.65354 16.2782 4.23933Z</StreamGeometry>
|
<StreamGeometry x:Key="CarouselButtonGlyph">M16.2782 4.23933C16.864 4.82511 16.864 5.77486 16.2782 6.36065L10.6213 12.0175L16.2782 17.6744C16.864 18.2601 16.864 19.2099 16.2782 19.7957C15.6924 20.3815 14.7426 20.3815 14.1569 19.7957L7.43934 13.0782C6.85355 12.4924 6.85355 11.5426 7.43934 10.9568L14.1569 4.23933C14.7426 3.65354 15.6924 3.65354 16.2782 4.23933Z</StreamGeometry>
|
||||||
|
|
||||||
<x:Double x:Key="CarouselIndicatorDotWidth">8</x:Double>
|
<x:Double x:Key="CarouselIndicatorWidth">8</x:Double>
|
||||||
<x:Double x:Key="CarouselIndicatorDotHeight">8</x:Double>
|
<x:Double x:Key="CarouselIndicatorHeight">8</x:Double>
|
||||||
|
|
||||||
|
<x:Double x:Key="CarouselIndicatorLineWidth">78</x:Double>
|
||||||
<x:Double x:Key="CarouselIndicatorLineHeight">4</x:Double>
|
<x:Double x:Key="CarouselIndicatorLineHeight">4</x:Double>
|
||||||
|
|
||||||
<x:Double x:Key="CarouselIndicatorColumnarWidth">4</x:Double>
|
<x:Double x:Key="CarouselIndicatorColumnarWidth">4</x:Double>
|
||||||
<x:Double x:Key="CarouselIndicatorColumnarHeight">12</x:Double>
|
<x:Double x:Key="CarouselIndicatorColumnarHeight">12</x:Double>
|
||||||
<x:Double x:Key="CarouselIndicatorColumnarSelectedHeight">20</x:Double>
|
<x:Double x:Key="CarouselIndicatorColumnarSelectedHeight">20</x:Double>
|
||||||
|
|
||||||
<Thickness x:Key="CarouselButtonMargin">20</Thickness>
|
<Thickness x:Key="CarouselButtonMargin">8</Thickness>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@ -5,8 +5,8 @@
|
|||||||
<Thickness x:Key="CheckBoxBoxMargin">0 2 0 0</Thickness>
|
<Thickness x:Key="CheckBoxBoxMargin">0 2 0 0</Thickness>
|
||||||
<Thickness x:Key="CheckBoxContentMargin">8 0 0 0</Thickness>
|
<Thickness x:Key="CheckBoxContentMargin">8 0 0 0</Thickness>
|
||||||
|
|
||||||
<x:Double x:Key="CheckBoxBoxGlyphWidth">16</x:Double>
|
<x:Double x:Key="CheckBoxBoxGlyphWidth">10</x:Double>
|
||||||
<x:Double x:Key="CheckBoxBoxGlyphHeight">16</x:Double>
|
<x:Double x:Key="CheckBoxBoxGlyphHeight">10</x:Double>
|
||||||
|
|
||||||
<CornerRadius x:Key="CheckBoxBoxCornerRadius">3</CornerRadius>
|
<CornerRadius x:Key="CheckBoxBoxCornerRadius">3</CornerRadius>
|
||||||
<Thickness x:Key="CheckBoxBoxBorderThickness">1</Thickness>
|
<Thickness x:Key="CheckBoxBoxBorderThickness">1</Thickness>
|
||||||
|
|||||||
@ -3,18 +3,20 @@
|
|||||||
<Thickness x:Key="ComboBoxSelectorThickness">1</Thickness>
|
<Thickness x:Key="ComboBoxSelectorThickness">1</Thickness>
|
||||||
|
|
||||||
<Thickness x:Key="ComboBoxItemDefaultPadding">12 8</Thickness>
|
<Thickness x:Key="ComboBoxItemDefaultPadding">12 8</Thickness>
|
||||||
<Thickness x:Key="ComboBoxSelectorDefaultPadding">12 0 0 0</Thickness>
|
<Thickness x:Key="ComboBoxSelectorDefaultPadding">8 0</Thickness>
|
||||||
|
|
||||||
<x:Double x:Key="ComboBoxPopupMaxDropDownHeight">504</x:Double>
|
<x:Double x:Key="ComboBoxPopupMaxDropDownHeight">504</x:Double>
|
||||||
<Thickness x:Key="ComboBoxPopupBorderThickness">1</Thickness>
|
<Thickness x:Key="ComboBoxPopupBorderThickness">1</Thickness>
|
||||||
<CornerRadius x:Key="ComboBoxPopupBoxCornerRadius">6</CornerRadius>
|
<CornerRadius x:Key="ComboBoxPopupBoxCornerRadius">6</CornerRadius>
|
||||||
|
|
||||||
<x:Double x:Key="ComboBoxIconWidth">32</x:Double>
|
<Thickness x:Key="ComboBoxClearButtonMargin">0 0 8 0</Thickness>
|
||||||
|
<Thickness x:Key="ComboBoxIconMargin">0 0 12 0</Thickness>
|
||||||
|
<x:Double x:Key="ComboBoxIconWidth">12</x:Double>
|
||||||
|
<x:Double x:Key="ComboBoxIconHeight">12</x:Double>
|
||||||
<StreamGeometry x:Key="ComboBoxIcon">
|
<StreamGeometry x:Key="ComboBoxIcon">
|
||||||
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
|
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
|
||||||
</StreamGeometry>
|
</StreamGeometry>
|
||||||
<Thickness x:Key="ComboBoxPopupBorderMargin">4</Thickness>
|
<Thickness x:Key="ComboBoxPopupBorderMargin">4</Thickness>
|
||||||
<Thickness x:Key="ComboBoxPopupBorderPadding">0 4</Thickness>
|
|
||||||
|
|
||||||
<x:Double x:Key="ComboBoxDefaultHeight">32</x:Double>
|
<x:Double x:Key="ComboBoxDefaultHeight">32</x:Double>
|
||||||
<x:Double x:Key="ComboBoxSmallHeight">24</x:Double>
|
<x:Double x:Key="ComboBoxSmallHeight">24</x:Double>
|
||||||
|
|||||||
@ -1,10 +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">
|
||||||
<FontWeight x:Key="ExpanderHeaderFontWeight">600</FontWeight>
|
<FontWeight x:Key="ExpanderHeaderFontWeight">600</FontWeight>
|
||||||
<x:Double x:Key="ExpanderIconSize">8</x:Double>
|
<x:Double x:Key="ExpanderIconSize">8</x:Double>
|
||||||
<Thickness x:Key="ExpanderIconMargin">8 0 0 0</Thickness>
|
|
||||||
<StreamGeometry x:Key="ExpanderIcon">
|
|
||||||
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
|
|
||||||
</StreamGeometry>
|
|
||||||
|
|
||||||
<Thickness x:Key="ExpanderHeaderMargin">8 4</Thickness>
|
<Thickness x:Key="ExpanderHeaderMargin">8 4</Thickness>
|
||||||
<Thickness x:Key="ExpanderHeaderPadding">8</Thickness>
|
<Thickness x:Key="ExpanderHeaderPadding">8</Thickness>
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
<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">
|
||||||
<x:Double x:Key="HyperlinkButtonFontSize">14</x:Double>
|
<x:Double x:Key="HyperlinkButtonFontSize">14</x:Double>
|
||||||
<FontWeight x:Key="HyperlinkButtonFontWeight">600</FontWeight>
|
<FontWeight x:Key="HyperlinkButtonFontWeight">600</FontWeight>
|
||||||
<x:Double x:Key="HyperlinkButtonLinkGlyphWidth">16</x:Double>
|
<x:Double x:Key="HyperlinkButtonLinkGlyphWidth">14</x:Double>
|
||||||
<x:Double x:Key="HyperlinkButtonLinkGlyphHeight">16</x:Double>
|
<x:Double x:Key="HyperlinkButtonLinkGlyphHeight">14</x:Double>
|
||||||
<Thickness x:Key="HyperlinkButtonLinkGlyphMargin">0 0 4 0</Thickness>
|
<Thickness x:Key="HyperlinkButtonLinkGlyphMargin">0 0 4 0</Thickness>
|
||||||
|
|
||||||
<StreamGeometry x:Key="HyperlinkButtonLinkGlyph">M 12.9393 2.9393 C 15.182 0.69666 18.818 0.696668 21.0606 2.93931 C 23.3033 5.18195 23.3033 8.81799 21.0606 11.0606 L 18.3925 13.7288 C 18.4631 13.3298 18.5 12.9192 18.5 12.5 C 18.5 11.5751 18.3206 10.6921 17.9947 9.88386 L 18.9393 8.93931 C 20.0104 7.86824 20.0104 6.13169 18.9393 5.06063 C 17.8682 3.98956 16.1317 3.98956 15.0606 5.06062 L 11.0606 9.06063 C 9.98956 10.1317 9.98956 11.8682 11.0606 12.9393 C 11.3265 13.2052 11.6335 13.4051 11.961 13.539 L 9.75848 15.7415 C 9.47 15.5439 9.19556 15.3169 8.9393 15.0606 C 6.69666 12.818 6.69666 9.18195 8.9393 6.93931 L 12.9393 2.9393 Z M 2.9393 12.9393 L 5.60751 10.2711 C 5.53685 10.6701 5.49999 11.0808 5.49999 11.5001 C 5.49999 12.4249 5.67935 13.3079 6.00519 14.1161 L 5.06062 15.0607 C 3.98956 16.1317 3.98956 17.8683 5.06063 18.9393 C 6.13169 20.0104 7.86824 20.0104 8.9393 18.9393 L 12.9393 14.9393 C 14.0104 13.8683 14.0104 12.1317 12.9393 11.0607 C 12.7664 10.8878 12.5762 10.7428 12.3743 10.6258 L 14.5302 8.46985 C 14.7141 8.61357 14.8914 8.77007 15.0606 8.93934 C 17.3033 11.182 17.3033 14.818 15.0606 17.0607 L 11.0606 21.0607 C 8.81798 23.3033 5.18194 23.3033 2.9393 21.0607 C 0.696665 18.818 0.696663 15.182 2.9393 12.9393 Z</StreamGeometry>
|
<StreamGeometry x:Key="HyperlinkButtonLinkGlyph">M 12.9393 2.9393 C 15.182 0.69666 18.818 0.696668 21.0606 2.93931 C 23.3033 5.18195 23.3033 8.81799 21.0606 11.0606 L 18.3925 13.7288 C 18.4631 13.3298 18.5 12.9192 18.5 12.5 C 18.5 11.5751 18.3206 10.6921 17.9947 9.88386 L 18.9393 8.93931 C 20.0104 7.86824 20.0104 6.13169 18.9393 5.06063 C 17.8682 3.98956 16.1317 3.98956 15.0606 5.06062 L 11.0606 9.06063 C 9.98956 10.1317 9.98956 11.8682 11.0606 12.9393 C 11.3265 13.2052 11.6335 13.4051 11.961 13.539 L 9.75848 15.7415 C 9.47 15.5439 9.19556 15.3169 8.9393 15.0606 C 6.69666 12.818 6.69666 9.18195 8.9393 6.93931 L 12.9393 2.9393 Z M 2.9393 12.9393 L 5.60751 10.2711 C 5.53685 10.6701 5.49999 11.0808 5.49999 11.5001 C 5.49999 12.4249 5.67935 13.3079 6.00519 14.1161 L 5.06062 15.0607 C 3.98956 16.1317 3.98956 17.8683 5.06063 18.9393 C 6.13169 20.0104 7.86824 20.0104 8.9393 18.9393 L 12.9393 14.9393 C 14.0104 13.8683 14.0104 12.1317 12.9393 11.0607 C 12.7664 10.8878 12.5762 10.7428 12.3743 10.6258 L 14.5302 8.46985 C 14.7141 8.61357 14.8914 8.77007 15.0606 8.93934 C 17.3033 11.182 17.3033 14.818 15.0606 17.0607 L 11.0606 21.0607 C 8.81798 23.3033 5.18194 23.3033 2.9393 21.0607 C 0.696665 18.818 0.696663 15.182 2.9393 12.9393 Z</StreamGeometry>
|
||||||
|
|||||||
@ -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">
|
||||||
<!-- ListBox -->
|
<!-- ListBox -->
|
||||||
<Thickness x:Key="ListBoxItemDefaultPadding">12 8</Thickness>
|
<Thickness x:Key="ListBoxItemDefaultPadding">12 8</Thickness>
|
||||||
<CornerRadius x:Key="ListBoxItemCornerRadius">0</CornerRadius>
|
<CornerRadius x:Key="ListBoxItemCornerRadius">3</CornerRadius>
|
||||||
|
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<!-- MenuFlyout -->
|
<!-- MenuFlyout -->
|
||||||
<Thickness x:Key="MenuFlyoutBorderThickness">1</Thickness>
|
<Thickness x:Key="MenuFlyoutBorderThickness">1</Thickness>
|
||||||
<Thickness x:Key="MenuFlyoutPadding">0 4</Thickness>
|
<Thickness x:Key="MenuFlyoutPadding">0</Thickness>
|
||||||
<CornerRadius x:Key="MenuFlyoutCornerRadius">6</CornerRadius>
|
<CornerRadius x:Key="MenuFlyoutCornerRadius">6</CornerRadius>
|
||||||
<x:Double x:Key="MenuFlyoutMinHeight">16</x:Double>
|
<x:Double x:Key="MenuFlyoutMinHeight">16</x:Double>
|
||||||
<x:Double x:Key="MenuFlyoutMinWidth">100</x:Double>
|
<x:Double x:Key="MenuFlyoutMinWidth">100</x:Double>
|
||||||
|
|||||||
@ -5,8 +5,8 @@
|
|||||||
<Thickness x:Key="NotificationCardMargin">8</Thickness>
|
<Thickness x:Key="NotificationCardMargin">8</Thickness>
|
||||||
<Thickness x:Key="NotificationCardPadding">20 16 12 16</Thickness>
|
<Thickness x:Key="NotificationCardPadding">20 16 12 16</Thickness>
|
||||||
|
|
||||||
<x:Double x:Key="NotificationCardIconWidth">20</x:Double>
|
<x:Double x:Key="NotificationCardIconWidth">18</x:Double>
|
||||||
<x:Double x:Key="NotificationCardIconHeight">20</x:Double>
|
<x:Double x:Key="NotificationCardIconHeight">18</x:Double>
|
||||||
<Thickness x:Key="NotificationCardIconMargin">0 0 12 0</Thickness>
|
<Thickness x:Key="NotificationCardIconMargin">0 0 12 0</Thickness>
|
||||||
<StreamGeometry x:Key="NotificationCardInformationIconPathData">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 23ZM14 7C14 8.10457 13.1046 9 12 9C10.8954 9 10 8.10457 10 7C10 5.89543 10.8954 5 12 5C13.1046 5 14 5.89543 14 7ZM9 10.75C9 10.3358 9.33579 10 9.75 10H12.5C13.0523 10 13.5 10.4477 13.5 11V16.5H14.25C14.6642 16.5 15 16.8358 15 17.25C15 17.6642 14.6642 18 14.25 18H9.75C9.33579 18 9 17.6642 9 17.25C9 16.8358 9.33579 16.5 9.75 16.5H10.5V11.5H9.75C9.33579 11.5 9 11.1642 9 10.75Z</StreamGeometry>
|
<StreamGeometry x:Key="NotificationCardInformationIconPathData">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 23ZM14 7C14 8.10457 13.1046 9 12 9C10.8954 9 10 8.10457 10 7C10 5.89543 10.8954 5 12 5C13.1046 5 14 5.89543 14 7ZM9 10.75C9 10.3358 9.33579 10 9.75 10H12.5C13.0523 10 13.5 10.4477 13.5 11V16.5H14.25C14.6642 16.5 15 16.8358 15 17.25C15 17.6642 14.6642 18 14.25 18H9.75C9.33579 18 9 17.6642 9 17.25C9 16.8358 9.33579 16.5 9.75 16.5H10.5V11.5H9.75C9.33579 11.5 9 11.1642 9 10.75Z</StreamGeometry>
|
||||||
<StreamGeometry x:Key="NotificationCardSuccessIconPathData">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.8831 9.82235L11.6854 17.4112C11.4029 17.7806 10.965 17.9981 10.5 18C10.035 18.0019 9.59533 17.788 9.30982 17.421L5.81604 13.4209C5.30744 12.767 5.42524 11.8246 6.07916 11.316C6.73308 10.8074 7.67549 10.9252 8.1841 11.5791L10.4838 14.0439L15.5 8C16.0032 7.34193 16.9446 7.21641 17.6027 7.71964C18.2608 8.22287 18.3863 9.16428 17.8831 9.82235Z</StreamGeometry>
|
<StreamGeometry x:Key="NotificationCardSuccessIconPathData">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.8831 9.82235L11.6854 17.4112C11.4029 17.7806 10.965 17.9981 10.5 18C10.035 18.0019 9.59533 17.788 9.30982 17.421L5.81604 13.4209C5.30744 12.767 5.42524 11.8246 6.07916 11.316C6.73308 10.8074 7.67549 10.9252 8.1841 11.5791L10.4838 14.0439L15.5 8C16.0032 7.34193 16.9446 7.21641 17.6027 7.71964C18.2608 8.22287 18.3863 9.16428 17.8831 9.82235Z</StreamGeometry>
|
||||||
|
|||||||
@ -5,18 +5,13 @@
|
|||||||
<x:Double x:Key="ToggleSwitchDefaultWidth">40</x:Double>
|
<x:Double x:Key="ToggleSwitchDefaultWidth">40</x:Double>
|
||||||
<x:Double x:Key="ToggleSwitchSmallWidth">26</x:Double>
|
<x:Double x:Key="ToggleSwitchSmallWidth">26</x:Double>
|
||||||
<x:Double x:Key="ToggleSwitchLargeWidth">54</x:Double>
|
<x:Double x:Key="ToggleSwitchLargeWidth">54</x:Double>
|
||||||
<Thickness x:Key="ToggleSwitchDefaultBorderThickness">1</Thickness>
|
|
||||||
<CornerRadius x:Key="ToggleSwitchDefaultCornerRadius">12</CornerRadius>
|
|
||||||
<CornerRadius x:Key="ToggleSwitchSmallCornerRadius">8</CornerRadius>
|
|
||||||
<CornerRadius x:Key="ToggleSwitchLargeCornerRadius">16</CornerRadius>
|
|
||||||
<CornerRadius x:Key="ToggleSwitchIndicatorCornerRadius">100</CornerRadius>
|
<CornerRadius x:Key="ToggleSwitchIndicatorCornerRadius">100</CornerRadius>
|
||||||
<x:Double x:Key="ToggleSwitchIndicatorDefaultWidth">18</x:Double>
|
<x:Double x:Key="ToggleSwitchIndicatorDefaultWidth">18</x:Double>
|
||||||
<x:Double x:Key="ToggleSwitchIndicatorSmallWidth">12</x:Double>
|
<x:Double x:Key="ToggleSwitchIndicatorSmallWidth">12</x:Double>
|
||||||
<x:Double x:Key="ToggleSwitchIndicatorLargeWidth">24</x:Double>
|
<x:Double x:Key="ToggleSwitchIndicatorLargeWidth">24</x:Double>
|
||||||
<Thickness x:Key="ToggleSwitchIndicatorDefaultMargin">1 0 0 0</Thickness>
|
<Thickness x:Key="ToggleSwitchIndicatorDefaultMargin">2 0 0 0</Thickness>
|
||||||
<Thickness x:Key="ToggleSwitchIndicatorSmallMargin">0</Thickness>
|
<Thickness x:Key="ToggleSwitchIndicatorSmallMargin">1 0 0 0</Thickness>
|
||||||
<Thickness x:Key="ToggleSwitchIndicatorLargeMargin">2 0 0 0</Thickness>
|
<Thickness x:Key="ToggleSwitchIndicatorLargeMargin">3 0 0 0</Thickness>
|
||||||
<x:Double x:Key="ToggleSwitchLoadingIndicatorDefaultStrokeThickness">2</x:Double>
|
|
||||||
<x:Double x:Key="ToggleSwitchLoadingIndicatorSmallStrokeThickness">1</x:Double>
|
<x:Double x:Key="ToggleSwitchLoadingIndicatorSmallStrokeThickness">1</x:Double>
|
||||||
<x:Double x:Key="ToggleSwitchLoadingIndicatorLargeStrokeThickness">3</x:Double>
|
<x:Double x:Key="ToggleSwitchLoadingIndicatorLargeStrokeThickness">3</x:Double>
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user