mirror of
https://gitcode.com/gh_mirrors/se/Semi.Avalonia
synced 2026-04-28 20:23:24 +08:00
Compare commits
32 Commits
v11.1.0-rc
...
v11.0.7.5
| Author | SHA1 | Date | |
|---|---|---|---|
|
2a363edeee | ||
|
|
72ed2d442d | ||
|
|
5a095a9321 | ||
|
|
b0f4777aff | ||
|
|
7347aff7f9 | ||
|
|
e2ca3f31b1 | ||
|
|
d759570259 | ||
|
|
2b37df580f | ||
|
|
d41d1ff9d4 | ||
|
|
c127544bc7 | ||
|
|
a614002ead | ||
|
|
fe5c51599f | ||
|
|
d318975d73 | ||
|
|
504d6a1927 | ||
|
|
253f88d982 | ||
|
|
8005997332 | ||
|
|
ae0375f194 | ||
|
|
28b04705aa | ||
|
|
84a255656b | ||
|
|
11c3109ae1 | ||
|
|
34674599ec | ||
|
|
004067d10b | ||
|
|
afacdf2c56 | ||
|
|
047c9f953e | ||
|
|
ef3d40bc6d | ||
|
|
7bd6c08e94 | ||
|
|
e484dbfd21 | ||
|
|
c2bf03c337 | ||
|
|
7df583b81c | ||
|
|
efc7870554 | ||
|
|
99184b49ee | ||
|
|
6a1d5b2bd1 |
71
README.md
71
README.md
@@ -1,24 +1,16 @@
|
|||||||
# Semi Avalonia
|
# Semi.Avalonia
|
||||||
|
|
||||||
[](https://www.nuget.org/packages/Semi.Avalonia/)
|
[](https://www.nuget.org/packages/Semi.Avalonia/)
|
||||||
[](https://www.nuget.org/packages/Semi.Avalonia/)
|
[](https://www.nuget.org/packages/Semi.Avalonia/)
|
||||||
|
|
||||||
[中文](./README_CN.md)
|
|
||||||
|
|
||||||
Avalonia Theme inspired by Semi Design
|
Avalonia Theme inspired by Semi Design
|
||||||
|
|
||||||
If you are looking for more customized controls, Please try [Ursa](https://github.com/irihitech/Ursa.Avalonia)
|
# How to Use
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## How to Use
|
|
||||||
|
|
||||||
### Installation
|
|
||||||
|
|
||||||
|
## Installation
|
||||||
```bash
|
```bash
|
||||||
dotnet add package Semi.Avalonia
|
dotnet add package Semi.Avalonia
|
||||||
```
|
```
|
||||||
|
|
||||||
Include Semi Design Styles in application:
|
Include Semi Design Styles in application:
|
||||||
|
|
||||||
```xaml
|
```xaml
|
||||||
@@ -27,16 +19,14 @@ Include Semi Design Styles in application:
|
|||||||
</Application.Styles>
|
</Application.Styles>
|
||||||
```
|
```
|
||||||
|
|
||||||
That's all.
|
That's all.
|
||||||
|
|
||||||
ColorPicker, DataGrid and TreeDataGrid are distributed in separated packages. Please install if you need.
|
|
||||||
|
|
||||||
|
ColorPicker, DataGrid and TreeDataGrid are distributed in separated packages. Please install if you need.
|
||||||
```bash
|
```bash
|
||||||
dotnet add package Semi.Avalonia.ColorPicker
|
dotnet add package Semi.Avalonia.ColorPicker
|
||||||
dotnet add package Semi.Avalonia.DataGrid
|
dotnet add package Semi.Avalonia.DataGrid
|
||||||
dotnet add package Semi.Avalonia.TreeDataGrid
|
dotnet add package Semi.Avalonia.TreeDataGrid
|
||||||
```
|
```
|
||||||
|
|
||||||
```xaml
|
```xaml
|
||||||
<Application.Styles>
|
<Application.Styles>
|
||||||
<StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
|
<StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
|
||||||
@@ -45,55 +35,21 @@ dotnet add package Semi.Avalonia.TreeDataGrid
|
|||||||
</Application.Styles>
|
</Application.Styles>
|
||||||
```
|
```
|
||||||
|
|
||||||
If AOT publishing is required, you need to include the rd.xml file in your project:
|
|
||||||
|
|
||||||
```xml
|
|
||||||
<ItemGroup>
|
|
||||||
<RdXmlFile Include="rd.xml"/>
|
|
||||||
</ItemGroup>
|
|
||||||
```
|
|
||||||
|
|
||||||
The contents of the rd.xml file should be as follows:
|
|
||||||
|
|
||||||
```xml
|
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Directives>
|
|
||||||
<!--
|
|
||||||
This file is part of RdXmlLibrary project.
|
|
||||||
Visit https://github.com/kant2002/rdxmllibrary for latest version.
|
|
||||||
If you have modifications specific to this Nuget package,
|
|
||||||
please contribute back.
|
|
||||||
-->
|
|
||||||
<Application>
|
|
||||||
<Assembly Name="Avalonia.Markup.Xaml" Dynamic="Required All"/>
|
|
||||||
<Assembly Name="Semi.Avalonia" Dynamic="Required All"/>
|
|
||||||
<!-- If you don't use these, please don't include them.
|
|
||||||
<Assembly Name="Semi.Avalonia.DataGrid" Dynamic="Required All"/>
|
|
||||||
<Assembly Name="Semi.Avalonia.ColorPicker" Dynamic="Required All"/>
|
|
||||||
-->
|
|
||||||
</Application>
|
|
||||||
</Directives>
|
|
||||||
```
|
|
||||||
|
|
||||||
## Demo
|
## Demo
|
||||||
|
|
||||||
You can always download demo executable to play around with Semi Avalonia Themes.
|
You can always download demo executable to play around with Semi Avalonia Themes.
|
||||||
<https://github.com/irihitech/Semi.Avalonia/releases>
|
https://github.com/irihitech/Semi.Avalonia/releases
|
||||||
|
|
||||||
## Support
|
|
||||||
|
|
||||||
We offer limited free community support for Semi Avalonia and Ursa. If you have any question or suggestion, feel free to raise issues and discussions via GitHub, and you are welcomed to join our group via FeiShu(Lark)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## Version compatibility
|
## Version compatibility
|
||||||
|
|
||||||
| Semi Design Version | Avalonia Version |
|
| Semi Design Version | Avalonia Version |
|
||||||
|:--------------------|:-----------------|
|
|:--------------------|:-----------------|
|
||||||
| 11.1.0-rc | >=11.1.0-rc |
|
| 11.0.7 | 11.0.7 |
|
||||||
| 11.0.7 | >=11.0.7 |
|
|
||||||
| 11.0.1 | <=11.0.6 |
|
| 11.0.1 | <=11.0.6 |
|
||||||
|
|
||||||
|
## TODO
|
||||||
|
* FocusAdorner
|
||||||
|
|
||||||
## Credits
|
## Credits
|
||||||
|
|
||||||
[Semi Design](https://semi.design/)
|
[Semi Design](https://semi.design/)
|
||||||
@@ -106,3 +62,10 @@ We offer limited free community support for Semi Avalonia and Ursa. If you have
|
|||||||
|
|
||||||
[CommunityToolKit](https://github.com/CommunityToolkit/dotnet)
|
[CommunityToolKit](https://github.com/CommunityToolkit/dotnet)
|
||||||
|
|
||||||
|
## Screenshot
|
||||||
|
|
||||||
|
Light Mode
|
||||||
|
|
||||||
|
|
||||||
|
Dark Mode
|
||||||
|
|
||||||
110
README_CN.md
110
README_CN.md
@@ -1,110 +0,0 @@
|
|||||||
# Semi Avalonia
|
|
||||||
|
|
||||||
[](https://www.nuget.org/packages/Semi.Avalonia/)
|
|
||||||
[](https://www.nuget.org/packages/Semi.Avalonia/)
|
|
||||||
|
|
||||||
[English](./README.md)
|
|
||||||
|
|
||||||
Avalonia UI 控件主题，灵感来自 Semi Design
|
|
||||||
|
|
||||||
如果您希望使用更多的拓展控件，欢迎尝试 [Ursa](https://github.com/irihitech/Ursa.Avalonia)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## 如何使用
|
|
||||||
|
|
||||||
### 安装
|
|
||||||
|
|
||||||
```bash
|
|
||||||
dotnet add package Semi.Avalonia
|
|
||||||
```
|
|
||||||
|
|
||||||
在样式中引用 Semi 主题：
|
|
||||||
|
|
||||||
```xaml
|
|
||||||
<Application.Styles>
|
|
||||||
<StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" />
|
|
||||||
</Application.Styles>
|
|
||||||
```
|
|
||||||
|
|
||||||
这样就可以了。
|
|
||||||
|
|
||||||
ColorPicker， DataGrid 和 TreeDataGrid 的样式单独分发，如果需要请安装并引用。
|
|
||||||
|
|
||||||
```bash
|
|
||||||
dotnet add package Semi.Avalonia.ColorPicker
|
|
||||||
dotnet add package Semi.Avalonia.DataGrid
|
|
||||||
dotnet add package Semi.Avalonia.TreeDataGrid
|
|
||||||
```
|
|
||||||
|
|
||||||
```xaml
|
|
||||||
<Application.Styles>
|
|
||||||
<StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
|
|
||||||
<StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
|
|
||||||
<StyleInclude Source="avares://Semi.Avalonia.TreeDataGrid/Index.axaml" />
|
|
||||||
</Application.Styles>
|
|
||||||
```
|
|
||||||
|
|
||||||
如果需要进行 AOT 发布，则需要在项目中包含 rd.xml 文件：
|
|
||||||
|
|
||||||
```xml
|
|
||||||
<ItemGroup>
|
|
||||||
<RdXmlFile Include="rd.xml"/>
|
|
||||||
</ItemGroup>
|
|
||||||
```
|
|
||||||
|
|
||||||
rd.xml 文件的内容如下：
|
|
||||||
|
|
||||||
```xml
|
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Directives>
|
|
||||||
<!--
|
|
||||||
This file is part of RdXmlLibrary project.
|
|
||||||
Visit https://github.com/kant2002/rdxmllibrary for latest version.
|
|
||||||
If you have modifications specific to this Nuget package,
|
|
||||||
please contribute back.
|
|
||||||
-->
|
|
||||||
<Application>
|
|
||||||
<Assembly Name="Avalonia.Markup.Xaml" Dynamic="Required All"/>
|
|
||||||
<Assembly Name="Semi.Avalonia" Dynamic="Required All"/>
|
|
||||||
<!-- If you don't use these, please don't include them.
|
|
||||||
<Assembly Name="Semi.Avalonia.DataGrid" Dynamic="Required All"/>
|
|
||||||
<Assembly Name="Semi.Avalonia.ColorPicker" Dynamic="Required All"/>
|
|
||||||
-->
|
|
||||||
</Application>
|
|
||||||
</Directives>
|
|
||||||
```
|
|
||||||
|
|
||||||
## 示例
|
|
||||||
|
|
||||||
您可以从 Semi Avalonia 的 release 页下载并试用 Semi Avalonia 的展示应用。
|
|
||||||
|
|
||||||
<https://github.com/irihitech/Semi.Avalonia/releases>
|
|
||||||
|
|
||||||
## 社区支持
|
|
||||||
|
|
||||||
我们提供有限度的免费社区支持，如果您有任何问题或建议，除了在GitHub上提交issue或发起讨论，也欢迎加入我们的飞书交流群：
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## 版本兼容性
|
|
||||||
|
|
||||||
| Semi Design Version | Avalonia Version |
|
|
||||||
|:--------------------|:-----------------|
|
|
||||||
| 11.1.0-rc | >=11.1.0-rc |
|
|
||||||
| 11.0.7 | >=11.0.7 |
|
|
||||||
| 11.0.1 | <=11.0.6 |
|
|
||||||
|
|
||||||
## 致谢
|
|
||||||
|
|
||||||
[Semi Design](https://semi.design/)
|
|
||||||
|
|
||||||
[Avalonia](https://github.com/AvaloniaUI/Avalonia)
|
|
||||||
|
|
||||||
[FluentAvalonia](https://github.com/amwx/FluentAvalonia)
|
|
||||||
|
|
||||||
[Material Design Icons](https://pictogrammers.com/library/mdi/)
|
|
||||||
|
|
||||||
[CommunityToolKit](https://github.com/CommunityToolkit/dotnet)
|
|
||||||
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
<Project>
|
<Project>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<AvaloniaVersion>11.1.0-rc2</AvaloniaVersion>
|
<AvaloniaVersion>11.0.7</AvaloniaVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -15,11 +15,11 @@
|
|||||||
<Import Project="../Directory.Build.props" />
|
<Import Project="../Directory.Build.props" />
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Avalonia.Android" Version="$(AvaloniaVersion)" />
|
<PackageReference Include="Avalonia.Android" Version="$(AvaloniaVersion)" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\Semi.Avalonia.Demo\Semi.Avalonia.Demo.csproj" />
|
<ProjectReference Include="..\Semi.Avalonia.Demo\Semi.Avalonia.Demo.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
@@ -4,9 +4,10 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:semi="https://irihi.tech/semi">
|
xmlns:semi="https://irihi.tech/semi">
|
||||||
<Application.Styles>
|
<Application.Styles>
|
||||||
<!-- You can still reference in old way. -->
|
<!-- You can still reference in old way.
|
||||||
<!-- <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" /> -->
|
<StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" />
|
||||||
<semi:SemiTheme Locale="zh-CN" />
|
-->
|
||||||
|
<semi:SemiTheme Locale="zh-CN"/>
|
||||||
<StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
|
<StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
|
||||||
<StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
|
<StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
|
||||||
</Application.Styles>
|
</Application.Styles>
|
||||||
|
|||||||
@@ -45,7 +45,7 @@
|
|||||||
<DataGridTextColumn
|
<DataGridTextColumn
|
||||||
Width="*"
|
Width="*"
|
||||||
x:DataType="viewModels:ColorItemViewModel"
|
x:DataType="viewModels:ColorItemViewModel"
|
||||||
Binding="{Binding ColorDisplayName}"
|
Binding="{ReflectionBinding ColorDisplayName}"
|
||||||
CanUserSort="False"
|
CanUserSort="False"
|
||||||
Header="Name" />
|
Header="Name" />
|
||||||
<DataGridTemplateColumn Width="100" Header="Hex">
|
<DataGridTemplateColumn Width="100" Header="Hex">
|
||||||
@@ -99,7 +99,7 @@
|
|||||||
<DataGridTextColumn
|
<DataGridTextColumn
|
||||||
Width="*"
|
Width="*"
|
||||||
x:DataType="viewModels:ColorItemViewModel"
|
x:DataType="viewModels:ColorItemViewModel"
|
||||||
Binding="{Binding ColorDisplayName}"
|
Binding="{ReflectionBinding ColorDisplayName}"
|
||||||
CanUserSort="False"
|
CanUserSort="False"
|
||||||
Header="Name" />
|
Header="Name" />
|
||||||
<DataGridTemplateColumn Width="100" Header="Hex">
|
<DataGridTemplateColumn Width="100" Header="Hex">
|
||||||
|
|||||||
@@ -17,72 +17,58 @@
|
|||||||
<StackPanel.Styles>
|
<StackPanel.Styles>
|
||||||
<Style Selector="AutoCompleteBox">
|
<Style Selector="AutoCompleteBox">
|
||||||
<Setter Property="Width" Value="300" />
|
<Setter Property="Width" Value="300" />
|
||||||
<Setter Property="ItemsSource">
|
|
||||||
<Binding Path="States" />
|
|
||||||
</Setter>
|
|
||||||
<Setter Property="ItemTemplate">
|
|
||||||
<DataTemplate DataType="local:StateData">
|
|
||||||
<TextBlock Text="{Binding Name}" />
|
|
||||||
</DataTemplate>
|
|
||||||
</Setter>
|
|
||||||
</Style>
|
</Style>
|
||||||
</StackPanel.Styles>
|
</StackPanel.Styles>
|
||||||
|
|
||||||
<AutoCompleteBox
|
<AutoCompleteBox
|
||||||
Watermark="Please select a State"
|
ItemsSource="{Binding States}"
|
||||||
ValueMemberBinding="{Binding Name}" />
|
ValueMemberBinding="{Binding Name}"
|
||||||
|
Watermark="Please select a State">
|
||||||
|
<AutoCompleteBox.ItemTemplate>
|
||||||
|
<DataTemplate DataType="local:StateData">
|
||||||
|
<TextBlock Text="{Binding Name}" />
|
||||||
|
</DataTemplate>
|
||||||
|
</AutoCompleteBox.ItemTemplate>
|
||||||
|
</AutoCompleteBox>
|
||||||
<AutoCompleteBox
|
<AutoCompleteBox
|
||||||
Classes="Large"
|
Classes="Large"
|
||||||
ValueMemberBinding="{ReflectionBinding Name}" />
|
ItemsSource="{Binding States}"
|
||||||
|
ValueMemberBinding="{ReflectionBinding Name}">
|
||||||
|
<AutoCompleteBox.ItemTemplate>
|
||||||
|
<DataTemplate DataType="local:StateData">
|
||||||
|
<TextBlock Text="{Binding Name}" />
|
||||||
|
</DataTemplate>
|
||||||
|
</AutoCompleteBox.ItemTemplate>
|
||||||
|
</AutoCompleteBox>
|
||||||
<AutoCompleteBox
|
<AutoCompleteBox
|
||||||
Classes="Small"
|
Classes="Small"
|
||||||
ValueMemberBinding="{ReflectionBinding Name}" />
|
ItemsSource="{Binding States}"
|
||||||
|
ValueMemberBinding="{ReflectionBinding Name}">
|
||||||
|
<AutoCompleteBox.ItemTemplate>
|
||||||
|
<DataTemplate DataType="local:StateData">
|
||||||
|
<TextBlock Text="{Binding Name}" />
|
||||||
|
</DataTemplate>
|
||||||
|
</AutoCompleteBox.ItemTemplate>
|
||||||
|
</AutoCompleteBox>
|
||||||
<AutoCompleteBox
|
<AutoCompleteBox
|
||||||
Classes="Bordered"
|
Classes="Bordered"
|
||||||
ValueMemberBinding="{ReflectionBinding Name}" />
|
ItemsSource="{Binding States}"
|
||||||
|
ValueMemberBinding="{ReflectionBinding Name}">
|
||||||
|
<AutoCompleteBox.ItemTemplate>
|
||||||
|
<DataTemplate DataType="local:StateData">
|
||||||
|
<TextBlock Text="{Binding Name}" />
|
||||||
|
</DataTemplate>
|
||||||
|
</AutoCompleteBox.ItemTemplate>
|
||||||
|
</AutoCompleteBox>
|
||||||
<AutoCompleteBox
|
<AutoCompleteBox
|
||||||
IsEnabled="False"
|
IsEnabled="False"
|
||||||
Watermark="Disabled"
|
ItemsSource="{Binding States}"
|
||||||
ValueMemberBinding="{ReflectionBinding Name}" />
|
ValueMemberBinding="{ReflectionBinding Name}"
|
||||||
<AutoCompleteBox
|
Watermark="Disabled">
|
||||||
InnerLeftContent="https://"
|
<AutoCompleteBox.ItemTemplate>
|
||||||
InnerRightContent=".com"
|
<DataTemplate DataType="local:StateData">
|
||||||
ValueMemberBinding="{ReflectionBinding Name}" />
|
<TextBlock Text="{Binding Name}" />
|
||||||
|
</DataTemplate>
|
||||||
<StackPanel Orientation="Horizontal">
|
</AutoCompleteBox.ItemTemplate>
|
||||||
<AutoCompleteBox
|
</AutoCompleteBox>
|
||||||
Width="100"
|
|
||||||
Classes="Large"
|
|
||||||
Watermark="Large"
|
|
||||||
ValueMemberBinding="{ReflectionBinding Name}" />
|
|
||||||
<AutoCompleteBox
|
|
||||||
Width="100"
|
|
||||||
Watermark="Default"
|
|
||||||
ValueMemberBinding="{ReflectionBinding Name}" />
|
|
||||||
<AutoCompleteBox
|
|
||||||
Width="100"
|
|
||||||
Classes="Small"
|
|
||||||
Watermark="Small"
|
|
||||||
ValueMemberBinding="{ReflectionBinding Name}" />
|
|
||||||
</StackPanel>
|
|
||||||
|
|
||||||
<StackPanel Orientation="Horizontal">
|
|
||||||
<AutoCompleteBox
|
|
||||||
Width="100"
|
|
||||||
IsEnabled="False"
|
|
||||||
Watermark="Disabled"
|
|
||||||
ValueMemberBinding="{ReflectionBinding Name}" />
|
|
||||||
<AutoCompleteBox
|
|
||||||
Width="100"
|
|
||||||
Classes="Bordered"
|
|
||||||
Watermark="Bordered"
|
|
||||||
ValueMemberBinding="{ReflectionBinding Name}" />
|
|
||||||
<AutoCompleteBox
|
|
||||||
Width="100"
|
|
||||||
Classes="Bordered"
|
|
||||||
IsEnabled="False"
|
|
||||||
ValueMemberBinding="{ReflectionBinding Name}" />
|
|
||||||
</StackPanel>
|
|
||||||
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|||||||
@@ -8,22 +8,11 @@
|
|||||||
d:DesignWidth="800"
|
d:DesignWidth="800"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
<StackPanel HorizontalAlignment="Left" Spacing="20">
|
<StackPanel HorizontalAlignment="Left" Spacing="20">
|
||||||
<StackPanel Orientation="Horizontal">
|
<CalendarDatePicker />
|
||||||
<CalendarDatePicker Classes="Large" />
|
|
||||||
<CalendarDatePicker />
|
|
||||||
<CalendarDatePicker Classes="Small" />
|
|
||||||
</StackPanel>
|
|
||||||
|
|
||||||
<StackPanel Orientation="Horizontal">
|
|
||||||
<CalendarDatePicker IsEnabled="False" />
|
|
||||||
<CalendarDatePicker Classes="Bordered" />
|
|
||||||
<CalendarDatePicker Classes="Bordered" IsEnabled="False" />
|
|
||||||
</StackPanel>
|
|
||||||
|
|
||||||
<CalendarDatePicker Width="500" />
|
|
||||||
|
|
||||||
<CalendarDatePicker Classes="ClearButton" Width="200" />
|
<CalendarDatePicker Classes="ClearButton" Width="200" />
|
||||||
|
<CalendarDatePicker Width="500" />
|
||||||
|
<CalendarDatePicker Classes="Large" />
|
||||||
|
<CalendarDatePicker Classes="Small" />
|
||||||
<CalendarDatePicker
|
<CalendarDatePicker
|
||||||
Name="DatePicker2"
|
Name="DatePicker2"
|
||||||
Margin="0,0,0,8"
|
Margin="0,0,0,8"
|
||||||
@@ -34,5 +23,9 @@
|
|||||||
CustomDateFormatString="ddd, MMM d"
|
CustomDateFormatString="ddd, MMM d"
|
||||||
SelectedDateFormat="Custom" />
|
SelectedDateFormat="Custom" />
|
||||||
<CalendarDatePicker Margin="0,0,0,8" Watermark="Watermark" />
|
<CalendarDatePicker Margin="0,0,0,8" Watermark="Watermark" />
|
||||||
|
|
||||||
|
<CalendarDatePicker IsEnabled="False" />
|
||||||
|
<CalendarDatePicker Classes="Bordered" />
|
||||||
|
<CalendarDatePicker Classes="Bordered" IsEnabled="False" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|||||||
@@ -29,12 +29,6 @@
|
|||||||
<colorPicker:SemiColorLightPalette />
|
<colorPicker:SemiColorLightPalette />
|
||||||
</ColorPicker.Palette>
|
</ColorPicker.Palette>
|
||||||
</ColorPicker>
|
</ColorPicker>
|
||||||
|
|
||||||
<ColorPicker ColorSpectrumShape="Box" Theme="{DynamicResource HexColorPicker}">
|
|
||||||
<ColorPicker.Palette>
|
|
||||||
<colorPicker:SemiColorLightPalette />
|
|
||||||
</ColorPicker.Palette>
|
|
||||||
</ColorPicker>
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|||||||
@@ -4,40 +4,71 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:pages="clr-namespace:Semi.Avalonia.Demo.Pages"
|
d:DesignHeight="450"
|
||||||
d:DesignHeight="800"
|
|
||||||
d:DesignWidth="800"
|
d:DesignWidth="800"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
<Design.DataContext>
|
|
||||||
<pages:ComboBoxDemoViewModel />
|
|
||||||
</Design.DataContext>
|
|
||||||
<StackPanel Spacing="20">
|
<StackPanel Spacing="20">
|
||||||
<StackPanel.Styles>
|
<ComboBox Width="150">
|
||||||
<Style Selector="ComboBox">
|
<ComboBoxItem>Ding</ComboBoxItem>
|
||||||
<Setter Property="Width" Value="300" />
|
<ComboBoxItem>Otter</ComboBoxItem>
|
||||||
<Setter Property="ItemsSource" Value="{Binding Items}" />
|
<ComboBoxItem>Husky</ComboBoxItem>
|
||||||
</Style>
|
<ComboBoxItem>Mr. 17</ComboBoxItem>
|
||||||
</StackPanel.Styles>
|
<ComboBoxItem>Cass</ComboBoxItem>
|
||||||
|
</ComboBox>
|
||||||
<ComboBox />
|
<ComboBox Width="150" Classes="ClearButton">
|
||||||
<ComboBox Classes="ClearButton" />
|
<ComboBoxItem>Ding</ComboBoxItem>
|
||||||
<ComboBox PlaceholderText="Please Select" />
|
<ComboBoxItem>Otter</ComboBoxItem>
|
||||||
<ComboBox IsEnabled="False" />
|
<ComboBoxItem>Husky</ComboBoxItem>
|
||||||
<ComboBox Classes="Large" IsEnabled="False" />
|
<ComboBoxItem>Mr. 17</ComboBoxItem>
|
||||||
<ComboBox Classes="Small" />
|
<ComboBoxItem>Cass</ComboBoxItem>
|
||||||
<ComboBox Classes="Bordered" />
|
</ComboBox>
|
||||||
<ComboBox Classes="Bordered" IsEnabled="False" />
|
<ComboBox Width="150" PlaceholderText="Please Select">
|
||||||
|
<ComboBoxItem>Ding</ComboBoxItem>
|
||||||
<StackPanel Orientation="Horizontal">
|
<ComboBoxItem>Otter</ComboBoxItem>
|
||||||
<ComboBox Width="100" Classes="Large" PlaceholderText="Large" />
|
<ComboBoxItem>Husky</ComboBoxItem>
|
||||||
<ComboBox Width="100" PlaceholderText="Default" />
|
<ComboBoxItem>Mr. 17</ComboBoxItem>
|
||||||
<ComboBox Width="100" Classes="Small" PlaceholderText="Small" />
|
<ComboBoxItem>Cass</ComboBoxItem>
|
||||||
</StackPanel>
|
</ComboBox>
|
||||||
|
<ComboBox Width="150" IsEnabled="False">
|
||||||
<StackPanel Orientation="Horizontal">
|
<ComboBoxItem>Ding</ComboBoxItem>
|
||||||
<ComboBox Width="100" IsEnabled="False" PlaceholderText="Disabled" />
|
<ComboBoxItem>Otter</ComboBoxItem>
|
||||||
<ComboBox Width="100" Classes="Bordered" PlaceholderText="Bordered" />
|
<ComboBoxItem>Husky</ComboBoxItem>
|
||||||
<ComboBox Width="100" Classes="Bordered" IsEnabled="False" />
|
<ComboBoxItem>Mr. 17</ComboBoxItem>
|
||||||
</StackPanel>
|
<ComboBoxItem>Cass</ComboBoxItem>
|
||||||
|
</ComboBox>
|
||||||
|
<ComboBox
|
||||||
|
Width="150"
|
||||||
|
Classes="Large"
|
||||||
|
IsEnabled="False">
|
||||||
|
<ComboBoxItem>Ding</ComboBoxItem>
|
||||||
|
<ComboBoxItem>Otter</ComboBoxItem>
|
||||||
|
<ComboBoxItem>Husky</ComboBoxItem>
|
||||||
|
<ComboBoxItem>Mr. 17</ComboBoxItem>
|
||||||
|
<ComboBoxItem>Cass</ComboBoxItem>
|
||||||
|
</ComboBox>
|
||||||
|
<ComboBox Width="150" Classes="Small">
|
||||||
|
<ComboBoxItem>Ding</ComboBoxItem>
|
||||||
|
<ComboBoxItem>Otter</ComboBoxItem>
|
||||||
|
<ComboBoxItem>Husky</ComboBoxItem>
|
||||||
|
<ComboBoxItem>Mr. 17</ComboBoxItem>
|
||||||
|
<ComboBoxItem>Cass</ComboBoxItem>
|
||||||
|
</ComboBox>
|
||||||
|
<ComboBox Width="150" Classes="Bordered">
|
||||||
|
<ComboBoxItem>Ding</ComboBoxItem>
|
||||||
|
<ComboBoxItem>Otter</ComboBoxItem>
|
||||||
|
<ComboBoxItem>Husky</ComboBoxItem>
|
||||||
|
<ComboBoxItem>Mr. 17</ComboBoxItem>
|
||||||
|
<ComboBoxItem>Cass</ComboBoxItem>
|
||||||
|
</ComboBox>
|
||||||
|
<ComboBox
|
||||||
|
Width="150"
|
||||||
|
Classes="Bordered"
|
||||||
|
IsEnabled="False">
|
||||||
|
<ComboBoxItem>Ding</ComboBoxItem>
|
||||||
|
<ComboBoxItem>Otter</ComboBoxItem>
|
||||||
|
<ComboBoxItem>Husky</ComboBoxItem>
|
||||||
|
<ComboBoxItem>Mr. 17</ComboBoxItem>
|
||||||
|
<ComboBoxItem>Cass</ComboBoxItem>
|
||||||
|
</ComboBox>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
using System.Collections.ObjectModel;
|
using Avalonia;
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
using CommunityToolkit.Mvvm.ComponentModel;
|
using Avalonia.Markup.Xaml;
|
||||||
|
|
||||||
namespace Semi.Avalonia.Demo.Pages;
|
namespace Semi.Avalonia.Demo.Pages;
|
||||||
|
|
||||||
@@ -9,11 +9,5 @@ public partial class ComboBoxDemo : UserControl
|
|||||||
public ComboBoxDemo()
|
public ComboBoxDemo()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
this.DataContext = new ComboBoxDemoViewModel();
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public class ComboBoxDemoViewModel : ObservableObject
|
|
||||||
{
|
|
||||||
public ObservableCollection<string> Items { get; set; } = ["Ding", "Otter", "Husky", "Mr.17", "Cass"];
|
|
||||||
}
|
}
|
||||||
@@ -14,16 +14,5 @@
|
|||||||
<DatePicker IsEnabled="False" />
|
<DatePicker IsEnabled="False" />
|
||||||
<DatePicker Classes="Large" />
|
<DatePicker Classes="Large" />
|
||||||
<DatePicker Classes="Small" />
|
<DatePicker Classes="Small" />
|
||||||
<StackPanel Orientation="Horizontal">
|
|
||||||
<DatePicker Classes="Large" />
|
|
||||||
<DatePicker />
|
|
||||||
<DatePicker Classes="Small" />
|
|
||||||
</StackPanel>
|
|
||||||
<StackPanel Orientation="Horizontal">
|
|
||||||
<DatePicker IsEnabled="False" />
|
|
||||||
<DatePicker Classes="Bordered" />
|
|
||||||
<DatePicker Classes="Bordered" IsEnabled="False" />
|
|
||||||
</StackPanel>
|
|
||||||
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|||||||
@@ -10,7 +10,6 @@
|
|||||||
<UserControl.Styles>
|
<UserControl.Styles>
|
||||||
<Style Selector="Button">
|
<Style Selector="Button">
|
||||||
<Setter Property="Margin" Value="8" />
|
<Setter Property="Margin" Value="8" />
|
||||||
<Setter Property="HorizontalAlignment" Value="Stretch" />
|
|
||||||
</Style>
|
</Style>
|
||||||
</UserControl.Styles>
|
</UserControl.Styles>
|
||||||
<Grid
|
<Grid
|
||||||
|
|||||||
@@ -1,43 +0,0 @@
|
|||||||
<UserControl
|
|
||||||
d:DesignHeight="450"
|
|
||||||
d:DesignWidth="800"
|
|
||||||
mc:Ignorable="d"
|
|
||||||
x:Class="Semi.Avalonia.Demo.Pages.HyperlinkButtonDemo"
|
|
||||||
xmlns="https://github.com/avaloniaui"
|
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
|
||||||
<StackPanel HorizontalAlignment="Left" Spacing="20">
|
|
||||||
<StackPanel Orientation="Horizontal">
|
|
||||||
<HyperlinkButton Height="20" NavigateUri="http://www.irihi.tech/">
|
|
||||||
<TextBlock
|
|
||||||
HorizontalAlignment="Center"
|
|
||||||
Text="iRihi Homepage"
|
|
||||||
TextDecorations="Underline"
|
|
||||||
VerticalAlignment="Center" />
|
|
||||||
</HyperlinkButton>
|
|
||||||
</StackPanel>
|
|
||||||
<StackPanel Orientation="Horizontal">
|
|
||||||
<HyperlinkButton Height="20" IsEnabled="False">
|
|
||||||
<TextBlock
|
|
||||||
HorizontalAlignment="Center"
|
|
||||||
Text="Not Enabled"
|
|
||||||
TextDecorations="Underline"
|
|
||||||
VerticalAlignment="Center" />
|
|
||||||
</HyperlinkButton>
|
|
||||||
</StackPanel>
|
|
||||||
<StackPanel Orientation="Horizontal">
|
|
||||||
<HyperlinkButton
|
|
||||||
BorderThickness="1"
|
|
||||||
Classes="WithIcon"
|
|
||||||
Height="20"
|
|
||||||
NavigateUri="http://www.irihi.tech/">
|
|
||||||
<TextBlock
|
|
||||||
HorizontalAlignment="Center"
|
|
||||||
Text="Link with Icon"
|
|
||||||
TextDecorations="Underline"
|
|
||||||
VerticalAlignment="Center" />
|
|
||||||
</HyperlinkButton>
|
|
||||||
</StackPanel>
|
|
||||||
</StackPanel>
|
|
||||||
</UserControl>
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
using System;
|
|
||||||
using Avalonia;
|
|
||||||
using Avalonia.Controls;
|
|
||||||
using Avalonia.Markup.Xaml;
|
|
||||||
|
|
||||||
namespace Semi.Avalonia.Demo.Pages;
|
|
||||||
|
|
||||||
public partial class HyperlinkButtonDemo : UserControl
|
|
||||||
{
|
|
||||||
public HyperlinkButtonDemo()
|
|
||||||
{
|
|
||||||
InitializeComponent();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -8,11 +8,6 @@
|
|||||||
d:DesignWidth="800"
|
d:DesignWidth="800"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
<StackPanel HorizontalAlignment="Left" Spacing="10">
|
<StackPanel HorizontalAlignment="Left" Spacing="10">
|
||||||
<StackPanel.Styles>
|
|
||||||
<Style Selector="Button">
|
|
||||||
<Setter Property="HorizontalAlignment" Value="Stretch" />
|
|
||||||
</Style>
|
|
||||||
</StackPanel.Styles>
|
|
||||||
<Button Name="openFileDialog">Open File</Button>
|
<Button Name="openFileDialog">Open File</Button>
|
||||||
<Button Name="selectFolderDialog">Select Folder</Button>
|
<Button Name="selectFolderDialog">Select Folder</Button>
|
||||||
<Button Name="saveFileDialog">Save File</Button>
|
<Button Name="saveFileDialog">Save File</Button>
|
||||||
|
|||||||
@@ -25,30 +25,14 @@
|
|||||||
<MenuItem Header="Submenu Level 2" />
|
<MenuItem Header="Submenu Level 2" />
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
<MenuItem Header="Menu Item with _Icon">
|
<MenuItem Header="Menu Item with _Checkbox">
|
||||||
<MenuItem.Icon>
|
<MenuItem.Icon>
|
||||||
<TextBlock>😊</TextBlock>
|
<TextBlock>😊</TextBlock>
|
||||||
</MenuItem.Icon>
|
</MenuItem.Icon>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
<MenuItem Header="Menu Item with _Checkbox" ToggleType="CheckBox" />
|
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
<MenuItem Header="_Second">
|
<MenuItem Header="_Second">
|
||||||
<MenuItem Header="Second _Menu Item" />
|
<MenuItem Header="Second _Menu Item" />
|
||||||
<MenuItem IsChecked="True" Header="Second Menu toggle item" ToggleType="CheckBox" />
|
|
||||||
<Separator />
|
|
||||||
<MenuItem GroupName="A" Header="Radio 1 - group" ToggleType="Radio" />
|
|
||||||
<MenuItem IsChecked="True" GroupName="A" Header="Radio 2 - group" ToggleType="Radio" />
|
|
||||||
<MenuItem GroupName="A" Header="Radio 3 - group" ToggleType="Radio">
|
|
||||||
<MenuItem Header="Radio 4 - group" ToggleType="Radio" GroupName="A" />
|
|
||||||
<MenuItem Header="Radio 5 - group" ToggleType="Radio" GroupName="A" />
|
|
||||||
</MenuItem>
|
|
||||||
<Separator />
|
|
||||||
<MenuItem Header="Radio 1" ToggleType="Radio" />
|
|
||||||
<MenuItem IsChecked="True" Header="Radio 2" ToggleType="Radio" />
|
|
||||||
<MenuItem Header="Radio 3" ToggleType="Radio">
|
|
||||||
<MenuItem Header="Radio 4" ToggleType="Radio" />
|
|
||||||
<MenuItem Header="Radio 5" ToggleType="Radio" />
|
|
||||||
</MenuItem>
|
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
<MenuItem Header="Parent">
|
<MenuItem Header="Parent">
|
||||||
<MenuItem Header="Child 1" />
|
<MenuItem Header="Child 1" />
|
||||||
@@ -102,7 +86,7 @@
|
|||||||
<MenuItem Header="Submenu _1" />
|
<MenuItem Header="Submenu _1" />
|
||||||
<MenuItem Header="Submenu _2" />
|
<MenuItem Header="Submenu _2" />
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
<MenuItem Header="Menu Item with _Icon">
|
<MenuItem Header="Menu Item with _Checkbox">
|
||||||
<MenuItem.Icon>
|
<MenuItem.Icon>
|
||||||
<CheckBox
|
<CheckBox
|
||||||
Padding="0"
|
Padding="0"
|
||||||
@@ -111,7 +95,6 @@
|
|||||||
IsHitTestVisible="False" />
|
IsHitTestVisible="False" />
|
||||||
</MenuItem.Icon>
|
</MenuItem.Icon>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
<MenuItem Header="Menu Item with _Checkbox" ToggleType="CheckBox" />
|
|
||||||
<MenuItem Header="Menu Item that won't close on click" StaysOpenOnClick="True" />
|
<MenuItem Header="Menu Item that won't close on click" StaysOpenOnClick="True" />
|
||||||
</ContextMenu>
|
</ContextMenu>
|
||||||
</Border.ContextMenu>
|
</Border.ContextMenu>
|
||||||
@@ -130,7 +113,7 @@
|
|||||||
<MenuItem Header="Submenu _1" />
|
<MenuItem Header="Submenu _1" />
|
||||||
<MenuItem Header="Submenu _2" />
|
<MenuItem Header="Submenu _2" />
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
<MenuItem Header="Menu Item with _Icon">
|
<MenuItem Header="Menu Item with _Checkbox">
|
||||||
<MenuItem.Icon>
|
<MenuItem.Icon>
|
||||||
<CheckBox
|
<CheckBox
|
||||||
Padding="0"
|
Padding="0"
|
||||||
@@ -139,7 +122,6 @@
|
|||||||
IsHitTestVisible="False" />
|
IsHitTestVisible="False" />
|
||||||
</MenuItem.Icon>
|
</MenuItem.Icon>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
<MenuItem Header="Menu Item with _Checkbox" ToggleType="CheckBox" />
|
|
||||||
</MenuFlyout>
|
</MenuFlyout>
|
||||||
</Border.ContextFlyout>
|
</Border.ContextFlyout>
|
||||||
<TextBlock Text="Right Click to show Context Flyout" />
|
<TextBlock Text="Right Click to show Context Flyout" />
|
||||||
|
|||||||
@@ -8,17 +8,10 @@
|
|||||||
d:DesignWidth="800"
|
d:DesignWidth="800"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
<StackPanel HorizontalAlignment="Left" Spacing="20">
|
<StackPanel HorizontalAlignment="Left" Spacing="20">
|
||||||
<StackPanel.Styles>
|
|
||||||
<Style Selector="Button">
|
|
||||||
<Setter Property="Theme" Value="{DynamicResource SolidButton}" />
|
|
||||||
<Setter Property="HorizontalAlignment" Value="Stretch" />
|
|
||||||
</Style>
|
|
||||||
</StackPanel.Styles>
|
|
||||||
|
|
||||||
<Button Click="InfoButton_OnClick" Content="Default" />
|
<Button Click="InfoButton_OnClick" Content="Default" />
|
||||||
<Button Click="InfoButton_OnClick" Content="Information" />
|
<Button Click="InfoButton_OnClick" Content="Information" />
|
||||||
<Button Click="InfoButton_OnClick" Content="Success" Classes="Success" />
|
<Button Click="InfoButton_OnClick" Content="Success" />
|
||||||
<Button Click="InfoButton_OnClick" Content="Warning" Classes="Warning" />
|
<Button Click="InfoButton_OnClick" Content="Warning" />
|
||||||
<Button Click="InfoButton_OnClick" Content="Error" Classes="Danger" />
|
<Button Click="InfoButton_OnClick" Content="Error" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|||||||
@@ -4,53 +4,38 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
d:DesignHeight="800"
|
d:DesignHeight="450"
|
||||||
d:DesignWidth="800"
|
d:DesignWidth="800"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
<StackPanel HorizontalAlignment="Left" Spacing="20">
|
<StackPanel HorizontalAlignment="Left" Spacing="20">
|
||||||
<StackPanel.Styles>
|
<NumericUpDown
|
||||||
<Style Selector="NumericUpDown">
|
Width="200"
|
||||||
<Setter Property="Width" Value="300" />
|
Maximum="100"
|
||||||
<Setter Property="Maximum" Value="100" />
|
Minimum="0" />
|
||||||
<Setter Property="Minimum" Value="0" />
|
<NumericUpDown
|
||||||
</Style>
|
Width="200"
|
||||||
</StackPanel.Styles>
|
Increment="10"
|
||||||
|
Maximum="100"
|
||||||
<NumericUpDown />
|
Minimum="0" />
|
||||||
<NumericUpDown Increment="10" />
|
<NumericUpDown
|
||||||
<NumericUpDown ButtonSpinnerLocation="Left" />
|
Width="200"
|
||||||
<NumericUpDown ShowButtonSpinner="False" />
|
ButtonSpinnerLocation="Left"
|
||||||
<NumericUpDown Classes="Large" />
|
Maximum="100"
|
||||||
<NumericUpDown Classes="Small" />
|
Minimum="0" />
|
||||||
<NumericUpDown InnerLeftContent="Price" InnerRightContent="$" />
|
<NumericUpDown
|
||||||
|
Width="200"
|
||||||
<StackPanel Orientation="Horizontal">
|
Maximum="100"
|
||||||
<NumericUpDown
|
Minimum="0"
|
||||||
Width="100"
|
ShowButtonSpinner="False" />
|
||||||
Classes="Large"
|
<NumericUpDown
|
||||||
Watermark="Large"
|
Width="200"
|
||||||
ButtonSpinnerLocation="Left" />
|
Classes="Large"
|
||||||
<NumericUpDown
|
Maximum="100"
|
||||||
Width="100"
|
Minimum="0" />
|
||||||
Watermark="Default"
|
<NumericUpDown
|
||||||
ShowButtonSpinner="False" />
|
Width="200"
|
||||||
<NumericUpDown
|
Classes="Small"
|
||||||
Width="100"
|
Maximum="100"
|
||||||
Watermark="Small"
|
Minimum="0" />
|
||||||
Classes="Small" />
|
|
||||||
</StackPanel>
|
|
||||||
|
|
||||||
<StackPanel Orientation="Horizontal">
|
|
||||||
<NumericUpDown Width="100" ButtonSpinnerLocation="Left" />
|
|
||||||
<NumericUpDown Width="100" ShowButtonSpinner="False" />
|
|
||||||
<NumericUpDown Width="100" />
|
|
||||||
</StackPanel>
|
|
||||||
|
|
||||||
<StackPanel Orientation="Horizontal">
|
|
||||||
<NumericUpDown Width="100" ShowButtonSpinner="False" />
|
|
||||||
<NumericUpDown Width="100" IsEnabled="False" />
|
|
||||||
<NumericUpDown Width="100" ButtonSpinnerLocation="Left" />
|
|
||||||
</StackPanel>
|
|
||||||
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|||||||
@@ -87,37 +87,31 @@
|
|||||||
Margin="0,8"
|
Margin="0,8"
|
||||||
Classes="Primary"
|
Classes="Primary"
|
||||||
Content="Primary"
|
Content="Primary"
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
Theme="{DynamicResource SolidButton}" />
|
Theme="{DynamicResource SolidButton}" />
|
||||||
<Button
|
<Button
|
||||||
Margin="0,8"
|
Margin="0,8"
|
||||||
Classes="Secondary"
|
Classes="Secondary"
|
||||||
Content="Secondary"
|
Content="Secondary"
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
Theme="{DynamicResource SolidButton}" />
|
Theme="{DynamicResource SolidButton}" />
|
||||||
<Button
|
<Button
|
||||||
Margin="0,8"
|
Margin="0,8"
|
||||||
Classes="Tertiary"
|
Classes="Tertiary"
|
||||||
Content="Tertiary"
|
Content="Tertiary"
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
Theme="{DynamicResource SolidButton}" />
|
Theme="{DynamicResource SolidButton}" />
|
||||||
<Button
|
<Button
|
||||||
Margin="0,8"
|
Margin="0,8"
|
||||||
Classes="Success"
|
Classes="Success"
|
||||||
Content="Success"
|
Content="Success"
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
Theme="{DynamicResource SolidButton}" />
|
Theme="{DynamicResource SolidButton}" />
|
||||||
<Button
|
<Button
|
||||||
Margin="0,8"
|
Margin="0,8"
|
||||||
Classes="Warning"
|
Classes="Warning"
|
||||||
Content="Warning"
|
Content="Warning"
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
Theme="{DynamicResource SolidButton}" />
|
Theme="{DynamicResource SolidButton}" />
|
||||||
<Button
|
<Button
|
||||||
Margin="0,8"
|
Margin="0,8"
|
||||||
Classes="Danger"
|
Classes="Danger"
|
||||||
Content="Danger"
|
Content="Danger"
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
Theme="{DynamicResource SolidButton}" />
|
Theme="{DynamicResource SolidButton}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<Calendar Margin="16,0" />
|
<Calendar Margin="16,0" />
|
||||||
@@ -200,32 +194,26 @@
|
|||||||
<StackPanel Margin="16,0">
|
<StackPanel Margin="16,0">
|
||||||
<Button
|
<Button
|
||||||
Margin="0,8"
|
Margin="0,8"
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
Classes="Primary"
|
Classes="Primary"
|
||||||
Content="Primary" />
|
Content="Primary" />
|
||||||
<Button
|
<Button
|
||||||
Margin="0,8"
|
Margin="0,8"
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
Classes="Secondary"
|
Classes="Secondary"
|
||||||
Content="Secondary" />
|
Content="Secondary" />
|
||||||
<Button
|
<Button
|
||||||
Margin="0,8"
|
Margin="0,8"
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
Classes="Tertiary"
|
Classes="Tertiary"
|
||||||
Content="Tertiary" />
|
Content="Tertiary" />
|
||||||
<Button
|
<Button
|
||||||
Margin="0,8"
|
Margin="0,8"
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
Classes="Success"
|
Classes="Success"
|
||||||
Content="Success" />
|
Content="Success" />
|
||||||
<Button
|
<Button
|
||||||
Margin="0,8"
|
Margin="0,8"
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
Classes="Warning"
|
Classes="Warning"
|
||||||
Content="Warning" />
|
Content="Warning" />
|
||||||
<Button
|
<Button
|
||||||
Margin="0,8"
|
Margin="0,8"
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
Classes="Danger"
|
Classes="Danger"
|
||||||
Content="Danger" />
|
Content="Danger" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|||||||
@@ -4,24 +4,12 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:pages="clr-namespace:Semi.Avalonia.Demo.Pages"
|
|
||||||
d:DesignHeight="450"
|
d:DesignHeight="450"
|
||||||
d:DesignWidth="800"
|
d:DesignWidth="800"
|
||||||
x:DataType="pages:RefreshContainerDemoViewModel"
|
|
||||||
x:CompileBindings="True"
|
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
<DockPanel HorizontalAlignment="Stretch" VerticalAlignment="Top">
|
<StackPanel HorizontalAlignment="Left" Spacing="20">
|
||||||
<Label DockPanel.Dock="Top">A control that supports pull to refresh</Label>
|
<RefreshContainer Name="container">
|
||||||
<RefreshContainer Name="Refresh"
|
<TextBlock Text="Content" />
|
||||||
DockPanel.Dock="Bottom"
|
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
VerticalAlignment="Stretch"
|
|
||||||
PullDirection="TopToBottom"
|
|
||||||
RefreshRequested="RefreshContainerPage_RefreshRequested"
|
|
||||||
Margin="5">
|
|
||||||
<ListBox HorizontalAlignment="Stretch"
|
|
||||||
VerticalAlignment="Top"
|
|
||||||
ItemsSource="{Binding Items}" />
|
|
||||||
</RefreshContainer>
|
</RefreshContainer>
|
||||||
</DockPanel>
|
</StackPanel>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|||||||
@@ -1,46 +1,14 @@
|
|||||||
using System.Collections.ObjectModel;
|
using Avalonia;
|
||||||
using System.Linq;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
using CommunityToolkit.Mvvm.ComponentModel;
|
using Avalonia.Interactivity;
|
||||||
|
using Avalonia.Markup.Xaml;
|
||||||
|
|
||||||
namespace Semi.Avalonia.Demo.Pages;
|
namespace Semi.Avalonia.Demo.Pages;
|
||||||
|
|
||||||
public partial class RefreshContainerDemo : UserControl
|
public partial class RefreshContainerDemo : UserControl
|
||||||
{
|
{
|
||||||
private RefreshContainerDemoViewModel _viewModel;
|
|
||||||
|
|
||||||
public RefreshContainerDemo()
|
public RefreshContainerDemo()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|
||||||
_viewModel = new RefreshContainerDemoViewModel();
|
|
||||||
|
|
||||||
DataContext = _viewModel;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void RefreshContainerPage_RefreshRequested(object? sender, RefreshRequestedEventArgs e)
|
|
||||||
{
|
|
||||||
var deferral = e.GetDeferral();
|
|
||||||
|
|
||||||
await _viewModel.AddToTop();
|
|
||||||
|
|
||||||
deferral.Complete();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class RefreshContainerDemoViewModel : ObservableObject
|
|
||||||
{
|
|
||||||
public ObservableCollection<string> Items { get; }
|
|
||||||
|
|
||||||
public RefreshContainerDemoViewModel()
|
|
||||||
{
|
|
||||||
Items = new ObservableCollection<string>(Enumerable.Range(1, 200).Select(i => $"Item {i}"));
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task AddToTop()
|
|
||||||
{
|
|
||||||
await Task.Delay(1000);
|
|
||||||
Items.Insert(0, $"Item {200 - Items.Count}");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -46,7 +46,7 @@
|
|||||||
Grid.Row="2" Grid.Column="1"
|
Grid.Row="2" Grid.Column="1"
|
||||||
OffContent="Left"
|
OffContent="Left"
|
||||||
OnContent="Right"
|
OnContent="Right"
|
||||||
IsChecked="{Binding #SplitView.PanePlacement}" />
|
IsChecked="{Binding #SplitView.PanePlacement, Mode=OneWayToSource}" />
|
||||||
|
|
||||||
<Label
|
<Label
|
||||||
Grid.Row="3" Grid.Column="0"
|
Grid.Row="3" Grid.Column="0"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:system="clr-namespace:System;assembly=netstandard"
|
xmlns:system="clr-namespace:System;assembly=netstandard"
|
||||||
d:DesignHeight="800"
|
d:DesignHeight="450"
|
||||||
d:DesignWidth="800"
|
d:DesignWidth="800"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
<ScrollViewer>
|
<ScrollViewer>
|
||||||
@@ -42,41 +42,7 @@
|
|||||||
InnerLeftContent="http://"
|
InnerLeftContent="http://"
|
||||||
InnerRightContent=".com"
|
InnerRightContent=".com"
|
||||||
IsEnabled="False" />
|
IsEnabled="False" />
|
||||||
<StackPanel Orientation="Horizontal">
|
|
||||||
<TextBox
|
|
||||||
Width="150"
|
|
||||||
Classes="Large"
|
|
||||||
Watermark="Large" />
|
|
||||||
<TextBox
|
|
||||||
Width="150"
|
|
||||||
Watermark="Default" />
|
|
||||||
<TextBox
|
|
||||||
Width="150"
|
|
||||||
Classes="Small"
|
|
||||||
Watermark="Small" />
|
|
||||||
</StackPanel>
|
|
||||||
|
|
||||||
<StackPanel Orientation="Horizontal">
|
|
||||||
<TextBox
|
|
||||||
Width="150"
|
|
||||||
IsEnabled="False"
|
|
||||||
Watermark="Disabled" />
|
|
||||||
<TextBox
|
|
||||||
Width="150"
|
|
||||||
Classes="Bordered"
|
|
||||||
Watermark="Bordered" />
|
|
||||||
<TextBox
|
|
||||||
Width="150"
|
|
||||||
Classes="Bordered"
|
|
||||||
IsEnabled="False" />
|
|
||||||
</StackPanel>
|
|
||||||
<TextBox Width="300" Classes="TextArea" />
|
<TextBox Width="300" Classes="TextArea" />
|
||||||
<TextBox
|
|
||||||
Width="300"
|
|
||||||
Theme="{StaticResource LooklessTextBox}"
|
|
||||||
Watermark="Lookless TextBox"
|
|
||||||
InnerLeftContent="http://"
|
|
||||||
InnerRightContent=".com" />
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|||||||
@@ -15,16 +15,5 @@
|
|||||||
<TimePicker ClockIdentifier="12HourClock" IsEnabled="False" />
|
<TimePicker ClockIdentifier="12HourClock" IsEnabled="False" />
|
||||||
<TimePicker Classes="Large" />
|
<TimePicker Classes="Large" />
|
||||||
<TimePicker Classes="Small" />
|
<TimePicker Classes="Small" />
|
||||||
<StackPanel Orientation="Horizontal">
|
|
||||||
<TimePicker Classes="Large" ClockIdentifier="12HourClock"/>
|
|
||||||
<TimePicker ClockIdentifier="12HourClock"/>
|
|
||||||
<TimePicker Classes="Small" ClockIdentifier="12HourClock"/>
|
|
||||||
</StackPanel>
|
|
||||||
<StackPanel Orientation="Horizontal">
|
|
||||||
<TimePicker IsEnabled="False" />
|
|
||||||
<TimePicker Classes="Bordered" />
|
|
||||||
<TimePicker Classes="Bordered" IsEnabled="False" />
|
|
||||||
</StackPanel>
|
|
||||||
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<AvaloniaResource Include="Assets\**" />
|
<AvaloniaResource Include="Assets\**" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
@@ -18,8 +18,8 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\..\src\Semi.Avalonia.ColorPicker\Semi.Avalonia.ColorPicker.csproj" />
|
<ProjectReference Include="..\..\src\Semi.Avalonia.ColorPicker\Semi.Avalonia.ColorPicker.csproj" />
|
||||||
<ProjectReference Include="..\..\src\Semi.Avalonia.DataGrid\Semi.Avalonia.DataGrid.csproj" />
|
<ProjectReference Include="..\..\src\Semi.Avalonia.DataGrid\Semi.Avalonia.DataGrid.csproj" />
|
||||||
<ProjectReference Include="..\..\src\Semi.Avalonia\Semi.Avalonia.csproj" />
|
<ProjectReference Include="..\..\src\Semi.Avalonia\Semi.Avalonia.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -38,42 +38,26 @@
|
|||||||
Classes="Secondary"
|
Classes="Secondary"
|
||||||
Text="{Binding #tab.SelectedItem.Header}" />
|
Text="{Binding #tab.SelectedItem.Header}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Grid.Column="1" Orientation="Horizontal">
|
<ToggleSwitch
|
||||||
<Button Theme="{DynamicResource BorderlessButton}" Click="OpenDocumentation">
|
Grid.Column="1"
|
||||||
|
Padding="4"
|
||||||
|
IsCheckedChanged="ToggleButton_OnIsCheckedChanged"
|
||||||
|
Theme="{DynamicResource ButtonToggleSwitch}">
|
||||||
|
<ToggleSwitch.OnContent>
|
||||||
<PathIcon
|
<PathIcon
|
||||||
Width="16"
|
Width="16"
|
||||||
Height="16"
|
Height="16"
|
||||||
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"
|
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"
|
||||||
Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
|
Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
|
||||||
</Button>
|
</ToggleSwitch.OnContent>
|
||||||
<Button Theme="{DynamicResource BorderlessButton}" Click="OpenRepository">
|
<ToggleSwitch.OffContent>
|
||||||
<PathIcon
|
<PathIcon
|
||||||
Width="16"
|
Width="16"
|
||||||
Height="16"
|
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"
|
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"
|
||||||
Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
|
Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
|
||||||
</Button>
|
</ToggleSwitch.OffContent>
|
||||||
<ToggleSwitch
|
</ToggleSwitch>
|
||||||
Grid.Column="1"
|
|
||||||
Padding="4"
|
|
||||||
IsCheckedChanged="ToggleButton_OnIsCheckedChanged"
|
|
||||||
Theme="{DynamicResource ButtonToggleSwitch}">
|
|
||||||
<ToggleSwitch.OnContent>
|
|
||||||
<PathIcon
|
|
||||||
Width="16"
|
|
||||||
Height="16"
|
|
||||||
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"
|
|
||||||
Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
|
|
||||||
</ToggleSwitch.OnContent>
|
|
||||||
<ToggleSwitch.OffContent>
|
|
||||||
<PathIcon
|
|
||||||
Width="16"
|
|
||||||
Height="16"
|
|
||||||
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"
|
|
||||||
Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
|
|
||||||
</ToggleSwitch.OffContent>
|
|
||||||
</ToggleSwitch>
|
|
||||||
</StackPanel>
|
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
</Border>
|
</Border>
|
||||||
@@ -142,9 +126,6 @@
|
|||||||
<TabItem Header="HeaderedContentControl">
|
<TabItem Header="HeaderedContentControl">
|
||||||
<pages:HeaderedContentControlDemo />
|
<pages:HeaderedContentControlDemo />
|
||||||
</TabItem>
|
</TabItem>
|
||||||
<TabItem Header="HyperlinkButton">
|
|
||||||
<pages:HyperlinkButtonDemo />
|
|
||||||
</TabItem>
|
|
||||||
<TabItem Header="Label">
|
<TabItem Header="Label">
|
||||||
<pages:LabelDemo />
|
<pages:LabelDemo />
|
||||||
</TabItem>
|
</TabItem>
|
||||||
@@ -164,7 +145,7 @@
|
|||||||
<pages:NumericUpDownDemo />
|
<pages:NumericUpDownDemo />
|
||||||
</TabItem>
|
</TabItem>
|
||||||
<TabItem Header="PathIcon">
|
<TabItem Header="PathIcon">
|
||||||
<pages:PathIconDemo />
|
<pages:PathIconDemo/>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
<TabItem Header="ProgressBar">
|
<TabItem Header="ProgressBar">
|
||||||
<pages:ProgressBarDemo />
|
<pages:ProgressBarDemo />
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
using System;
|
|
||||||
using Avalonia;
|
using Avalonia;
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
using Avalonia.Interactivity;
|
using Avalonia.Interactivity;
|
||||||
@@ -22,20 +21,4 @@ public partial class MainView : UserControl
|
|||||||
app.RequestedThemeVariant = theme == ThemeVariant.Dark ? ThemeVariant.Light : ThemeVariant.Dark;
|
app.RequestedThemeVariant = theme == ThemeVariant.Dark ? ThemeVariant.Light : ThemeVariant.Dark;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async void OpenRepository(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
var top = TopLevel.GetTopLevel(this);
|
|
||||||
if (top is null) return;
|
|
||||||
var launcher = top.Launcher;
|
|
||||||
await launcher.LaunchUriAsync(new Uri("https://github.com/irihitech/Semi.Avalonia"));
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void OpenDocumentation(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
var top = TopLevel.GetTopLevel(this);
|
|
||||||
if (top is null) return;
|
|
||||||
var launcher = top.Launcher;
|
|
||||||
await launcher.LaunchUriAsync(new Uri("https://docs.irihi.tech/semi"));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 168 KiB |
BIN
docs/demo.jpg
BIN
docs/demo.jpg
Binary file not shown.
|
Before Width: | Height: | Size: 104 KiB |
@@ -3,14 +3,14 @@
|
|||||||
<TargetFrameworks>net6.0;net8.0;netstandard2.0</TargetFrameworks>
|
<TargetFrameworks>net6.0;net8.0;netstandard2.0</TargetFrameworks>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
<Version>11.1.0-rc2.1</Version>
|
<Version>11.0.7.5</Version>
|
||||||
<Authors>IRIHI Technology Co., Ltd.</Authors>
|
<Authors>IRIHI Technology Co., Ltd.</Authors>
|
||||||
<Description>Avalonia Theme inspired by Semi Design.</Description>
|
<Description>Avalonia Theme inspired by Semi Design.</Description>
|
||||||
<RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
|
<RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
|
||||||
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
||||||
<PackageIcon>irihi.png</PackageIcon>
|
<PackageIcon>irihi.png</PackageIcon>
|
||||||
<PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
|
<PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
|
||||||
<AvaloniaVersion>11.1.0-rc2</AvaloniaVersion>
|
<AvaloniaVersion>11.0.7</AvaloniaVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -17,33 +17,10 @@
|
|||||||
<converters:ToBrushConverter x:Key="ToBrushConverter" />
|
<converters:ToBrushConverter x:Key="ToBrushConverter" />
|
||||||
|
|
||||||
<ControlTheme x:Key="{x:Type ColorPicker}" TargetType="ColorPicker">
|
<ControlTheme x:Key="{x:Type ColorPicker}" TargetType="ColorPicker">
|
||||||
<Setter Property="CornerRadius" Value="3" />
|
<Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
|
||||||
<Setter Property="Height" Value="32" />
|
<Setter Property="Height" Value="32" />
|
||||||
<Setter Property="Width" Value="64" />
|
<Setter Property="Width" Value="64" />
|
||||||
<Setter Property="MinWidth" Value="64" />
|
<Setter Property="MinWidth" Value="64" />
|
||||||
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
|
|
||||||
<Setter Property="VerticalContentAlignment" Value="Stretch" />
|
|
||||||
<Setter Property="Content">
|
|
||||||
<Template>
|
|
||||||
<Panel>
|
|
||||||
<Border
|
|
||||||
Margin="1,1,0,1"
|
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
VerticalAlignment="Stretch"
|
|
||||||
Background="{DynamicResource ColorControlCheckeredBackgroundBrush}"
|
|
||||||
CornerRadius="{TemplateBinding CornerRadius,
|
|
||||||
Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
|
|
||||||
<Border
|
|
||||||
Margin="1,1,0,1"
|
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
VerticalAlignment="Stretch"
|
|
||||||
Background="{TemplateBinding HsvColor,
|
|
||||||
Converter={StaticResource ToBrushConverter}}"
|
|
||||||
CornerRadius="{TemplateBinding CornerRadius,
|
|
||||||
Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
|
|
||||||
</Panel>
|
|
||||||
</Template>
|
|
||||||
</Setter>
|
|
||||||
<Setter Property="Palette">
|
<Setter Property="Palette">
|
||||||
<controls:FluentColorPalette />
|
<controls:FluentColorPalette />
|
||||||
</Setter>
|
</Setter>
|
||||||
@@ -56,8 +33,6 @@
|
|||||||
HorizontalContentAlignment="Stretch"
|
HorizontalContentAlignment="Stretch"
|
||||||
VerticalContentAlignment="Stretch"
|
VerticalContentAlignment="Stretch"
|
||||||
ClipToBounds="True"
|
ClipToBounds="True"
|
||||||
Content="{TemplateBinding Content}"
|
|
||||||
ContentTemplate="{TemplateBinding ContentTemplate}"
|
|
||||||
CornerRadius="{TemplateBinding CornerRadius}"
|
CornerRadius="{TemplateBinding CornerRadius}"
|
||||||
UseLayoutRounding="False">
|
UseLayoutRounding="False">
|
||||||
<DropDownButton.Styles>
|
<DropDownButton.Styles>
|
||||||
@@ -65,6 +40,26 @@
|
|||||||
<Setter Property="Padding" Value="0" />
|
<Setter Property="Padding" Value="0" />
|
||||||
</Style>
|
</Style>
|
||||||
</DropDownButton.Styles>
|
</DropDownButton.Styles>
|
||||||
|
<DropDownButton.Content>
|
||||||
|
<!-- Preview color -->
|
||||||
|
<Panel>
|
||||||
|
<Border
|
||||||
|
Margin="1,1,0,1"
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
VerticalAlignment="Stretch"
|
||||||
|
Background="{DynamicResource ColorControlCheckeredBackgroundBrush}"
|
||||||
|
CornerRadius="{TemplateBinding CornerRadius,
|
||||||
|
Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
|
||||||
|
<Border
|
||||||
|
Margin="1,1,0,1"
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
VerticalAlignment="Stretch"
|
||||||
|
Background="{TemplateBinding HsvColor,
|
||||||
|
Converter={StaticResource ToBrushConverter}}"
|
||||||
|
CornerRadius="{TemplateBinding CornerRadius,
|
||||||
|
Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
|
||||||
|
</Panel>
|
||||||
|
</DropDownButton.Content>
|
||||||
<DropDownButton.Flyout>
|
<DropDownButton.Flyout>
|
||||||
<Flyout FlyoutPresenterClasses="nopadding" Placement="{DynamicResource ColorPickerFlyoutPlacement}">
|
<Flyout FlyoutPresenterClasses="nopadding" Placement="{DynamicResource ColorPickerFlyoutPlacement}">
|
||||||
|
|
||||||
@@ -172,7 +167,7 @@
|
|||||||
Orientation="Vertical">
|
Orientation="Vertical">
|
||||||
<primitives:ColorSlider.IsVisible>
|
<primitives:ColorSlider.IsVisible>
|
||||||
<MultiBinding Converter="{x:Static BoolConverters.And}">
|
<MultiBinding Converter="{x:Static BoolConverters.And}">
|
||||||
<Binding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
</MultiBinding>
|
</MultiBinding>
|
||||||
</primitives:ColorSlider.IsVisible>
|
</primitives:ColorSlider.IsVisible>
|
||||||
</primitives:ColorSlider>
|
</primitives:ColorSlider>
|
||||||
@@ -430,8 +425,8 @@
|
|||||||
Value="{Binding Value, ElementName=AlphaComponentSlider}">
|
Value="{Binding Value, ElementName=AlphaComponentSlider}">
|
||||||
<NumericUpDown.IsVisible>
|
<NumericUpDown.IsVisible>
|
||||||
<MultiBinding Converter="{x:Static BoolConverters.And}">
|
<MultiBinding Converter="{x:Static BoolConverters.And}">
|
||||||
<Binding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
<Binding Path="IsComponentTextInputVisible" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="IsComponentTextInputVisible" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
</MultiBinding>
|
</MultiBinding>
|
||||||
</NumericUpDown.IsVisible>
|
</NumericUpDown.IsVisible>
|
||||||
</NumericUpDown>
|
</NumericUpDown>
|
||||||
@@ -452,8 +447,8 @@
|
|||||||
TickFrequency="1">
|
TickFrequency="1">
|
||||||
<primitives:ColorSlider.IsVisible>
|
<primitives:ColorSlider.IsVisible>
|
||||||
<MultiBinding Converter="{x:Static BoolConverters.And}">
|
<MultiBinding Converter="{x:Static BoolConverters.And}">
|
||||||
<Binding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
<Binding Path="IsComponentSliderVisible" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="IsComponentSliderVisible" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
</MultiBinding>
|
</MultiBinding>
|
||||||
</primitives:ColorSlider.IsVisible>
|
</primitives:ColorSlider.IsVisible>
|
||||||
</primitives:ColorSlider>
|
</primitives:ColorSlider>
|
||||||
@@ -476,42 +471,4 @@
|
|||||||
</Setter>
|
</Setter>
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
|
|
||||||
<ControlTheme
|
|
||||||
x:Key="HexColorPicker"
|
|
||||||
BasedOn="{StaticResource {x:Type ColorPicker}}"
|
|
||||||
TargetType="ColorPicker">
|
|
||||||
<Setter Property="Width" Value="200" />
|
|
||||||
<Setter Property="Content">
|
|
||||||
<Template>
|
|
||||||
<Grid ColumnDefinitions="Auto, *">
|
|
||||||
<Border
|
|
||||||
Grid.Column="0"
|
|
||||||
Width="{Binding $self.Bounds.Height}"
|
|
||||||
Margin="1,1,0,1"
|
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
VerticalAlignment="Stretch"
|
|
||||||
Background="{DynamicResource ColorControlCheckeredBackgroundBrush}"
|
|
||||||
CornerRadius="{TemplateBinding CornerRadius}" />
|
|
||||||
<Border
|
|
||||||
Grid.Column="0"
|
|
||||||
Width="{Binding $self.Bounds.Height}"
|
|
||||||
Margin="1,1,0,1"
|
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
VerticalAlignment="Stretch"
|
|
||||||
Background="{TemplateBinding HsvColor,
|
|
||||||
Converter={StaticResource ToBrushConverter}}"
|
|
||||||
CornerRadius="{TemplateBinding CornerRadius}" />
|
|
||||||
<TextBlock
|
|
||||||
Grid.Column="1"
|
|
||||||
Margin="8,0,0,0"
|
|
||||||
HorizontalAlignment="Left"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
FontWeight="Regular"
|
|
||||||
Foreground="{DynamicResource TextBlockDefaultForeground}"
|
|
||||||
Text="{Binding $parent[ColorPicker].Color}" />
|
|
||||||
</Grid>
|
|
||||||
</Template>
|
|
||||||
</Setter>
|
|
||||||
</ControlTheme>
|
|
||||||
|
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|||||||
@@ -260,7 +260,7 @@
|
|||||||
Orientation="Vertical">
|
Orientation="Vertical">
|
||||||
<primitives:ColorSlider.IsVisible>
|
<primitives:ColorSlider.IsVisible>
|
||||||
<MultiBinding Converter="{x:Static BoolConverters.And}">
|
<MultiBinding Converter="{x:Static BoolConverters.And}">
|
||||||
<Binding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
</MultiBinding>
|
</MultiBinding>
|
||||||
</primitives:ColorSlider.IsVisible>
|
</primitives:ColorSlider.IsVisible>
|
||||||
</primitives:ColorSlider>
|
</primitives:ColorSlider>
|
||||||
@@ -490,8 +490,8 @@
|
|||||||
Value="{Binding Value, ElementName=AlphaComponentSlider}">
|
Value="{Binding Value, ElementName=AlphaComponentSlider}">
|
||||||
<NumericUpDown.IsVisible>
|
<NumericUpDown.IsVisible>
|
||||||
<MultiBinding Converter="{x:Static BoolConverters.And}">
|
<MultiBinding Converter="{x:Static BoolConverters.And}">
|
||||||
<Binding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
<Binding Path="IsComponentTextInputVisible" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="IsComponentTextInputVisible" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
</MultiBinding>
|
</MultiBinding>
|
||||||
</NumericUpDown.IsVisible>
|
</NumericUpDown.IsVisible>
|
||||||
</NumericUpDown>
|
</NumericUpDown>
|
||||||
@@ -512,8 +512,8 @@
|
|||||||
TickFrequency="1">
|
TickFrequency="1">
|
||||||
<primitives:ColorSlider.IsVisible>
|
<primitives:ColorSlider.IsVisible>
|
||||||
<MultiBinding Converter="{x:Static BoolConverters.And}">
|
<MultiBinding Converter="{x:Static BoolConverters.And}">
|
||||||
<Binding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
<Binding Path="IsComponentSliderVisible" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="IsComponentSliderVisible" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
</MultiBinding>
|
</MultiBinding>
|
||||||
</primitives:ColorSlider.IsVisible>
|
</primitives:ColorSlider.IsVisible>
|
||||||
</primitives:ColorSlider>
|
</primitives:ColorSlider>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Title>Semi.Avalonia.ColorPicker</Title>
|
<Title>Semi.Avalonia.ColorPicker</Title>
|
||||||
<PackageReleaseNotes>Update to Avalonia 11.1-rc2</PackageReleaseNotes>
|
<PackageReleaseNotes>Update to 11.0.7</PackageReleaseNotes>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
|
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
|
|
||||||
<SolidColorBrush x:Key="DataGridColumnHeaderForeground" Opacity="0.6" Color="#F9F9F9" />
|
<SolidColorBrush x:Key="DataGridColumnHeaderForeground" Opacity="0.6" Color="#F9F9F9" />
|
||||||
<SolidColorBrush x:Key="DataGridColumnHeaderBackground" Color="Transparent" />
|
<SolidColorBrush x:Key="DataGridColumnHeaderBackground" Color="Transparent" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="DataGridColumnHeaderPointeroverBackground" Opacity="0.16" Color="White" />
|
<SolidColorBrush x:Key="DataGridColumnHeaderPointeroverBackground" Opacity="0.16" Color="White" />
|
||||||
<SolidColorBrush x:Key="DataGridColumnHeaderPressedBackground" Opacity="0.20" Color="White" />
|
<SolidColorBrush x:Key="DataGridColumnHeaderPressedBackground" Opacity="0.20" Color="White" />
|
||||||
|
|
||||||
|
|||||||
@@ -18,8 +18,9 @@
|
|||||||
<SolidColorBrush x:Key="DataGridDetailsPresenterBackground" Color="Transparent" />
|
<SolidColorBrush x:Key="DataGridDetailsPresenterBackground" Color="Transparent" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="DataGridRowPointeroverBackground" Opacity="0.09" Color="#2E3238" />
|
<SolidColorBrush x:Key="DataGridRowPointeroverBackground" Opacity="0.09" Color="#2E3238" />
|
||||||
<SolidColorBrush x:Key="DataGridRowSelectedBackground" Opacity="0.2" Color="#EAF5FF" />
|
<SolidColorBrush x:Key="DataGridRowSelectedBackground" Color="#EAF5FF" />
|
||||||
<SolidColorBrush x:Key="DataGridRowSelectedPointeroverBackground" Opacity="0.3" Color="#CBE7FE" />
|
<SolidColorBrush x:Key="DataGridRowSelectedPointeroverBackground" Color="#CBE7FE" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="DataGridRowGroupHeaderExpandIconForeground" Opacity="0.62" Color="#1C1F23" />
|
<SolidColorBrush x:Key="DataGridRowGroupHeaderExpandIconForeground" Opacity="0.62" Color="#1C1F23" />
|
||||||
<SolidColorBrush x:Key="DataGridRowGroupHeaderBackground" Opacity="0.05" Color="#2E3238" />
|
<SolidColorBrush x:Key="DataGridRowGroupHeaderBackground" Opacity="0.05" Color="#2E3238" />
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<Import Project="../Package.props"/>
|
<Import Project="../Package.props"/>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Title>Semi.Avalonia.DataGrid</Title>
|
<Title>Semi.Avalonia.DataGrid</Title>
|
||||||
<PackageReleaseNotes>Update to Avalonia 11.1-rc2</PackageReleaseNotes>
|
<PackageReleaseNotes>Update to 11.0.7</PackageReleaseNotes>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
|
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
|
||||||
|
|||||||
@@ -4,14 +4,14 @@
|
|||||||
<TargetFramework>net6.0</TargetFramework>
|
<TargetFramework>net6.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
<PackageReleaseNotes>Update to Avalonia 11.1-rc1</PackageReleaseNotes>
|
<Version>11.0.10</Version>
|
||||||
<Authors>IRIHI Technology Co., Ltd.</Authors>
|
<Authors>IRIHI Technology Co., Ltd.</Authors>
|
||||||
<Description>Avalonia Theme inspired by Semi Design.</Description>
|
<Description>Avalonia Theme inspired by Semi Design.</Description>
|
||||||
<RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
|
<RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
|
||||||
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
||||||
<PackageIcon>irihi.png</PackageIcon>
|
<PackageIcon>irihi.png</PackageIcon>
|
||||||
<PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
|
<PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
|
||||||
<AvaloniaVersion>11.0.0</AvaloniaVersion>
|
<AvaloniaVersion>11.0.10</AvaloniaVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
|
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
|
||||||
|
|||||||
@@ -9,8 +9,6 @@
|
|||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Design.PreviewWith>
|
</Design.PreviewWith>
|
||||||
<ControlTheme x:Key="{x:Type AutoCompleteBox}" TargetType="AutoCompleteBox">
|
<ControlTheme x:Key="{x:Type AutoCompleteBox}" TargetType="AutoCompleteBox">
|
||||||
<Setter Property="AutoCompleteBox.VerticalAlignment" Value="Center" />
|
|
||||||
<Setter Property="AutoCompleteBox.MinHeight" Value="{DynamicResource AutoCompleteBoxDefaultHeight}" />
|
|
||||||
<Setter Property="AutoCompleteBox.MaxDropDownHeight" Value="{DynamicResource AutoCompleteMaxDropdownHeight}" />
|
<Setter Property="AutoCompleteBox.MaxDropDownHeight" Value="{DynamicResource AutoCompleteMaxDropdownHeight}" />
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<ControlTemplate TargetType="AutoCompleteBox">
|
<ControlTemplate TargetType="AutoCompleteBox">
|
||||||
@@ -18,12 +16,9 @@
|
|||||||
<Panel>
|
<Panel>
|
||||||
<TextBox
|
<TextBox
|
||||||
Name="PART_TextBox"
|
Name="PART_TextBox"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Center"
|
||||||
MinHeight="{TemplateBinding MinHeight}"
|
|
||||||
DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
|
DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
|
||||||
Theme="{DynamicResource NonErrorTextBox}"
|
Theme="{DynamicResource NonErrorTextBox}"
|
||||||
InnerLeftContent="{TemplateBinding InnerLeftContent}"
|
|
||||||
InnerRightContent="{TemplateBinding InnerRightContent}"
|
|
||||||
Watermark="{TemplateBinding Watermark}" />
|
Watermark="{TemplateBinding Watermark}" />
|
||||||
<Popup
|
<Popup
|
||||||
Name="PART_Popup"
|
Name="PART_Popup"
|
||||||
@@ -58,8 +53,7 @@
|
|||||||
<Panel>
|
<Panel>
|
||||||
<TextBox
|
<TextBox
|
||||||
Name="PART_TextBox"
|
Name="PART_TextBox"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Center"
|
||||||
MinHeight="0"
|
|
||||||
Classes="Bordered"
|
Classes="Bordered"
|
||||||
DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
|
DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
|
||||||
Watermark="{TemplateBinding Watermark}" />
|
Watermark="{TemplateBinding Watermark}" />
|
||||||
@@ -89,11 +83,15 @@
|
|||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
</Setter>
|
</Setter>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Large">
|
<Style Selector="^.Large /template/ TextBox">
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxLargeHeight}" />
|
<Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxLargeHeight}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Small">
|
<Style Selector="^.Small /template/ TextBox">
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxSmallHeight}" />
|
<Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxSmallHeight}" />
|
||||||
</Style>
|
</Style>
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|||||||
@@ -8,32 +8,28 @@
|
|||||||
|
|
||||||
<!-- Button Light -->
|
<!-- Button Light -->
|
||||||
<ControlTheme x:Key="{x:Type Button}" TargetType="Button">
|
<ControlTheme x:Key="{x:Type Button}" TargetType="Button">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonDefaultBackground}" />
|
<Setter Property="Button.Background" Value="{DynamicResource ButtonDefaultBackground}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
|
<Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultBorderBrush}" />
|
<Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonDefaultBorderBrush}" />
|
||||||
<Setter Property="CornerRadius" Value="{DynamicResource ButtonCornerRadius}" />
|
<Setter Property="Button.CornerRadius" Value="{DynamicResource ButtonCornerRadius}" />
|
||||||
<Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThickness}" />
|
<Setter Property="Button.BorderThickness" Value="{DynamicResource ButtonBorderThickness}" />
|
||||||
<Setter Property="Padding" Value="{DynamicResource ButtonDefaultPadding}" />
|
<Setter Property="Button.Padding" Value="{DynamicResource ButtonDefaultPadding}" />
|
||||||
<Setter Property="HorizontalAlignment" Value="Center" />
|
<Setter Property="Button.RenderTransform" Value="none" />
|
||||||
<Setter Property="VerticalAlignment" Value="Center" />
|
<Setter Property="Button.FontSize" Value="{DynamicResource ButtonDefaultFontSize}" />
|
||||||
<Setter Property="RenderTransform" Value="none" />
|
<Setter Property="Button.FontWeight" Value="{DynamicResource ButtonDefaultFontWeight}" />
|
||||||
<Setter Property="FontSize" Value="{DynamicResource ButtonDefaultFontSize}" />
|
<Setter Property="Button.HorizontalContentAlignment" Value="Center" />
|
||||||
<Setter Property="FontWeight" Value="{DynamicResource ButtonDefaultFontWeight}" />
|
<Setter Property="Button.VerticalContentAlignment" Value="Center" />
|
||||||
<Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
|
<Setter Property="Button.MinHeight" Value="12" />
|
||||||
<Setter Property="HorizontalContentAlignment" Value="Center" />
|
<Setter Property="Button.Cursor" Value="Hand" />
|
||||||
<Setter Property="VerticalContentAlignment" Value="Center" />
|
<Setter Property="Button.Template">
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource ButtonDefaultHeight}" />
|
|
||||||
<Setter Property="Cursor" Value="Hand" />
|
|
||||||
<Setter Property="Template">
|
|
||||||
<ControlTemplate TargetType="Button">
|
<ControlTemplate TargetType="Button">
|
||||||
<ContentPresenter
|
<ContentPresenter
|
||||||
x:Name="PART_ContentPresenter"
|
x:Name="PART_ContentPresenter"
|
||||||
Padding="{TemplateBinding Padding}"
|
Padding="{TemplateBinding Padding}"
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
VerticalAlignment="Stretch"
|
|
||||||
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
|
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||||
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
|
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||||
BackgroundSizing="{TemplateBinding BackgroundSizing}"
|
Background="{TemplateBinding Background}"
|
||||||
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
BorderThickness="{TemplateBinding BorderThickness}"
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
Content="{TemplateBinding Content}"
|
Content="{TemplateBinding Content}"
|
||||||
ContentTemplate="{TemplateBinding ContentTemplate}"
|
ContentTemplate="{TemplateBinding ContentTemplate}"
|
||||||
@@ -49,11 +45,6 @@
|
|||||||
<Setter Property="RenderTransform" Value="scale(0.98)" />
|
<Setter Property="RenderTransform" Value="scale(0.98)" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
|
|
||||||
<Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush}" />
|
|
||||||
<Setter Property="Background" Value="{TemplateBinding Background}" />
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<Style Selector="^.Primary">
|
<Style Selector="^.Primary">
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
@@ -73,27 +64,25 @@
|
|||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:pointerover">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:disabled">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^.Large">
|
<Style Selector="^.Large">
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource ButtonLargeHeight}" />
|
|
||||||
<Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
|
<Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Small">
|
<Style Selector="^.Small">
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource ButtonSmallHeight}" />
|
|
||||||
<Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
|
<Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
|
||||||
</Style>
|
</Style>
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
@@ -102,113 +91,99 @@
|
|||||||
x:Key="SolidButton"
|
x:Key="SolidButton"
|
||||||
BasedOn="{StaticResource {x:Type Button}}"
|
BasedOn="{StaticResource {x:Type Button}}"
|
||||||
TargetType="Button">
|
TargetType="Button">
|
||||||
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
|
<Setter Property="Button.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
<Setter Property="Button.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
|
<Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:pointerover">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^.Primary">
|
<Style Selector="^.Primary">
|
||||||
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
|
<Style Selector="^:pointerover">
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Secondary">
|
<Style Selector="^.Secondary">
|
||||||
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
|
<Style Selector="^:pointerover">
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Tertiary">
|
<Style Selector="^.Tertiary">
|
||||||
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
|
<Style Selector="^:pointerover">
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Success">
|
<Style Selector="^.Success">
|
||||||
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
|
<Style Selector="^:pointerover">
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Warning">
|
<Style Selector="^.Warning">
|
||||||
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
|
<Style Selector="^:pointerover">
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Danger">
|
<Style Selector="^.Danger">
|
||||||
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
|
<Style Selector="^:pointerover">
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:disabled">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidDisabledBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidDisabledBackground}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
||||||
@@ -219,28 +194,26 @@
|
|||||||
x:Key="OutlineButton"
|
x:Key="OutlineButton"
|
||||||
BasedOn="{StaticResource {x:Type Button}}"
|
BasedOn="{StaticResource {x:Type Button}}"
|
||||||
TargetType="Button">
|
TargetType="Button">
|
||||||
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
|
<Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
<Style Selector="^:pointerover">
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonOutlinePointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonOutlinePointeroverBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonOutlinePressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonOutlinePressedBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Success /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^.Success">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineSuccessBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineSuccessBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Warning /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^.Warning">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineWarningBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineWarningBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Danger /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^.Danger">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineDangerBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineDangerBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:disabled">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
||||||
@@ -251,11 +224,9 @@
|
|||||||
x:Key="BorderlessButton"
|
x:Key="BorderlessButton"
|
||||||
BasedOn="{StaticResource {x:Type Button}}"
|
BasedOn="{StaticResource {x:Type Button}}"
|
||||||
TargetType="Button">
|
TargetType="Button">
|
||||||
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
|
<Setter Property="Button.Background" Value="Transparent" />
|
||||||
<Setter Property="Background" Value="Transparent" />
|
<Setter Property="Button.BorderBrush" Value="Transparent" />
|
||||||
<Setter Property="BorderBrush" Value="Transparent" />
|
<Style Selector="^:disabled">
|
||||||
</Style>
|
|
||||||
<Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
|
|
||||||
<Setter Property="BorderBrush" Value="Transparent" />
|
<Setter Property="BorderBrush" Value="Transparent" />
|
||||||
<Setter Property="Background" Value="Transparent" />
|
<Setter Property="Background" Value="Transparent" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
||||||
@@ -285,4 +256,4 @@
|
|||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonInputInnerPressedForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonInputInnerPressedForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|||||||
@@ -41,7 +41,6 @@
|
|||||||
<Setter Property="ButtonSpinner.BorderBrush" Value="{DynamicResource ButtonSpinnerRepeatButtonBorderBrush}" />
|
<Setter Property="ButtonSpinner.BorderBrush" Value="{DynamicResource ButtonSpinnerRepeatButtonBorderBrush}" />
|
||||||
<Setter Property="ButtonSpinner.BorderThickness" Value="0" />
|
<Setter Property="ButtonSpinner.BorderThickness" Value="0" />
|
||||||
<Setter Property="ButtonSpinner.MinWidth" Value="300" />
|
<Setter Property="ButtonSpinner.MinWidth" Value="300" />
|
||||||
<!-- Add Resource -->
|
|
||||||
<Setter Property="ButtonSpinner.Template">
|
<Setter Property="ButtonSpinner.Template">
|
||||||
<ControlTemplate TargetType="ButtonSpinner">
|
<ControlTemplate TargetType="ButtonSpinner">
|
||||||
<Grid ColumnDefinitions="Auto, *, Auto">
|
<Grid ColumnDefinitions="Auto, *, Auto">
|
||||||
@@ -49,8 +48,7 @@
|
|||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
BorderBrush="{TemplateBinding BorderBrush}"
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
BorderThickness="{TemplateBinding BorderThickness}"
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
CornerRadius="{TemplateBinding CornerRadius}"
|
CornerRadius="{TemplateBinding CornerRadius}">
|
||||||
UseLayoutRounding="False">
|
|
||||||
<ContentPresenter
|
<ContentPresenter
|
||||||
Name="PART_ContentPresenter"
|
Name="PART_ContentPresenter"
|
||||||
Padding="{TemplateBinding Padding}"
|
Padding="{TemplateBinding Padding}"
|
||||||
|
|||||||
@@ -9,14 +9,12 @@
|
|||||||
<Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrush}" />
|
||||||
<Setter Property="BorderThickness" Value="{DynamicResource CalendarDatePickerBorderThickness}" />
|
<Setter Property="BorderThickness" Value="{DynamicResource CalendarDatePickerBorderThickness}" />
|
||||||
<Setter Property="CornerRadius" Value="{DynamicResource CalendarDatePickerCornerRadius}" />
|
<Setter Property="CornerRadius" Value="{DynamicResource CalendarDatePickerCornerRadius}" />
|
||||||
<Setter Property="BackgroundSizing" Value="OuterBorderEdge"/>
|
|
||||||
<Setter Property="IsTodayHighlighted" Value="True" />
|
<Setter Property="IsTodayHighlighted" Value="True" />
|
||||||
<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="Padding" Value="8 0" />
|
<Setter Property="Padding" Value="8 0" />
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource CalendarDatePickerDefaultHeight}" />
|
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<ControlTemplate TargetType="CalendarDatePicker">
|
<ControlTemplate TargetType="CalendarDatePicker">
|
||||||
<DataValidationErrors>
|
<DataValidationErrors>
|
||||||
@@ -26,96 +24,96 @@
|
|||||||
VerticalAlignment="Stretch">
|
VerticalAlignment="Stretch">
|
||||||
<Border
|
<Border
|
||||||
x:Name="Background"
|
x:Name="Background"
|
||||||
BackgroundSizing="{TemplateBinding BackgroundSizing}"
|
|
||||||
Background="{TemplateBinding Background}"
|
Background="{TemplateBinding Background}"
|
||||||
BorderBrush="{TemplateBinding BorderBrush}"
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
BorderThickness="{TemplateBinding BorderThickness}"
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
CornerRadius="{TemplateBinding CornerRadius}"/>
|
CornerRadius="{TemplateBinding CornerRadius}">
|
||||||
<Grid
|
<Grid
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
VerticalAlignment="Stretch"
|
|
||||||
ColumnDefinitions="*, Auto, Auto">
|
|
||||||
<TextBox
|
|
||||||
Name="PART_TextBox"
|
|
||||||
Grid.Column="0"
|
|
||||||
Grid.ColumnSpan="2"
|
|
||||||
MinHeight="{TemplateBinding MinHeight}"
|
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Center"
|
||||||
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
|
ColumnDefinitions="*, Auto, Auto">
|
||||||
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
|
<TextBox
|
||||||
Background="Transparent"
|
Name="PART_TextBox"
|
||||||
BorderBrush="Transparent"
|
Grid.Column="0"
|
||||||
BorderThickness="0"
|
Grid.ColumnSpan="2"
|
||||||
CornerRadius="{TemplateBinding CornerRadius}"
|
MinHeight="{DynamicResource CalendarDatePickerDefaultHeight}"
|
||||||
Foreground="{TemplateBinding Foreground}"
|
HorizontalAlignment="Stretch"
|
||||||
Theme="{DynamicResource NonErrorTextBox}"
|
VerticalAlignment="Center"
|
||||||
UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
|
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||||
Watermark="{TemplateBinding Watermark}">
|
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||||
<TextBox.Styles>
|
Background="Transparent"
|
||||||
<Style Selector="TextBox#PART_TextBox:pointerover /template/ Border#PART_ContentPresenterBorder">
|
BorderBrush="Transparent"
|
||||||
<!-- By default the TextBox has its own focused state, override this to disable it here -->
|
BorderThickness="0"
|
||||||
<Setter Property="Background" Value="Transparent" />
|
CornerRadius="{TemplateBinding CornerRadius}"
|
||||||
<Setter Property="BorderBrush" Value="Transparent" />
|
Foreground="{TemplateBinding Foreground}"
|
||||||
<Setter Property="BorderThickness" Value="0" />
|
Theme="{DynamicResource NonErrorTextBox}"
|
||||||
</Style>
|
UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
|
||||||
<Style Selector="TextBox#PART_TextBox:focus /template/ Border#PART_ContentPresenterBorder">
|
Watermark="{TemplateBinding Watermark}">
|
||||||
<!-- By default the TextBox has its own focused state, override this to disable it here -->
|
<TextBox.Styles>
|
||||||
<Setter Property="Background" Value="Transparent" />
|
<Style Selector="TextBox#PART_TextBox:pointerover /template/ Border#PART_ContentPresenterBorder">
|
||||||
<Setter Property="BorderBrush" Value="Transparent" />
|
<!-- By default the TextBox has its own focused state, override this to disable it here -->
|
||||||
<Setter Property="BorderThickness" Value="0" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="TextBox#PART_TextBox:disabled">
|
|
||||||
<Style Selector="^ /template/ Border#PART_ContentPresenterBorder">
|
|
||||||
<!-- By default the TextBox has its own disabled state, override this to make the border background show through -->
|
|
||||||
<Setter Property="Background" Value="Transparent" />
|
<Setter Property="Background" Value="Transparent" />
|
||||||
<Setter Property="BorderBrush" Value="Transparent" />
|
<Setter Property="BorderBrush" Value="Transparent" />
|
||||||
|
<Setter Property="BorderThickness" Value="0" />
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
<Style Selector="TextBox#PART_TextBox:focus /template/ Border#PART_ContentPresenterBorder">
|
||||||
</TextBox.Styles>
|
<!-- By default the TextBox has its own focused state, override this to disable it here -->
|
||||||
</TextBox>
|
<Setter Property="Background" Value="Transparent" />
|
||||||
<Button
|
<Setter Property="BorderBrush" Value="Transparent" />
|
||||||
Name="ClearButton"
|
<Setter Property="BorderThickness" Value="0" />
|
||||||
Grid.Column="1"
|
</Style>
|
||||||
Padding="0,0,8,0"
|
<Style Selector="TextBox#PART_TextBox:disabled">
|
||||||
Content="{DynamicResource IconButtonClearData}"
|
<Style Selector="^ /template/ Border#PART_ContentPresenterBorder">
|
||||||
Command="{Binding $parent[CalendarDatePicker].Clear}"
|
<!-- By default the TextBox has its own disabled state, override this to make the border background show through -->
|
||||||
Focusable="False"
|
<Setter Property="Background" Value="Transparent" />
|
||||||
IsVisible="False"
|
<Setter Property="BorderBrush" Value="Transparent" />
|
||||||
Theme="{DynamicResource InnerIconButton}" />
|
</Style>
|
||||||
<Button
|
</Style>
|
||||||
Name="PART_Button"
|
</TextBox.Styles>
|
||||||
Grid.Column="2"
|
</TextBox>
|
||||||
Padding="0,0,8,0"
|
<Button
|
||||||
Content="{DynamicResource CalendarDatePickerIconGlyph}"
|
Name="ClearButton"
|
||||||
Focusable="False"
|
Grid.Column="1"
|
||||||
Theme="{DynamicResource InnerIconButton}" />
|
Padding="0,0,8,0"
|
||||||
<Popup
|
Content="{DynamicResource IconButtonClearData}"
|
||||||
Name="PART_Popup"
|
Command="{Binding $parent[CalendarDatePicker].Clear}"
|
||||||
Grid.Column="0"
|
Focusable="False"
|
||||||
HorizontalOffset="-8"
|
IsVisible="False"
|
||||||
IsLightDismissEnabled="True"
|
Theme="{DynamicResource InnerIconButton}" />
|
||||||
PlacementTarget="{TemplateBinding}"
|
<Button
|
||||||
VerticalOffset="-4">
|
Name="PART_Button"
|
||||||
<Border
|
Grid.Column="2"
|
||||||
Margin="8"
|
Padding="0,0,8,0"
|
||||||
Background="Transparent"
|
Content="{DynamicResource CalendarDatePickerIconGlyph}"
|
||||||
BoxShadow="{DynamicResource CalendarDatePickerPopupBoxShadows}"
|
Focusable="False"
|
||||||
CornerRadius="{DynamicResource CalendarCornerRadius}">
|
Theme="{DynamicResource InnerIconButton}" />
|
||||||
<Calendar
|
<Popup
|
||||||
Name="PART_Calendar"
|
Name="PART_Popup"
|
||||||
BorderThickness="0"
|
Grid.Column="0"
|
||||||
CornerRadius="{Binding $parent[Border].CornerRadius}"
|
HorizontalOffset="-8"
|
||||||
DisplayDate="{TemplateBinding DisplayDate}"
|
IsLightDismissEnabled="True"
|
||||||
DisplayDateEnd="{TemplateBinding DisplayDateEnd}"
|
PlacementTarget="{TemplateBinding}"
|
||||||
DisplayDateStart="{TemplateBinding DisplayDateStart}"
|
VerticalOffset="-4">
|
||||||
FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
|
<Border
|
||||||
IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
|
Margin="8"
|
||||||
SelectedDate="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedDate, Mode=TwoWay}">
|
Background="Transparent"
|
||||||
</Calendar>
|
BoxShadow="{DynamicResource CalendarDatePickerPopupBoxShadows}"
|
||||||
</Border>
|
CornerRadius="{DynamicResource CalendarCornerRadius}">
|
||||||
</Popup>
|
<Calendar
|
||||||
</Grid>
|
Name="PART_Calendar"
|
||||||
|
BorderThickness="0"
|
||||||
|
CornerRadius="{Binding $parent[Border].CornerRadius}"
|
||||||
|
DisplayDate="{TemplateBinding DisplayDate}"
|
||||||
|
DisplayDateEnd="{TemplateBinding DisplayDateEnd}"
|
||||||
|
DisplayDateStart="{TemplateBinding DisplayDateStart}"
|
||||||
|
FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
|
||||||
|
IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
|
||||||
|
SelectedDate="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedDate, Mode=TwoWay}">
|
||||||
|
</Calendar>
|
||||||
|
</Border>
|
||||||
|
</Popup>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
|
||||||
</Panel>
|
</Panel>
|
||||||
</DataValidationErrors>
|
</DataValidationErrors>
|
||||||
@@ -130,10 +128,14 @@
|
|||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^.Large">
|
<Style Selector="^.Large">
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource CalendarDatePickerLargeHeight}" />
|
<Style Selector="^ /template/ TextBox#PART_TextBox">
|
||||||
|
<Setter Property="MinHeight" Value="{DynamicResource CalendarDatePickerInnerLargeHeight}" />
|
||||||
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Small">
|
<Style Selector="^.Small">
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource CalendarDatePickerSmallHeight}" />
|
<Style Selector="^ /template/ TextBox#PART_TextBox">
|
||||||
|
<Setter Property="MinHeight" Value="{DynamicResource CalendarDatePickerInnerSmallHeight}" />
|
||||||
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^:pointerover">
|
<Style Selector="^:pointerover">
|
||||||
|
|||||||
@@ -32,7 +32,6 @@
|
|||||||
<Setter Property="FocusAdorner" Value="{x:Null}" />
|
<Setter Property="FocusAdorner" Value="{x:Null}" />
|
||||||
<Setter Property="MaxDropDownHeight" Value="504" />
|
<Setter Property="MaxDropDownHeight" Value="504" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" />
|
||||||
<Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
|
|
||||||
<Setter Property="BorderThickness" Value="1" />
|
<Setter Property="BorderThickness" Value="1" />
|
||||||
<Setter Property="Cursor" Value="Hand" />
|
<Setter Property="Cursor" Value="Hand" />
|
||||||
<Setter Property="CornerRadius" Value="{DynamicResource ComboBoxSelectorCornerRadius}" />
|
<Setter Property="CornerRadius" Value="{DynamicResource ComboBoxSelectorCornerRadius}" />
|
||||||
@@ -42,7 +41,6 @@
|
|||||||
<Setter Property="VerticalContentAlignment" Value="Center" />
|
<Setter Property="VerticalContentAlignment" Value="Center" />
|
||||||
<Setter Property="HorizontalAlignment" Value="Left" />
|
<Setter Property="HorizontalAlignment" Value="Left" />
|
||||||
<Setter Property="VerticalAlignment" Value="Top" />
|
<Setter Property="VerticalAlignment" Value="Top" />
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource ComboBoxDefaultHeight}" />
|
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<ControlTemplate TargetType="ComboBox">
|
<ControlTemplate TargetType="ComboBox">
|
||||||
<DataValidationErrors>
|
<DataValidationErrors>
|
||||||
@@ -51,12 +49,12 @@
|
|||||||
x:Name="Background"
|
x:Name="Background"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Grid.ColumnSpan="3"
|
Grid.ColumnSpan="3"
|
||||||
|
MinWidth="{DynamicResource ComboBoxThemeMinWidth}"
|
||||||
|
MinHeight="{DynamicResource ComboBoxDefaultHeight}"
|
||||||
Background="{TemplateBinding Background}"
|
Background="{TemplateBinding Background}"
|
||||||
BackgroundSizing="{TemplateBinding BackgroundSizing}"
|
|
||||||
BorderBrush="{TemplateBinding BorderBrush}"
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
BorderThickness="{TemplateBinding BorderThickness}"
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
CornerRadius="{TemplateBinding CornerRadius}"
|
CornerRadius="{TemplateBinding CornerRadius}" />
|
||||||
MinHeight="{TemplateBinding MinHeight}" />
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
x:Name="PlaceholderTextBlock"
|
x:Name="PlaceholderTextBlock"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
@@ -150,10 +148,10 @@
|
|||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^.Large">
|
<Style Selector="^.Large /template/ Border#Background">
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource ComboBoxLargeHeight}" />
|
<Setter Property="MinHeight" Value="{DynamicResource ComboBoxLargeHeight}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Small">
|
<Style Selector="^.Small /template/ Border#Background">
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource ComboBoxSmallHeight}" />
|
<Setter Property="MinHeight" Value="{DynamicResource ComboBoxSmallHeight}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
@@ -161,18 +159,9 @@
|
|||||||
<Style Selector="^:pointerover">
|
<Style Selector="^:pointerover">
|
||||||
<Setter Property="Background" Value="{DynamicResource ComboBoxSelectorPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ComboBoxSelectorPointeroverBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorPointeroverBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorPointeroverBorderBrush}" />
|
||||||
<Style Selector="^ /template/ PathIcon#DropDownGlyph">
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ComboBoxIconPointeroverForeground}" />
|
|
||||||
</Style>
|
|
||||||
</Style>
|
</Style>
|
||||||
|
<Style Selector="^:pointerover /template/ PathIcon#DropDownGlyph">
|
||||||
<!-- Focus State -->
|
<Setter Property="Foreground" Value="{DynamicResource ComboBoxIconPointeroverForeground}" />
|
||||||
<Style Selector="^:focus">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ComboBoxSelectorFocusBackground}" />
|
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorFocusBorderBrush}" />
|
|
||||||
<Style Selector="^ /template/ PathIcon#DropDownGlyph">
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ComboBoxIconFocusForeground}" />
|
|
||||||
</Style>
|
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<!-- Pressed State -->
|
<!-- Pressed State -->
|
||||||
@@ -233,10 +222,6 @@
|
|||||||
<Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBorderedPressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBorderedPressedBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderedPressedBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderedPressedBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:focus /template/ Border#Background">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBorderedFocusBackground}" />
|
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderedFocusBorderBrush}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:disabled">
|
<Style Selector="^:disabled">
|
||||||
<Style Selector="^ /template/ Border#Background">
|
<Style Selector="^ /template/ Border#Background">
|
||||||
<Setter Property="Background" Value="{DynamicResource ComboBoxSelectorDisabledBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ComboBoxSelectorDisabledBackground}" />
|
||||||
@@ -299,10 +284,6 @@
|
|||||||
<Setter Property="Background" Value="{DynamicResource ComboBoxItemPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ComboBoxItemPointeroverBackground}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^:focus /template/ ContentPresenter#PART_ContentPresenter">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ComboBoxItemFocusBackground}" />
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
|
||||||
<Setter Property="Background" Value="{DynamicResource ComboBoxItemDisabledBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ComboBoxItemDisabledBackground}" />
|
||||||
</Style>
|
</Style>
|
||||||
@@ -322,6 +303,5 @@
|
|||||||
<Setter Property="Background" Value="{DynamicResource ComboBoxItemSelectedPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ComboBoxItemSelectedPointeroverBackground}" />
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|||||||
22
src/Semi.Avalonia/Controls/ContentControl.axaml
Normal file
22
src/Semi.Avalonia/Controls/ContentControl.axaml
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
<ResourceDictionary
|
||||||
|
xmlns="https://github.com/avaloniaui"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
x:CompileBindings="True">
|
||||||
|
<ControlTheme x:Key="{x:Type ContentControl}" TargetType="ContentControl">
|
||||||
|
<Setter Property="Template">
|
||||||
|
<ControlTemplate TargetType="ContentControl">
|
||||||
|
<ContentPresenter
|
||||||
|
Name="PART_ContentPresenter"
|
||||||
|
Padding="{TemplateBinding Padding}"
|
||||||
|
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||||
|
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||||
|
Background="{TemplateBinding Background}"
|
||||||
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
|
Content="{TemplateBinding Content}"
|
||||||
|
ContentTemplate="{TemplateBinding ContentTemplate}"
|
||||||
|
CornerRadius="{TemplateBinding CornerRadius}" />
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter>
|
||||||
|
</ControlTheme>
|
||||||
|
</ResourceDictionary>
|
||||||
@@ -132,7 +132,6 @@
|
|||||||
<Setter Property="CornerRadius" Value="{DynamicResource DateTimePickerButtonCornerRadius}" />
|
<Setter Property="CornerRadius" Value="{DynamicResource DateTimePickerButtonCornerRadius}" />
|
||||||
<Setter Property="HorizontalAlignment" Value="Left" />
|
<Setter Property="HorizontalAlignment" Value="Left" />
|
||||||
<Setter Property="VerticalAlignment" Value="Center" />
|
<Setter Property="VerticalAlignment" Value="Center" />
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonDefaultHeight}" />
|
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<ControlTemplate TargetType="DatePicker">
|
<ControlTemplate TargetType="DatePicker">
|
||||||
<DataValidationErrors>
|
<DataValidationErrors>
|
||||||
@@ -146,7 +145,7 @@
|
|||||||
Grid.ColumnSpan="2"
|
Grid.ColumnSpan="2"
|
||||||
Width="298"
|
Width="298"
|
||||||
MinWidth="298"
|
MinWidth="298"
|
||||||
MinHeight="{TemplateBinding MinHeight}"
|
MinHeight="{DynamicResource DateTimePickerButtonDefaultHeight}"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
Background="{TemplateBinding Background}"
|
Background="{TemplateBinding Background}"
|
||||||
@@ -166,45 +165,43 @@
|
|||||||
ColumnDefinitions="78*,Auto,132*,Auto,78*">
|
ColumnDefinitions="78*,Auto,132*,Auto,78*">
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Name="PART_DayTextBlock"
|
Name="PART_DayTextBlock"
|
||||||
Padding="12,0"
|
Padding="12,4"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
FontFamily="{TemplateBinding FontFamily}"
|
FontFamily="{TemplateBinding FontFamily}"
|
||||||
FontSize="{TemplateBinding FontSize}"
|
FontSize="{TemplateBinding FontSize}"
|
||||||
FontWeight="{TemplateBinding FontWeight}"
|
FontWeight="{TemplateBinding FontWeight}"
|
||||||
Text="{DynamicResource STRING_DATEPICKER_DAY_TEXT}" />
|
Text="day" />
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Name="PART_MonthTextBlock"
|
Name="PART_MonthTextBlock"
|
||||||
Padding="12,0"
|
Padding="12,4"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
FontFamily="{TemplateBinding FontFamily}"
|
FontFamily="{TemplateBinding FontFamily}"
|
||||||
FontSize="{TemplateBinding FontSize}"
|
FontSize="{TemplateBinding FontSize}"
|
||||||
FontWeight="{TemplateBinding FontWeight}"
|
FontWeight="{TemplateBinding FontWeight}"
|
||||||
Text="{DynamicResource STRING_DATEPICKER_MONTH_TEXT}"
|
Text="month"
|
||||||
TextAlignment="Left" />
|
TextAlignment="Left" />
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Name="PART_YearTextBlock"
|
Name="PART_YearTextBlock"
|
||||||
Padding="12,0"
|
Padding="12,4"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
FontFamily="{TemplateBinding FontFamily}"
|
FontFamily="{TemplateBinding FontFamily}"
|
||||||
FontSize="{TemplateBinding FontSize}"
|
FontSize="{TemplateBinding FontSize}"
|
||||||
FontWeight="{TemplateBinding FontWeight}"
|
FontWeight="{TemplateBinding FontWeight}"
|
||||||
Text="{DynamicResource STRING_DATEPICKER_YEAR_TEXT}" />
|
Text="year" />
|
||||||
<Rectangle
|
<Rectangle
|
||||||
x:Name="PART_FirstSpacer"
|
x:Name="PART_FirstSpacer"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Width="1"
|
Width="1"
|
||||||
Height="{TemplateBinding Height}"
|
Margin="0,4"
|
||||||
MinHeight="{TemplateBinding MinHeight}"
|
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
|
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
|
||||||
<Rectangle
|
<Rectangle
|
||||||
x:Name="PART_SecondSpacer"
|
x:Name="PART_SecondSpacer"
|
||||||
Grid.Column="3"
|
Grid.Column="3"
|
||||||
Width="1"
|
Width="1"
|
||||||
Height="{TemplateBinding Height}"
|
Margin="0,4"
|
||||||
MinHeight="{TemplateBinding MinHeight}"
|
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
|
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
@@ -258,10 +255,10 @@
|
|||||||
<Style Selector="^:hasnodate /template/ Button#PART_FlyoutButton TextBlock">
|
<Style Selector="^:hasnodate /template/ Button#PART_FlyoutButton TextBlock">
|
||||||
<Setter Property="Foreground" Value="{DynamicResource DateTimePickerEmptyForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource DateTimePickerEmptyForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Large">
|
<Style Selector="^.Large /template/ Button#PART_FlyoutButton">
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonLargeHeight}" />
|
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonLargeHeight}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Small">
|
<Style Selector="^.Small /template/ Button#PART_FlyoutButton">
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonSmallHeight}" />
|
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonSmallHeight}" />
|
||||||
</Style>
|
</Style>
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
|
|||||||
@@ -6,8 +6,7 @@
|
|||||||
|
|
||||||
<ControlTheme x:Key="DateTimePickerFlyoutButton" TargetType="Button">
|
<ControlTheme x:Key="DateTimePickerFlyoutButton" TargetType="Button">
|
||||||
<Setter Property="RenderTransform" Value="none" />
|
<Setter Property="RenderTransform" Value="none" />
|
||||||
<Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
|
<Setter Property="Button.VerticalAlignment" Value="Stretch" />
|
||||||
<Setter Property="VerticalAlignment" Value="Stretch" />
|
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<ControlTemplate>
|
<ControlTemplate>
|
||||||
<ContentPresenter
|
<ContentPresenter
|
||||||
@@ -15,7 +14,6 @@
|
|||||||
HorizontalContentAlignment="Stretch"
|
HorizontalContentAlignment="Stretch"
|
||||||
VerticalContentAlignment="Stretch"
|
VerticalContentAlignment="Stretch"
|
||||||
Background="{TemplateBinding Background}"
|
Background="{TemplateBinding Background}"
|
||||||
BackgroundSizing="{TemplateBinding BackgroundSizing}"
|
|
||||||
BorderBrush="{TemplateBinding BorderBrush}"
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
BorderThickness="{TemplateBinding BorderThickness}"
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
Content="{TemplateBinding Content}"
|
Content="{TemplateBinding Content}"
|
||||||
|
|||||||
@@ -4,29 +4,25 @@
|
|||||||
x:CompileBindings="True">
|
x:CompileBindings="True">
|
||||||
<!-- Add Resources Here -->
|
<!-- Add Resources Here -->
|
||||||
<ControlTheme x:Key="{x:Type DropDownButton}" TargetType="DropDownButton">
|
<ControlTheme x:Key="{x:Type DropDownButton}" TargetType="DropDownButton">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonDefaultBackground}" />
|
<Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonDefaultBackground}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
|
<Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultBorderBrush}" />
|
<Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonDefaultBorderBrush}" />
|
||||||
<Setter Property="CornerRadius" Value="{DynamicResource ButtonCornerRadius}" />
|
<Setter Property="DropDownButton.CornerRadius" Value="{DynamicResource ButtonCornerRadius}" />
|
||||||
<Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThickness}" />
|
<Setter Property="DropDownButton.BorderThickness" Value="{DynamicResource ButtonBorderThickness}" />
|
||||||
<Setter Property="Padding" Value="{DynamicResource ButtonDefaultPadding}" />
|
<Setter Property="DropDownButton.Padding" Value="{DynamicResource ButtonDefaultPadding}" />
|
||||||
<Setter Property="RenderTransform" Value="none" />
|
<Setter Property="DropDownButton.RenderTransform" Value="none" />
|
||||||
<Setter Property="HorizontalAlignment" Value="Center" />
|
<Setter Property="DropDownButton.FontSize" Value="{DynamicResource ButtonDefaultFontSize}" />
|
||||||
<Setter Property="VerticalAlignment" Value="Center" />
|
<Setter Property="DropDownButton.FontWeight" Value="{DynamicResource ButtonDefaultFontWeight}" />
|
||||||
<Setter Property="FontSize" Value="{DynamicResource ButtonDefaultFontSize}" />
|
<Setter Property="DropDownButton.HorizontalContentAlignment" Value="Center" />
|
||||||
<Setter Property="FontWeight" Value="{DynamicResource ButtonDefaultFontWeight}" />
|
<Setter Property="DropDownButton.VerticalContentAlignment" Value="Center" />
|
||||||
<Setter Property="HorizontalContentAlignment" Value="Center" />
|
<Setter Property="DropDownButton.MinHeight" Value="12" />
|
||||||
<Setter Property="VerticalContentAlignment" Value="Center" />
|
<Setter Property="DropDownButton.Cursor" Value="Hand" />
|
||||||
<Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
|
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource ButtonDefaultHeight}" />
|
|
||||||
<Setter Property="Cursor" Value="Hand" />
|
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<ControlTemplate TargetType="DropDownButton">
|
<ControlTemplate TargetType="DropDownButton">
|
||||||
<Border
|
<Border
|
||||||
x:Name="RootBorder"
|
x:Name="RootBorder"
|
||||||
HorizontalAlignment="Stretch"
|
Background="{TemplateBinding Background}"
|
||||||
VerticalAlignment="Stretch"
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
BackgroundSizing="{TemplateBinding BackgroundSizing}"
|
|
||||||
BorderThickness="{TemplateBinding BorderThickness}"
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
ClipToBounds="True"
|
ClipToBounds="True"
|
||||||
CornerRadius="{TemplateBinding CornerRadius}">
|
CornerRadius="{TemplateBinding CornerRadius}">
|
||||||
@@ -39,7 +35,6 @@
|
|||||||
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
|
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||||
Content="{TemplateBinding Content}"
|
Content="{TemplateBinding Content}"
|
||||||
ContentTemplate="{TemplateBinding ContentTemplate}"
|
ContentTemplate="{TemplateBinding ContentTemplate}"
|
||||||
Foreground="{TemplateBinding Foreground}"
|
|
||||||
RecognizesAccessKey="True" />
|
RecognizesAccessKey="True" />
|
||||||
<PathIcon
|
<PathIcon
|
||||||
x:Name="DropDownGlyph"
|
x:Name="DropDownGlyph"
|
||||||
@@ -62,21 +57,6 @@
|
|||||||
<Setter Property="RenderTransform" Value="scale(0.98)" />
|
<Setter Property="RenderTransform" Value="scale(0.98)" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^ /template/ Border#RootBorder">
|
|
||||||
<Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush}" />
|
|
||||||
<Setter Property="Background" Value="{TemplateBinding Background}" />
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<Style Selector="^:pointerover /template/ Border#RootBorder">
|
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<Style Selector="^:pressed /template/ Border#RootBorder">
|
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<Style Selector="^.Primary">
|
<Style Selector="^.Primary">
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
@@ -96,144 +76,165 @@
|
|||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^:pointerover /template/ Border#RootBorder">
|
<Style Selector="^:pointerover">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^:pressed /template/ Border#RootBorder">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^:disabled">
|
<Style Selector="^:disabled">
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:disabled /template/ Border#RootBorder">
|
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
|
||||||
|
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^.Large">
|
<Style Selector="^.Large">
|
||||||
<Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
|
<Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource ButtonLargeHeight}" />
|
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Small">
|
<Style Selector="^.Small">
|
||||||
<Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
|
<Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource ButtonSmallHeight}" />
|
|
||||||
</Style>
|
</Style>
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
|
|
||||||
<ControlTheme
|
<ControlTheme x:Key="SolidDropDownButton" TargetType="DropDownButton">
|
||||||
x:Key="SolidDropDownButton"
|
<Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
BasedOn="{StaticResource {x:Type DropDownButton}}"
|
<Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
|
||||||
TargetType="DropDownButton">
|
<Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
<Setter Property="DropDownButton.CornerRadius" Value="{DynamicResource ButtonCornerRadius}" />
|
||||||
<Style Selector="^ /template/ Border#RootBorder">
|
<Setter Property="DropDownButton.BorderThickness" Value="{DynamicResource ButtonBorderThickness}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
|
<Setter Property="DropDownButton.Padding" Value="{DynamicResource ButtonDefaultPadding}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
|
<Setter Property="DropDownButton.RenderTransform" Value="none" />
|
||||||
</Style>
|
<Setter Property="DropDownButton.FontSize" Value="{DynamicResource ButtonDefaultFontSize}" />
|
||||||
<Style Selector="^:pointerover /template/ Border#RootBorder">
|
<Setter Property="DropDownButton.FontWeight" Value="{DynamicResource ButtonDefaultFontWeight}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
|
<Setter Property="DropDownButton.HorizontalContentAlignment" Value="Center" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
|
<Setter Property="DropDownButton.VerticalContentAlignment" Value="Center" />
|
||||||
</Style>
|
<Setter Property="DropDownButton.MinHeight" Value="12" />
|
||||||
<Style Selector="^:pressed /template/ Border#RootBorder">
|
<Setter Property="DropDownButton.Cursor" Value="Hand" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
|
<Setter Property="Template">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
|
<ControlTemplate TargetType="DropDownButton">
|
||||||
|
<Border
|
||||||
|
x:Name="RootBorder"
|
||||||
|
Background="{TemplateBinding Background}"
|
||||||
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
|
ClipToBounds="True"
|
||||||
|
CornerRadius="{TemplateBinding CornerRadius}">
|
||||||
|
<Grid x:Name="InnerGrid" ColumnDefinitions="*,Auto">
|
||||||
|
<ContentPresenter
|
||||||
|
x:Name="PART_ContentPresenter"
|
||||||
|
Grid.Column="0"
|
||||||
|
Padding="{TemplateBinding Padding}"
|
||||||
|
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||||
|
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||||
|
Content="{TemplateBinding Content}"
|
||||||
|
ContentTemplate="{TemplateBinding ContentTemplate}"
|
||||||
|
RecognizesAccessKey="True" />
|
||||||
|
<PathIcon
|
||||||
|
x:Name="DropDownGlyph"
|
||||||
|
Grid.Column="1"
|
||||||
|
Width="12"
|
||||||
|
Height="12"
|
||||||
|
Margin="0,0,8,0"
|
||||||
|
HorizontalAlignment="Right"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Data="{DynamicResource DropDownButtonIconGlyph}"
|
||||||
|
Foreground="{TemplateBinding Foreground}"
|
||||||
|
IsHitTestVisible="False"
|
||||||
|
UseLayoutRounding="False" />
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter>
|
||||||
|
|
||||||
|
<Style Selector="^:pressed">
|
||||||
|
<Setter Property="RenderTransform" Value="scale(0.98)" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^.Primary">
|
<Style Selector="^.Primary">
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Style Selector="^ /template/ Border#RootBorder">
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
|
<Style Selector="^:pointerover">
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pointerover /template/ Border#RootBorder">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:pressed /template/ Border#RootBorder">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Secondary">
|
<Style Selector="^.Secondary">
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Style Selector="^ /template/ Border#RootBorder">
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
|
<Style Selector="^:pointerover">
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pointerover /template/ Border#RootBorder">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:pressed /template/ Border#RootBorder">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Tertiary">
|
<Style Selector="^.Tertiary">
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Style Selector="^ /template/ Border#RootBorder">
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
|
<Style Selector="^:pointerover">
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pointerover /template/ Border#RootBorder">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:pressed /template/ Border#RootBorder">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Success">
|
<Style Selector="^.Success">
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Style Selector="^ /template/ Border#RootBorder">
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
|
<Style Selector="^:pointerover">
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pointerover /template/ Border#RootBorder">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:pressed /template/ Border#RootBorder">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Warning">
|
<Style Selector="^.Warning">
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Style Selector="^ /template/ Border#RootBorder">
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
|
<Style Selector="^:pointerover">
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pointerover /template/ Border#RootBorder">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:pressed /template/ Border#RootBorder">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Danger">
|
<Style Selector="^.Danger">
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Style Selector="^ /template/ Border#RootBorder">
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
|
<Style Selector="^:pointerover">
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pointerover /template/ Border#RootBorder">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:pressed /template/ Border#RootBorder">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:disabled /template/ Border#RootBorder">
|
|
||||||
|
<Style Selector="^:disabled">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidDisabledBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidDisabledBackground}" />
|
||||||
</Style>
|
|
||||||
<Style Selector="^:disabled">
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
@@ -242,32 +243,28 @@
|
|||||||
x:Key="OutlineDropDownButton"
|
x:Key="OutlineDropDownButton"
|
||||||
BasedOn="{StaticResource {x:Type DropDownButton}}"
|
BasedOn="{StaticResource {x:Type DropDownButton}}"
|
||||||
TargetType="DropDownButton">
|
TargetType="DropDownButton">
|
||||||
<Style Selector="^ /template/ Border#RootBorder">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
||||||
</Style>
|
<Style Selector="^:pointerover">
|
||||||
<Style Selector="^:pointerover /template/ Border#RootBorder">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonOutlinePointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonOutlinePointeroverBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:pressed /template/ Border#RootBorder">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonOutlinePressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonOutlinePressedBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Success /template/ Border#RootBorder">
|
<Style Selector="^.Success">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineSuccessBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineSuccessBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Warning /template/ Border#RootBorder">
|
<Style Selector="^.Warning">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineWarningBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineWarningBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Danger /template/ Border#RootBorder">
|
<Style Selector="^.Danger">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineDangerBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineDangerBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:disabled /template/ Border#RootBorder">
|
<Style Selector="^:disabled">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
|
||||||
</Style>
|
|
||||||
<Style Selector="^:disabled">
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
@@ -276,13 +273,12 @@
|
|||||||
x:Key="BorderlessDropDownButton"
|
x:Key="BorderlessDropDownButton"
|
||||||
BasedOn="{StaticResource {x:Type DropDownButton}}"
|
BasedOn="{StaticResource {x:Type DropDownButton}}"
|
||||||
TargetType="DropDownButton">
|
TargetType="DropDownButton">
|
||||||
<Style Selector="^ /template/ Border#RootBorder">
|
<Setter Property="DropDownButton.Background" Value="Transparent" />
|
||||||
<Setter Property="Background" Value="Transparent" />
|
<Setter Property="DropDownButton.BorderBrush" Value="Transparent" />
|
||||||
<Setter Property="BorderBrush" Value="Transparent" />
|
<Style Selector="^:disabled">
|
||||||
</Style>
|
|
||||||
<Style Selector="^:disabled /template/ Border#RootBorder">
|
|
||||||
<Setter Property="BorderBrush" Value="Transparent" />
|
<Setter Property="BorderBrush" Value="Transparent" />
|
||||||
<Setter Property="Background" Value="Transparent" />
|
<Setter Property="Background" Value="Transparent" />
|
||||||
|
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|||||||
@@ -1,118 +0,0 @@
|
|||||||
<ResourceDictionary
|
|
||||||
x:CompileBindings="True"
|
|
||||||
xmlns="https://github.com/avaloniaui"
|
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
|
||||||
<ControlTheme TargetType="HyperlinkButton" x:Key="{x:Type HyperlinkButton}">
|
|
||||||
<Setter Property="Padding" Value="0,0,0,0" />
|
|
||||||
<Setter Property="HorizontalAlignment" Value="Left" />
|
|
||||||
<Setter Property="VerticalAlignment" Value="Top" />
|
|
||||||
<Setter Property="Cursor" Value="Hand" />
|
|
||||||
<Setter Property="HorizontalContentAlignment" Value="Left" />
|
|
||||||
<Setter Property="VerticalContentAlignment" Value="Center" />
|
|
||||||
<Setter Property="FontSize" Value="{DynamicResource HyperlinkButtonFontSize}" />
|
|
||||||
<Setter Property="MinHeight" Value="32" />
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonForeground}" />
|
|
||||||
<Setter Property="Background" Value="{DynamicResource HyperlinkButtonDefaultBackground}" />
|
|
||||||
<Setter Property="Template">
|
|
||||||
<ControlTemplate TargetType="HyperlinkButton">
|
|
||||||
<Grid ColumnDefinitions="Auto,*" x:Name="RootGrid">
|
|
||||||
<Grid
|
|
||||||
Grid.Column="0"
|
|
||||||
IsVisible="False"
|
|
||||||
Margin="0,0,8,0"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
x:Name="IconGrid">
|
|
||||||
<Border
|
|
||||||
Background="{DynamicResource HyperlinkButtonDefaultBackground}"
|
|
||||||
Height="{DynamicResource HyperlinkButtonIconHeight}"
|
|
||||||
Opacity="0"
|
|
||||||
UseLayoutRounding="False"
|
|
||||||
Width="{DynamicResource HyperlinkButtonIconWidth}"
|
|
||||||
x:Name="BackgroundRectangle" />
|
|
||||||
<PathIcon
|
|
||||||
Data="{DynamicResource HyperlinkButtonLinkGlyph}"
|
|
||||||
Foreground="{DynamicResource HyperlinkButtonForeground}"
|
|
||||||
Height="{DynamicResource HyperlinkButtonLinkGlyphHeight}"
|
|
||||||
Name="LinkGlyph"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Width="{DynamicResource HyperlinkButtonLinkGlyphWidth}" />
|
|
||||||
</Grid>
|
|
||||||
<ContentPresenter
|
|
||||||
Content="{TemplateBinding Content}"
|
|
||||||
ContentTemplate="{TemplateBinding ContentTemplate}"
|
|
||||||
Cursor="{TemplateBinding Cursor}"
|
|
||||||
Grid.Column="1"
|
|
||||||
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
|
|
||||||
Padding="0,0,0,0"
|
|
||||||
RecognizesAccessKey="True"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
x:Name="ContentPresenter" />
|
|
||||||
</Grid>
|
|
||||||
</ControlTemplate>
|
|
||||||
</Setter>
|
|
||||||
|
|
||||||
<Style Selector="^:pointerover">
|
|
||||||
<Style Selector="^ /template/ PathIcon#LinkGlyph">
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^ /template/ ContentPresenter#ContentPresenter">
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
|
|
||||||
</Style>
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<!-- Unvisited Pressed State -->
|
|
||||||
<Style Selector="^:pressed">
|
|
||||||
<Setter Property="RenderTransform" Value="scale(0.98)" />
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<!-- Unvisited Disabled state -->
|
|
||||||
<Style Selector="^:disabled">
|
|
||||||
<Style Selector="^ /template/ PathIcon#LinkGlyph">
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^ /template/ ContentPresenter#ContentPresenter">
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
|
|
||||||
</Style>
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<Style Selector="^:visited">
|
|
||||||
<Style Selector="^ /template/ PathIcon#LinkGlyph">
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonVisitedForeground}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^ /template/ ContentPresenter#ContentPresenter">
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonVisitedForeground}" />
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<!-- Visited Pointerover State -->
|
|
||||||
<Style Selector="^:pointerover">
|
|
||||||
<Style Selector="^ /template/ PathIcon#LinkGlyph">
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^ /template/ ContentPresenter#ContentPresenter">
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
|
|
||||||
</Style>
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<!-- Visited Pressed State -->
|
|
||||||
<Style Selector="^:pressed">
|
|
||||||
<Setter Property="RenderTransform" Value="scale(0.98)" />
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<!-- Visited Disabled State -->
|
|
||||||
<Style Selector="^:disabled">
|
|
||||||
<Style Selector="^ /template/ PathIcon#LinkGlyph">
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^ /template/ ContentPresenter#ContentPresenter">
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
|
|
||||||
</Style>
|
|
||||||
</Style>
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<Style Selector="^.WithIcon">
|
|
||||||
<Style Selector="^ /template/ Grid#IconGrid">
|
|
||||||
<Setter Property="IsVisible" Value="True" />
|
|
||||||
</Style>
|
|
||||||
</Style>
|
|
||||||
</ControlTheme>
|
|
||||||
</ResourceDictionary>
|
|
||||||
@@ -27,10 +27,10 @@
|
|||||||
RenderTransform="{x:Null}">
|
RenderTransform="{x:Null}">
|
||||||
<RepeatButton.IsVisible>
|
<RepeatButton.IsVisible>
|
||||||
<MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}" ConverterParameter="0">
|
<MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}" ConverterParameter="0">
|
||||||
<Binding Path="VerticalScrollBarVisibility" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="VerticalScrollBarVisibility" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
<Binding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
<Binding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
<Binding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
</MultiBinding>
|
</MultiBinding>
|
||||||
</RepeatButton.IsVisible>
|
</RepeatButton.IsVisible>
|
||||||
<PathIcon
|
<PathIcon
|
||||||
@@ -50,10 +50,10 @@
|
|||||||
RenderTransform="{x:Null}">
|
RenderTransform="{x:Null}">
|
||||||
<RepeatButton.IsVisible>
|
<RepeatButton.IsVisible>
|
||||||
<MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}" ConverterParameter="100">
|
<MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}" ConverterParameter="100">
|
||||||
<Binding Path="VerticalScrollBarVisibility" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="VerticalScrollBarVisibility" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
<Binding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
<Binding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
<Binding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
</MultiBinding>
|
</MultiBinding>
|
||||||
</RepeatButton.IsVisible>
|
</RepeatButton.IsVisible>
|
||||||
<PathIcon
|
<PathIcon
|
||||||
@@ -120,26 +120,14 @@
|
|||||||
CornerRadius="{TemplateBinding CornerRadius}">
|
CornerRadius="{TemplateBinding CornerRadius}">
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="Auto" SharedSizeGroup="ToggleIcon" />
|
|
||||||
<ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIcon" />
|
<ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIcon" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
<ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGT" />
|
<ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGT" />
|
||||||
<ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemChevron" />
|
<ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemChevron" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
<ContentControl
|
|
||||||
Name="PART_ToggleIconPresenter"
|
|
||||||
Grid.Column="0"
|
|
||||||
Width="16"
|
|
||||||
Height="16"
|
|
||||||
Margin="{DynamicResource MenuItemIconMargin}"
|
|
||||||
HorizontalAlignment="Center"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
IsVisible="False" />
|
|
||||||
|
|
||||||
<Viewbox
|
<Viewbox
|
||||||
Name="PART_IconPresenter"
|
Name="PART_IconPresenter"
|
||||||
Grid.Column="1"
|
|
||||||
Width="16"
|
Width="16"
|
||||||
Height="16"
|
Height="16"
|
||||||
Margin="{DynamicResource MenuItemIconMargin}"
|
Margin="{DynamicResource MenuItemIconMargin}"
|
||||||
@@ -155,7 +143,7 @@
|
|||||||
|
|
||||||
<ContentPresenter
|
<ContentPresenter
|
||||||
Name="PART_HeaderPresenter"
|
Name="PART_HeaderPresenter"
|
||||||
Grid.Column="2"
|
Grid.Column="1"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Content="{TemplateBinding Header}"
|
Content="{TemplateBinding Header}"
|
||||||
@@ -163,7 +151,7 @@
|
|||||||
RecognizesAccessKey="True" />
|
RecognizesAccessKey="True" />
|
||||||
<TextBlock
|
<TextBlock
|
||||||
x:Name="PART_InputGestureText"
|
x:Name="PART_InputGestureText"
|
||||||
Grid.Column="3"
|
Grid.Column="2"
|
||||||
Margin="{DynamicResource MenuItemInputGestureTextMargin}"
|
Margin="{DynamicResource MenuItemInputGestureTextMargin}"
|
||||||
HorizontalAlignment="Right"
|
HorizontalAlignment="Right"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
@@ -172,7 +160,7 @@
|
|||||||
Converter={StaticResource KeyGestureConverter}}" />
|
Converter={StaticResource KeyGestureConverter}}" />
|
||||||
<PathIcon
|
<PathIcon
|
||||||
Name="PART_ExpandIcon"
|
Name="PART_ExpandIcon"
|
||||||
Grid.Column="4"
|
Grid.Column="3"
|
||||||
Width="8"
|
Width="8"
|
||||||
Height="8"
|
Height="8"
|
||||||
Margin="{DynamicResource MenuItemExpandIconMargin}"
|
Margin="{DynamicResource MenuItemExpandIconMargin}"
|
||||||
@@ -257,27 +245,6 @@
|
|||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
</Setter>
|
</Setter>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^:checked:toggle /template/ ContentControl#PART_ToggleIconPresenter">
|
|
||||||
<Setter Property="IsVisible" Value="True" />
|
|
||||||
<Setter Property="Content">
|
|
||||||
<Template>
|
|
||||||
<PathIcon
|
|
||||||
Foreground="{Binding $parent[MenuItem].Foreground}"
|
|
||||||
Data="{StaticResource MenuCheckGlyph}" />
|
|
||||||
</Template>
|
|
||||||
</Setter>
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<Style Selector="^:checked:radio /template/ ContentControl#PART_ToggleIconPresenter">
|
|
||||||
<Setter Property="IsVisible" Value="True" />
|
|
||||||
<Setter Property="Content">
|
|
||||||
<Template>
|
|
||||||
<Ellipse Fill="{Binding $parent[MenuItem].Foreground}"
|
|
||||||
Margin="4" Width="8" Height="8" />
|
|
||||||
</Template>
|
|
||||||
</Setter>
|
|
||||||
</Style>
|
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
|
|
||||||
<ControlTheme x:Key="TopLevelMenuItem" TargetType="MenuItem">
|
<ControlTheme x:Key="TopLevelMenuItem" TargetType="MenuItem">
|
||||||
|
|||||||
@@ -4,10 +4,8 @@
|
|||||||
x:CompileBindings="True">
|
x:CompileBindings="True">
|
||||||
<!-- Add Resources Here -->
|
<!-- Add Resources Here -->
|
||||||
<ControlTheme x:Key="{x:Type NumericUpDown}" TargetType="NumericUpDown">
|
<ControlTheme x:Key="{x:Type NumericUpDown}" TargetType="NumericUpDown">
|
||||||
<Setter Property="NumericUpDown.VerticalAlignment" Value="Center" />
|
|
||||||
<Setter Property="NumericUpDown.VerticalContentAlignment" Value="Center" />
|
<Setter Property="NumericUpDown.VerticalContentAlignment" Value="Center" />
|
||||||
<Setter Property="NumericUpDown.CornerRadius" Value="{DynamicResource NumericUpDownCornerRadius}" />
|
<Setter Property="NumericUpDown.CornerRadius" Value="{DynamicResource NumericUpDownCornerRadius}" />
|
||||||
<Setter Property="NumericUpDown.MinHeight" Value="{DynamicResource NumericUpDownDefaultHeight}" />
|
|
||||||
<Setter Property="NumericUpDown.Template">
|
<Setter Property="NumericUpDown.Template">
|
||||||
<ControlTemplate TargetType="NumericUpDown">
|
<ControlTemplate TargetType="NumericUpDown">
|
||||||
<DataValidationErrors>
|
<DataValidationErrors>
|
||||||
@@ -25,32 +23,29 @@
|
|||||||
<TextBox
|
<TextBox
|
||||||
Name="PART_TextBox"
|
Name="PART_TextBox"
|
||||||
Height="{TemplateBinding Height}"
|
Height="{TemplateBinding Height}"
|
||||||
MinHeight="{TemplateBinding MinHeight}"
|
MinHeight="{DynamicResource NumericUpDownWrapperDefaultHeight}"
|
||||||
VerticalAlignment="Stretch"
|
|
||||||
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
|
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||||
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
|
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||||
AcceptsReturn="False"
|
AcceptsReturn="False"
|
||||||
CornerRadius="{TemplateBinding CornerRadius}"
|
CornerRadius="{TemplateBinding CornerRadius}"
|
||||||
DataValidationErrors.Errors="{Binding $parent[NumericUpDown].(DataValidationErrors.Errors)}"
|
DataValidationErrors.Errors="{ReflectionBinding $parent[NumericUpDown].(DataValidationErrors.Errors)}"
|
||||||
FontSize="{TemplateBinding FontSize}"
|
FontSize="{TemplateBinding FontSize}"
|
||||||
Foreground="{TemplateBinding Foreground}"
|
Foreground="{TemplateBinding Foreground}"
|
||||||
IsReadOnly="{TemplateBinding IsReadOnly}"
|
IsReadOnly="{TemplateBinding IsReadOnly}"
|
||||||
Text="{TemplateBinding Text}"
|
Text="{TemplateBinding Text}"
|
||||||
TextWrapping="NoWrap"
|
TextWrapping="NoWrap"
|
||||||
Theme="{DynamicResource NonErrorTextBox}"
|
Theme="{DynamicResource NonErrorTextBox}"
|
||||||
InnerLeftContent="{TemplateBinding InnerLeftContent}"
|
|
||||||
InnerRightContent="{TemplateBinding InnerRightContent}"
|
|
||||||
Watermark="{TemplateBinding Watermark}" />
|
Watermark="{TemplateBinding Watermark}" />
|
||||||
</ButtonSpinner>
|
</ButtonSpinner>
|
||||||
</DataValidationErrors>
|
</DataValidationErrors>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
</Setter>
|
</Setter>
|
||||||
|
|
||||||
<Style Selector="^.Large">
|
<Style Selector="^.Large /template/ TextBox#PART_TextBox">
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource NumericUpDownLargeHeight}" />
|
<Setter Property="MinHeight" Value="{DynamicResource NumericUpDownWrapperLargeHeight}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Small">
|
<Style Selector="^.Small /template/ TextBox#PART_TextBox">
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource NumericUpDownSmallHeight}" />
|
<Setter Property="MinHeight" Value="{DynamicResource NumericUpDownWrapperSmallHeight}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^:error">
|
<Style Selector="^:error">
|
||||||
|
|||||||
@@ -159,7 +159,7 @@
|
|||||||
<TextBlock.Text>
|
<TextBlock.Text>
|
||||||
<MultiBinding Converter="{StaticResource StringFormatConverter}">
|
<MultiBinding Converter="{StaticResource StringFormatConverter}">
|
||||||
<TemplateBinding Property="ProgressTextFormat" />
|
<TemplateBinding Property="ProgressTextFormat" />
|
||||||
<Binding Path="Value" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="Value" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
<TemplateBinding Property="Percentage" />
|
<TemplateBinding Property="Percentage" />
|
||||||
<TemplateBinding Property="Minimum" />
|
<TemplateBinding Property="Minimum" />
|
||||||
<TemplateBinding Property="Maximum" />
|
<TemplateBinding Property="Maximum" />
|
||||||
|
|||||||
@@ -28,27 +28,21 @@
|
|||||||
<Setter Property="IsTabStop" Value="False" />
|
<Setter Property="IsTabStop" Value="False" />
|
||||||
<Setter Property="IsHitTestVisible" Value="False" />
|
<Setter Property="IsHitTestVisible" Value="False" />
|
||||||
<Setter Property="Height" Value="100" />
|
<Setter Property="Height" Value="100" />
|
||||||
<Setter Property="Background" Value="{DynamicResource RefreshVisualizerIconBackground}" />
|
<Setter Property="Background" Value="{DynamicResource RefreshContainerIconBackground}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource RefreshVisualizerIconForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource RefreshContainerIconForeground}" />
|
||||||
<Setter Property="Content">
|
|
||||||
<Template>
|
|
||||||
<Arc
|
|
||||||
Name="PART_Icon"
|
|
||||||
Width="{DynamicResource RefreshVisualizerIconSize}"
|
|
||||||
Height="{DynamicResource RefreshVisualizerIconSize}"
|
|
||||||
StartAngle="0"
|
|
||||||
Stroke="{DynamicResource RefreshVisualizerIconForeground}"
|
|
||||||
StrokeThickness="3"
|
|
||||||
StrokeLineCap="Round"
|
|
||||||
SweepAngle="270" />
|
|
||||||
</Template>
|
|
||||||
</Setter>
|
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<ControlTemplate>
|
<ControlTemplate>
|
||||||
<Grid Name="PART_Root"
|
<Grid
|
||||||
MinHeight="80"
|
Name="PART_Root"
|
||||||
Background="{TemplateBinding Background}" />
|
MinHeight="80"
|
||||||
|
Background="{TemplateBinding Background}">
|
||||||
|
<Grid.Styles>
|
||||||
|
<Style Selector="PathIcon#PART_Icon">
|
||||||
|
<Setter Property="Data" Value="{DynamicResource RefreshContainerIconGlyph}" />
|
||||||
|
</Style>
|
||||||
|
</Grid.Styles>
|
||||||
|
</Grid>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
</Setter>
|
</Setter>
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|||||||
@@ -3,32 +3,28 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
x:CompileBindings="True">
|
x:CompileBindings="True">
|
||||||
<ControlTheme x:Key="{x:Type RepeatButton}" TargetType="RepeatButton">
|
<ControlTheme x:Key="{x:Type RepeatButton}" TargetType="RepeatButton">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonDefaultBackground}" />
|
<Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonDefaultBackground}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
|
<Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultBorderBrush}" />
|
<Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonDefaultBorderBrush}" />
|
||||||
<Setter Property="CornerRadius" Value="{DynamicResource ButtonCornerRadius}" />
|
<Setter Property="RepeatButton.CornerRadius" Value="{DynamicResource ButtonCornerRadius}" />
|
||||||
<Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThickness}" />
|
<Setter Property="RepeatButton.BorderThickness" Value="{DynamicResource ButtonBorderThickness}" />
|
||||||
<Setter Property="Padding" Value="{DynamicResource ButtonDefaultPadding}" />
|
<Setter Property="RepeatButton.Padding" Value="{DynamicResource ButtonDefaultPadding}" />
|
||||||
<Setter Property="HorizontalAlignment" Value="Center" />
|
<Setter Property="RepeatButton.RenderTransform" Value="none" />
|
||||||
<Setter Property="VerticalAlignment" Value="Center" />
|
<Setter Property="RepeatButton.FontSize" Value="{DynamicResource ButtonDefaultFontSize}" />
|
||||||
<Setter Property="RenderTransform" Value="none" />
|
<Setter Property="RepeatButton.FontWeight" Value="{DynamicResource ButtonDefaultFontWeight}" />
|
||||||
<Setter Property="FontSize" Value="{DynamicResource ButtonDefaultFontSize}" />
|
<Setter Property="RepeatButton.HorizontalContentAlignment" Value="Center" />
|
||||||
<Setter Property="FontWeight" Value="{DynamicResource ButtonDefaultFontWeight}" />
|
<Setter Property="RepeatButton.VerticalContentAlignment" Value="Center" />
|
||||||
<Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
|
<Setter Property="RepeatButton.MinHeight" Value="12" />
|
||||||
<Setter Property="HorizontalContentAlignment" Value="Center" />
|
<Setter Property="RepeatButton.Cursor" Value="Hand" />
|
||||||
<Setter Property="VerticalContentAlignment" Value="Center" />
|
<Setter Property="RepeatButton.Template">
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource ButtonDefaultHeight}" />
|
|
||||||
<Setter Property="Cursor" Value="Hand" />
|
|
||||||
<Setter Property="Template">
|
|
||||||
<ControlTemplate TargetType="RepeatButton">
|
<ControlTemplate TargetType="RepeatButton">
|
||||||
<ContentPresenter
|
<ContentPresenter
|
||||||
x:Name="PART_ContentPresenter"
|
x:Name="PART_ContentPresenter"
|
||||||
Padding="{TemplateBinding Padding}"
|
Padding="{TemplateBinding Padding}"
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
VerticalAlignment="Stretch"
|
|
||||||
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
|
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||||
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
|
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||||
BackgroundSizing="{TemplateBinding BackgroundSizing}"
|
Background="{TemplateBinding Background}"
|
||||||
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
BorderThickness="{TemplateBinding BorderThickness}"
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
Content="{TemplateBinding Content}"
|
Content="{TemplateBinding Content}"
|
||||||
ContentTemplate="{TemplateBinding ContentTemplate}"
|
ContentTemplate="{TemplateBinding ContentTemplate}"
|
||||||
@@ -44,11 +40,6 @@
|
|||||||
<Setter Property="RenderTransform" Value="scale(0.98)" />
|
<Setter Property="RenderTransform" Value="scale(0.98)" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
|
|
||||||
<Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush}" />
|
|
||||||
<Setter Property="Background" Value="{TemplateBinding Background}" />
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<Style Selector="^.Primary">
|
<Style Selector="^.Primary">
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
@@ -68,27 +59,25 @@
|
|||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:pointerover">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:disabled">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^.Large">
|
<Style Selector="^.Large">
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource ButtonLargeHeight}" />
|
|
||||||
<Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
|
<Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Small">
|
<Style Selector="^.Small">
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource ButtonSmallHeight}" />
|
|
||||||
<Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
|
<Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
|
||||||
</Style>
|
</Style>
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
@@ -97,113 +86,90 @@
|
|||||||
x:Key="SolidRepeatButton"
|
x:Key="SolidRepeatButton"
|
||||||
BasedOn="{StaticResource {x:Type RepeatButton}}"
|
BasedOn="{StaticResource {x:Type RepeatButton}}"
|
||||||
TargetType="RepeatButton">
|
TargetType="RepeatButton">
|
||||||
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
|
<Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
|
<Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
|
||||||
|
<Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
|
||||||
|
|
||||||
|
<Style Selector="^.Primary">
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
|
||||||
</Style>
|
<Style Selector="^:pointerover">
|
||||||
|
|
||||||
<Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
|
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
|
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<Style Selector="^.Primary">
|
|
||||||
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
|
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Secondary">
|
<Style Selector="^.Secondary">
|
||||||
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
|
<Style Selector="^:pointerover">
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Tertiary">
|
<Style Selector="^.Tertiary">
|
||||||
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
|
<Style Selector="^:pointerover">
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Success">
|
<Style Selector="^.Success">
|
||||||
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
|
<Style Selector="^:pointerover">
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Warning">
|
<Style Selector="^.Warning">
|
||||||
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
|
<Style Selector="^:pointerover">
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Danger">
|
<Style Selector="^.Danger">
|
||||||
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
|
<Style Selector="^:pointerover">
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:disabled">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidDisabledBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidDisabledBackground}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
||||||
@@ -214,28 +180,26 @@
|
|||||||
x:Key="OutlineRepeatButton"
|
x:Key="OutlineRepeatButton"
|
||||||
BasedOn="{StaticResource {x:Type RepeatButton}}"
|
BasedOn="{StaticResource {x:Type RepeatButton}}"
|
||||||
TargetType="RepeatButton">
|
TargetType="RepeatButton">
|
||||||
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
|
<Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
<Style Selector="^:pointerover">
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonOutlinePointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonOutlinePointeroverBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:pressed">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonOutlinePressedBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonOutlinePressedBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Success /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^.Success">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineSuccessBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineSuccessBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Warning /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^.Warning">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineWarningBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineWarningBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Danger /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^.Danger">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineDangerBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineDangerBorderBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
|
<Style Selector="^:disabled">
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
||||||
@@ -246,11 +210,9 @@
|
|||||||
x:Key="BorderlessRepeatButton"
|
x:Key="BorderlessRepeatButton"
|
||||||
BasedOn="{StaticResource {x:Type RepeatButton}}"
|
BasedOn="{StaticResource {x:Type RepeatButton}}"
|
||||||
TargetType="RepeatButton">
|
TargetType="RepeatButton">
|
||||||
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
|
<Setter Property="RepeatButton.Background" Value="Transparent" />
|
||||||
<Setter Property="Background" Value="Transparent" />
|
<Setter Property="RepeatButton.BorderBrush" Value="Transparent" />
|
||||||
<Setter Property="BorderBrush" Value="Transparent" />
|
<Style Selector="^:disabled">
|
||||||
</Style>
|
|
||||||
<Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
|
|
||||||
<Setter Property="BorderBrush" Value="Transparent" />
|
<Setter Property="BorderBrush" Value="Transparent" />
|
||||||
<Setter Property="Background" Value="Transparent" />
|
<Setter Property="Background" Value="Transparent" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
||||||
|
|||||||
@@ -319,10 +319,10 @@
|
|||||||
DockPanel.Dock="Top">
|
DockPanel.Dock="Top">
|
||||||
<RepeatButton.IsVisible>
|
<RepeatButton.IsVisible>
|
||||||
<MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}" ConverterParameter="0">
|
<MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}" ConverterParameter="0">
|
||||||
<Binding Path="VerticalScrollBarVisibility" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="VerticalScrollBarVisibility" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
<Binding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
<Binding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
<Binding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
</MultiBinding>
|
</MultiBinding>
|
||||||
</RepeatButton.IsVisible>
|
</RepeatButton.IsVisible>
|
||||||
<Path Data="M 0 4 L 8 4 L 4 0 Z" />
|
<Path Data="M 0 4 L 8 4 L 4 0 Z" />
|
||||||
@@ -334,10 +334,10 @@
|
|||||||
DockPanel.Dock="Bottom">
|
DockPanel.Dock="Bottom">
|
||||||
<RepeatButton.IsVisible>
|
<RepeatButton.IsVisible>
|
||||||
<MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}" ConverterParameter="100">
|
<MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}" ConverterParameter="100">
|
||||||
<Binding Path="VerticalScrollBarVisibility" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="VerticalScrollBarVisibility" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
<Binding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
<Binding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
<Binding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
|
<ReflectionBinding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
|
||||||
</MultiBinding>
|
</MultiBinding>
|
||||||
</RepeatButton.IsVisible>
|
</RepeatButton.IsVisible>
|
||||||
<Path Data="M 0 0 L 4 4 L 8 0 Z" />
|
<Path Data="M 0 0 L 4 4 L 8 0 Z" />
|
||||||
|
|||||||
@@ -17,7 +17,6 @@
|
|||||||
<Setter Property="SelectableTextBlock.FontSize" Value="{DynamicResource TextBlockFontSize}" />
|
<Setter Property="SelectableTextBlock.FontSize" Value="{DynamicResource TextBlockFontSize}" />
|
||||||
<Setter Property="SelectableTextBlock.Cursor" Value="Ibeam" />
|
<Setter Property="SelectableTextBlock.Cursor" Value="Ibeam" />
|
||||||
<Setter Property="SelectableTextBlock.SelectionBrush" Value="{DynamicResource TextBlockSelectionBackground}" />
|
<Setter Property="SelectableTextBlock.SelectionBrush" Value="{DynamicResource TextBlockSelectionBackground}" />
|
||||||
<Setter Property="SelectableTextBlock.SelectionForegroundBrush" Value="{DynamicResource TextBlockSelectionForeground}" />
|
|
||||||
<Style Selector="^.Secondary">
|
<Style Selector="^.Secondary">
|
||||||
<Setter Property="Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|||||||
@@ -2,135 +2,79 @@
|
|||||||
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">
|
|
||||||
<SplitButton>Hello</SplitButton>
|
|
||||||
</StackPanel>
|
|
||||||
</Design.PreviewWith>
|
|
||||||
|
|
||||||
<ControlTheme x:Key="SemiSplitButtonElement" TargetType="Button">
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
|
|
||||||
<Setter Property="CornerRadius" Value="{DynamicResource ButtonCornerRadius}" />
|
|
||||||
<Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThickness}" />
|
|
||||||
<Setter Property="Padding" Value="{DynamicResource ButtonDefaultPadding}" />
|
|
||||||
<Setter Property="HorizontalAlignment" Value="Center" />
|
|
||||||
<Setter Property="VerticalAlignment" Value="Center" />
|
|
||||||
<Setter Property="RenderTransform" Value="none" />
|
|
||||||
<Setter Property="FontSize" Value="{DynamicResource ButtonDefaultFontSize}" />
|
|
||||||
<Setter Property="FontWeight" Value="{DynamicResource ButtonDefaultFontWeight}" />
|
|
||||||
<Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
|
|
||||||
<Setter Property="HorizontalContentAlignment" Value="Center" />
|
|
||||||
<Setter Property="VerticalContentAlignment" Value="Center" />
|
|
||||||
<Setter Property="Cursor" Value="Hand" />
|
|
||||||
<Setter Property="Template">
|
|
||||||
<ControlTemplate TargetType="Button">
|
|
||||||
<ContentPresenter
|
|
||||||
x:Name="PART_ContentPresenter"
|
|
||||||
Padding="{TemplateBinding Padding}"
|
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
VerticalAlignment="Stretch"
|
|
||||||
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
|
|
||||||
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
|
|
||||||
Background="{TemplateBinding Background}"
|
|
||||||
BackgroundSizing="{TemplateBinding BackgroundSizing}"
|
|
||||||
BorderBrush="{TemplateBinding BorderBrush}"
|
|
||||||
BorderThickness="{TemplateBinding BorderThickness}"
|
|
||||||
Content="{TemplateBinding Content}"
|
|
||||||
ContentTemplate="{TemplateBinding ContentTemplate}"
|
|
||||||
CornerRadius="{TemplateBinding CornerRadius}"
|
|
||||||
RecognizesAccessKey="True"
|
|
||||||
TextElement.FontSize="{TemplateBinding FontSize}"
|
|
||||||
TextElement.FontWeight="{TemplateBinding FontWeight}"
|
|
||||||
UseLayoutRounding="False" />
|
|
||||||
</ControlTemplate>
|
|
||||||
</Setter>
|
|
||||||
</ControlTheme>
|
|
||||||
|
|
||||||
<ControlTheme x:Key="{x:Type SplitButton}" TargetType="SplitButton">
|
<ControlTheme x:Key="{x:Type SplitButton}" TargetType="SplitButton">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonDefaultBackground}" />
|
<Setter Property="SplitButton.Background" Value="{DynamicResource ButtonDefaultBackground}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
|
<Setter Property="SplitButton.Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultBorderBrush}" />
|
<Setter Property="SplitButton.BorderBrush" Value="{DynamicResource ButtonDefaultBorderBrush}" />
|
||||||
<Setter Property="CornerRadius" Value="{DynamicResource ButtonCornerRadius}" />
|
<Setter Property="SplitButton.CornerRadius" Value="{DynamicResource ButtonCornerRadius}" />
|
||||||
<Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThickness}" />
|
<Setter Property="SplitButton.BorderThickness" Value="{DynamicResource ButtonBorderThickness}" />
|
||||||
<Setter Property="Padding" Value="{DynamicResource ButtonDefaultPadding}" />
|
<Setter Property="SplitButton.Padding" Value="{DynamicResource ButtonDefaultPadding}" />
|
||||||
<Setter Property="RenderTransform" Value="none" />
|
<Setter Property="SplitButton.RenderTransform" Value="none" />
|
||||||
<Setter Property="HorizontalAlignment" Value="Center" />
|
<Setter Property="SplitButton.FontSize" Value="{DynamicResource ButtonDefaultFontSize}" />
|
||||||
<Setter Property="VerticalAlignment" Value="Center" />
|
<Setter Property="SplitButton.FontWeight" Value="{DynamicResource ButtonDefaultFontWeight}" />
|
||||||
<Setter Property="FontSize" Value="{DynamicResource ButtonDefaultFontSize}" />
|
<Setter Property="SplitButton.HorizontalContentAlignment" Value="Center" />
|
||||||
<Setter Property="FontWeight" Value="{DynamicResource ButtonDefaultFontWeight}" />
|
<Setter Property="SplitButton.VerticalContentAlignment" Value="Center" />
|
||||||
<Setter Property="HorizontalContentAlignment" Value="Center" />
|
<Setter Property="SplitButton.MinHeight" Value="12" />
|
||||||
<Setter Property="VerticalContentAlignment" Value="Center" />
|
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource ButtonDefaultHeight}" />
|
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<ControlTemplate TargetType="SplitButton">
|
<ControlTemplate TargetType="SplitButton">
|
||||||
<Border
|
<Grid ColumnDefinitions="*,Auto,Auto">
|
||||||
BackgroundSizing="OuterBorderEdge"
|
<Button
|
||||||
ClipToBounds="True"
|
x:Name="PART_PrimaryButton"
|
||||||
CornerRadius="{TemplateBinding CornerRadius}">
|
Grid.Column="0"
|
||||||
<DockPanel>
|
Padding="{TemplateBinding Padding}"
|
||||||
<Button
|
HorizontalAlignment="Stretch"
|
||||||
x:Name="PART_SecondaryButton"
|
VerticalAlignment="Stretch"
|
||||||
Padding="4,0"
|
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||||
VerticalAlignment="Stretch"
|
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||||
HorizontalContentAlignment="Center"
|
Background="{TemplateBinding Background}"
|
||||||
VerticalContentAlignment="Center"
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
BorderThickness="{TemplateBinding BorderThickness}"
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
CornerRadius="0"
|
Command="{TemplateBinding Command}"
|
||||||
DockPanel.Dock="Right"
|
CommandParameter="{TemplateBinding CommandParameter}"
|
||||||
Focusable="False"
|
Content="{TemplateBinding Content}"
|
||||||
KeyboardNavigation.IsTabStop="False"
|
ContentTemplate="{TemplateBinding ContentTemplate}"
|
||||||
Theme="{DynamicResource SemiSplitButtonElement}">
|
CornerRadius="3 0 0 3"
|
||||||
<PathIcon
|
Focusable="False"
|
||||||
Width="12"
|
FontFamily="{TemplateBinding FontFamily}"
|
||||||
Height="12"
|
FontSize="{TemplateBinding FontSize}"
|
||||||
Data="{DynamicResource SplitButtonIconGlyph}"
|
FontWeight="{TemplateBinding FontWeight}"
|
||||||
Foreground="{Binding $parent[Button].Foreground}" />
|
Foreground="{TemplateBinding Foreground}"
|
||||||
</Button>
|
KeyboardNavigation.IsTabStop="False" />
|
||||||
<Rectangle
|
|
||||||
x:Name="SeparatorBorder"
|
<Border
|
||||||
Width="{DynamicResource SplitButtonSeparatorWidth}"
|
x:Name="SeparatorBorder"
|
||||||
VerticalAlignment="Stretch"
|
Grid.Column="1"
|
||||||
DockPanel.Dock="Right"
|
Width="{DynamicResource SplitButtonSeparatorWidth}"
|
||||||
Fill="{TemplateBinding BorderBrush}"
|
Background="Transparent"
|
||||||
StrokeThickness="0" />
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
<Button
|
BorderThickness="0.5" />
|
||||||
x:Name="PART_PrimaryButton"
|
|
||||||
Padding="{TemplateBinding Padding}"
|
<Button
|
||||||
HorizontalAlignment="Stretch"
|
x:Name="PART_SecondaryButton"
|
||||||
VerticalAlignment="Stretch"
|
Grid.Column="2"
|
||||||
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
|
Padding="4,0"
|
||||||
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
|
HorizontalAlignment="Stretch"
|
||||||
BorderThickness="{TemplateBinding BorderThickness}"
|
VerticalAlignment="Stretch"
|
||||||
Command="{TemplateBinding Command}"
|
HorizontalContentAlignment="Center"
|
||||||
CommandParameter="{TemplateBinding CommandParameter}"
|
VerticalContentAlignment="Center"
|
||||||
Content="{TemplateBinding Content}"
|
Background="{TemplateBinding Background}"
|
||||||
ContentTemplate="{TemplateBinding ContentTemplate}"
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
CornerRadius="0"
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
Focusable="False"
|
CornerRadius="0 3 3 0"
|
||||||
FontFamily="{TemplateBinding FontFamily}"
|
Focusable="False"
|
||||||
FontSize="{TemplateBinding FontSize}"
|
Foreground="{TemplateBinding Foreground}"
|
||||||
FontWeight="{TemplateBinding FontWeight}"
|
KeyboardNavigation.IsTabStop="False">
|
||||||
KeyboardNavigation.IsTabStop="False"
|
<PathIcon
|
||||||
Theme="{DynamicResource SemiSplitButtonElement}" />
|
Width="12"
|
||||||
</DockPanel>
|
Height="12"
|
||||||
</Border>
|
Data="{DynamicResource SplitButtonIconGlyph}"
|
||||||
|
Foreground="{Binding $parent[Button].Foreground}" />
|
||||||
|
</Button>
|
||||||
|
</Grid>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
</Setter>
|
</Setter>
|
||||||
|
|
||||||
<Style Selector="^ /template/ Button">
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
|
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultBorderBrush}" />
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonDefaultBackground}" />
|
|
||||||
<Style Selector="^:pointerover">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
|
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pressed">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
|
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
|
|
||||||
</Style>
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
|
|
||||||
<Style Selector="^.Secondary /template/ Button">
|
<Style Selector="^.Secondary /template/ Button">
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSecondaryForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSecondaryForeground}" />
|
||||||
@@ -151,74 +95,35 @@
|
|||||||
<Style Selector="^ /template/ Button">
|
<Style Selector="^ /template/ Button">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Style Selector="^:pointerover">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pressed">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
|
|
||||||
</Style>
|
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^.Secondary /template/ Button">
|
<Style Selector="^.Secondary /template/ Button">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
|
||||||
<Style Selector="^:pointerover">
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pressed">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
|
|
||||||
</Style>
|
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Tertiary /template/ Button">
|
<Style Selector="^.Tertiary /template/ Button">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
|
||||||
<Style Selector="^:pointerover">
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pressed">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
|
|
||||||
</Style>
|
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Success /template/ Button">
|
<Style Selector="^.Success /template/ Button">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
|
||||||
<Style Selector="^:pointerover">
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pressed">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
|
|
||||||
</Style>
|
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Warning /template/ Button">
|
<Style Selector="^.Warning /template/ Button">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
|
||||||
<Style Selector="^:pointerover">
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pressed">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
|
|
||||||
</Style>
|
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Danger /template/ Button">
|
<Style Selector="^.Danger /template/ Button">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
|
||||||
<Style Selector="^:pointerover">
|
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:pressed">
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
|
|
||||||
</Style>
|
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Large /template/ Button#PART_PrimaryButton">
|
<Style Selector="^.Large /template/ Button">
|
||||||
<Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
|
<Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Large">
|
<Style Selector="^.Small /template/ Button">
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource ButtonLargeHeight}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^.Small /template/ Button#PART_PrimaryButton">
|
|
||||||
<Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
|
<Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Small">
|
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource ButtonSmallHeight}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:disabled /template/ Button">
|
<Style Selector="^:disabled /template/ Button">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonDefaultBackground}" />
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
<!-- only for ToggleSplitButton -->
|
<!-- only for ToggleSplitButton -->
|
||||||
@@ -231,10 +136,9 @@
|
|||||||
x:Key="SolidSplitButton"
|
x:Key="SolidSplitButton"
|
||||||
BasedOn="{StaticResource {x:Type SplitButton}}"
|
BasedOn="{StaticResource {x:Type SplitButton}}"
|
||||||
TargetType="SplitButton">
|
TargetType="SplitButton">
|
||||||
|
<Setter Property="SplitButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
||||||
|
<Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
|
||||||
<Style Selector="^ /template/ Button">
|
<Style Selector="^ /template/ Button">
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
|
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
|
|
||||||
|
|
||||||
<Style Selector="^:pointerover">
|
<Style Selector="^:pointerover">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
|
||||||
</Style>
|
</Style>
|
||||||
@@ -314,9 +218,9 @@
|
|||||||
x:Key="OutlineSplitButton"
|
x:Key="OutlineSplitButton"
|
||||||
BasedOn="{StaticResource {x:Type SplitButton}}"
|
BasedOn="{StaticResource {x:Type SplitButton}}"
|
||||||
TargetType="SplitButton">
|
TargetType="SplitButton">
|
||||||
|
<Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
|
||||||
|
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
||||||
<Style Selector="^ /template/ Button">
|
<Style Selector="^ /template/ Button">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
|
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
|
|
||||||
<Style Selector="^:pointerover">
|
<Style Selector="^:pointerover">
|
||||||
<Setter Property="Background" Value="{DynamicResource ButtonOutlinePointeroverBackground}" />
|
<Setter Property="Background" Value="{DynamicResource ButtonOutlinePointeroverBackground}" />
|
||||||
</Style>
|
</Style>
|
||||||
@@ -344,14 +248,12 @@
|
|||||||
x:Key="BorderlessSplitButton"
|
x:Key="BorderlessSplitButton"
|
||||||
BasedOn="{StaticResource {x:Type SplitButton}}"
|
BasedOn="{StaticResource {x:Type SplitButton}}"
|
||||||
TargetType="SplitButton">
|
TargetType="SplitButton">
|
||||||
<Style Selector="^ /template/ Button">
|
<Setter Property="SplitButton.Background" Value="Transparent" />
|
||||||
<Setter Property="Background" Value="Transparent" />
|
<Setter Property="SplitButton.BorderBrush" Value="Transparent" />
|
||||||
<Setter Property="BorderBrush" Value="Transparent" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:disabled /template/ Button">
|
<Style Selector="^:disabled /template/ Button">
|
||||||
<Setter Property="BorderBrush" Value="Transparent" />
|
<Setter Property="BorderBrush" Value="Transparent" />
|
||||||
<Setter Property="Background" Value="Transparent" />
|
<Setter Property="Background" Value="Transparent" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|||||||
@@ -129,7 +129,7 @@
|
|||||||
x:Name="PART_ContentPresenter"
|
x:Name="PART_ContentPresenter"
|
||||||
Content="{TemplateBinding Content}"
|
Content="{TemplateBinding Content}"
|
||||||
ContentTemplate="{TemplateBinding ContentTemplate}" />
|
ContentTemplate="{TemplateBinding ContentTemplate}" />
|
||||||
<Rectangle Name="LightDismissLayer" IsVisible="False" />
|
<Rectangle Name="LightDismissLayer" />
|
||||||
</Panel>
|
</Panel>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
@@ -235,8 +235,8 @@
|
|||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^:lightDismiss /template/ Rectangle#LightDismissLayer">
|
<Style Selector="^:lightdismiss /template/ Rectangle#LightDismissLayer">
|
||||||
<Setter Property="Fill" Value="{DynamicResource SplitViewMaskBrush}" />
|
<Setter Property="Fill" Value="#99000000" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:overlay:open /template/ Rectangle#LightDismissLayer">
|
<Style Selector="^:overlay:open /template/ Rectangle#LightDismissLayer">
|
||||||
<Setter Property="IsVisible" Value="True" />
|
<Setter Property="IsVisible" Value="True" />
|
||||||
|
|||||||
@@ -53,14 +53,11 @@
|
|||||||
<Setter Property="TextBox.SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
|
<Setter Property="TextBox.SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
|
||||||
<Setter Property="TextBox.SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
|
<Setter Property="TextBox.SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
|
||||||
<Setter Property="TextBox.BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
|
<Setter Property="TextBox.BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
|
||||||
<Setter Property="TextBox.BackgroundSizing" Value="OuterBorderEdge" />
|
|
||||||
<Setter Property="TextBox.CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
|
<Setter Property="TextBox.CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
|
||||||
<Setter Property="TextBox.FontSize" Value="14" />
|
<Setter Property="TextBox.FontSize" Value="14" />
|
||||||
<Setter Property="TextBox.Cursor" Value="Ibeam" />
|
<Setter Property="TextBox.Cursor" Value="Ibeam" />
|
||||||
<Setter Property="TextBox.CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
|
<Setter Property="TextBox.CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
|
||||||
<Setter Property="TextBox.Padding" Value="{DynamicResource TextBoxContentPadding}" />
|
<Setter Property="TextBox.Padding" Value="{DynamicResource TextBoxContentPadding}" />
|
||||||
<Setter Property="TextBox.MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
|
|
||||||
<Setter Property="TextBox.VerticalAlignment" Value="Center" />
|
|
||||||
<Setter Property="TextBox.VerticalContentAlignment" Value="Center" />
|
<Setter Property="TextBox.VerticalContentAlignment" Value="Center" />
|
||||||
<Setter Property="TextBox.FocusAdorner" Value="{x:Null}" />
|
<Setter Property="TextBox.FocusAdorner" Value="{x:Null}" />
|
||||||
<Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
|
<Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
|
||||||
@@ -70,9 +67,8 @@
|
|||||||
<DataValidationErrors>
|
<DataValidationErrors>
|
||||||
<Border
|
<Border
|
||||||
Name="PART_ContentPresenterBorder"
|
Name="PART_ContentPresenterBorder"
|
||||||
MinHeight="{TemplateBinding MinHeight}"
|
MinHeight="{DynamicResource TextBoxWrapperDefaultHeight}"
|
||||||
Background="{TemplateBinding Background}"
|
Background="{TemplateBinding Background}"
|
||||||
BackgroundSizing="{TemplateBinding BackgroundSizing}"
|
|
||||||
BorderBrush="{TemplateBinding BorderBrush}"
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
BorderThickness="{TemplateBinding BorderThickness}"
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
CornerRadius="{TemplateBinding CornerRadius}">
|
CornerRadius="{TemplateBinding CornerRadius}">
|
||||||
@@ -109,7 +105,6 @@
|
|||||||
<TextPresenter
|
<TextPresenter
|
||||||
Name="PART_TextPresenter"
|
Name="PART_TextPresenter"
|
||||||
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
|
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||||
CaretBlinkInterval="{TemplateBinding CaretBlinkInterval}"
|
|
||||||
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
|
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||||
CaretBrush="{TemplateBinding CaretBrush}"
|
CaretBrush="{TemplateBinding CaretBrush}"
|
||||||
CaretIndex="{TemplateBinding CaretIndex}"
|
CaretIndex="{TemplateBinding CaretIndex}"
|
||||||
@@ -203,11 +198,11 @@
|
|||||||
<Setter Property="IsVisible" Value="True" />
|
<Setter Property="IsVisible" Value="True" />
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Large">
|
<Style Selector="^.Large /template/ Border#PART_ContentPresenterBorder">
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource TextBoxLargeHeight}" />
|
<Setter Property="MinHeight" Value="{DynamicResource TextBoxWrapperLargeHeight}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Small">
|
<Style Selector="^.Small /template/ Border#PART_ContentPresenterBorder">
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource TextBoxSmallHeight}" />
|
<Setter Property="MinHeight" Value="{DynamicResource TextBoxWrapperSmallHeight}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^.Bordered">
|
<Style Selector="^.Bordered">
|
||||||
@@ -260,15 +255,13 @@
|
|||||||
<Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
|
<Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
|
||||||
<Setter Property="TextBox.SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
|
<Setter Property="TextBox.SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
|
||||||
<Setter Property="TextBox.SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
|
<Setter Property="TextBox.SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
|
||||||
<Setter Property="TextBox.BackgroundSizing" Value="OuterBorderEdge" />
|
|
||||||
<Setter Property="TextBox.BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
|
<Setter Property="TextBox.BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
|
||||||
<Setter Property="TextBox.CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
|
<Setter Property="TextBox.CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
|
||||||
<Setter Property="TextBox.FontSize" Value="14" />
|
<Setter Property="TextBox.FontSize" Value="14" />
|
||||||
<Setter Property="TextBox.Cursor" Value="Ibeam" />
|
<Setter Property="TextBox.Cursor" Value="Ibeam" />
|
||||||
<Setter Property="TextBox.CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
|
<Setter Property="TextBox.CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
|
||||||
<Setter Property="TextBox.Padding" Value="{DynamicResource TextBoxContentPadding}" />
|
<Setter Property="TextBox.Padding" Value="{DynamicResource TextBoxContentPadding}" />
|
||||||
<Setter Property="TextBox.MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
|
<Setter Property="TextBox.MinHeight" Value="{DynamicResource TextBoxWrapperDefaultHeight}" />
|
||||||
<Setter Property="TextBox.VerticalAlignment" Value="Center" />
|
|
||||||
<Setter Property="TextBox.VerticalContentAlignment" Value="Center" />
|
<Setter Property="TextBox.VerticalContentAlignment" Value="Center" />
|
||||||
<Setter Property="TextBox.FocusAdorner" Value="{x:Null}" />
|
<Setter Property="TextBox.FocusAdorner" Value="{x:Null}" />
|
||||||
<Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
|
<Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
|
||||||
@@ -280,11 +273,10 @@
|
|||||||
Name="PART_ContentPresenterBorder"
|
Name="PART_ContentPresenterBorder"
|
||||||
MinHeight="{TemplateBinding MinHeight}"
|
MinHeight="{TemplateBinding MinHeight}"
|
||||||
Background="{TemplateBinding Background}"
|
Background="{TemplateBinding Background}"
|
||||||
BackgroundSizing="{TemplateBinding BackgroundSizing}"
|
|
||||||
BorderBrush="{TemplateBinding BorderBrush}"
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
BorderThickness="{TemplateBinding BorderThickness}"
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
CornerRadius="{TemplateBinding CornerRadius}">
|
CornerRadius="{TemplateBinding CornerRadius}">
|
||||||
<Grid Margin="{TemplateBinding Padding}" ColumnDefinitions="Auto, *, Auto">
|
<Grid Margin="{TemplateBinding Padding}" ColumnDefinitions="Auto, *">
|
||||||
<ContentPresenter
|
<ContentPresenter
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Padding="{DynamicResource TextBoxInnerLeftContentPadding}"
|
Padding="{DynamicResource TextBoxInnerLeftContentPadding}"
|
||||||
@@ -313,7 +305,6 @@
|
|||||||
Name="PART_TextPresenter"
|
Name="PART_TextPresenter"
|
||||||
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
|
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||||
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
|
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||||
CaretBlinkInterval="{TemplateBinding CaretBlinkInterval}"
|
|
||||||
CaretBrush="{TemplateBinding CaretBrush}"
|
CaretBrush="{TemplateBinding CaretBrush}"
|
||||||
CaretIndex="{TemplateBinding CaretIndex}"
|
CaretIndex="{TemplateBinding CaretIndex}"
|
||||||
LineHeight="{TemplateBinding LineHeight}"
|
LineHeight="{TemplateBinding LineHeight}"
|
||||||
@@ -329,13 +320,6 @@
|
|||||||
TextWrapping="{TemplateBinding TextWrapping}" />
|
TextWrapping="{TemplateBinding TextWrapping}" />
|
||||||
</Panel>
|
</Panel>
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
<ContentPresenter
|
|
||||||
Grid.Column="2"
|
|
||||||
Padding="{DynamicResource TextBoxInnerRightContentPadding}"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Content="{TemplateBinding InnerRightContent}"
|
|
||||||
Foreground="{DynamicResource TextBoxInnerForeground}"
|
|
||||||
IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=InnerRightContent, Converter={x:Static ObjectConverters.IsNotNull}}" />
|
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
</DataValidationErrors>
|
</DataValidationErrors>
|
||||||
@@ -378,80 +362,4 @@
|
|||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
|
|
||||||
<ControlTheme x:Key="LooklessTextBox" TargetType="TextBox">
|
|
||||||
<Setter Property="TextBox.Foreground" Value="{DynamicResource TextBoxForeground}" />
|
|
||||||
<Setter Property="TextBox.SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
|
|
||||||
<Setter Property="TextBox.SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
|
|
||||||
<Setter Property="TextBox.FontSize" Value="14" />
|
|
||||||
<Setter Property="TextBox.Cursor" Value="Ibeam" />
|
|
||||||
<Setter Property="TextBox.CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
|
|
||||||
<Setter Property="TextBox.Padding" Value="{DynamicResource TextBoxContentPadding}" />
|
|
||||||
<Setter Property="TextBox.MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
|
|
||||||
<Setter Property="TextBox.VerticalAlignment" Value="Center" />
|
|
||||||
<Setter Property="TextBox.VerticalContentAlignment" Value="Center" />
|
|
||||||
<Setter Property="TextBox.FocusAdorner" Value="{x:Null}" />
|
|
||||||
<Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
|
|
||||||
<Setter Property="TextBox.Template">
|
|
||||||
<ControlTemplate TargetType="TextBox">
|
|
||||||
<Border Name="PART_ContentPresenterBorder" MinHeight="{TemplateBinding MinHeight}">
|
|
||||||
<Grid Margin="{TemplateBinding Padding}" ColumnDefinitions="Auto, *, Auto">
|
|
||||||
<ContentPresenter
|
|
||||||
Grid.Column="0"
|
|
||||||
Padding="{DynamicResource TextBoxInnerLeftContentPadding}"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Content="{TemplateBinding InnerLeftContent}"
|
|
||||||
Foreground="{DynamicResource TextBoxInnerForeground}"
|
|
||||||
IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=InnerLeftContent, Converter={x:Static ObjectConverters.IsNotNull}}" />
|
|
||||||
<ScrollViewer
|
|
||||||
Grid.Column="1"
|
|
||||||
AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
|
|
||||||
HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
|
|
||||||
IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
|
|
||||||
VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
|
|
||||||
<Panel>
|
|
||||||
<TextBlock
|
|
||||||
Name="PART_Watermark"
|
|
||||||
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
|
|
||||||
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
|
|
||||||
IsVisible="{TemplateBinding Text, Converter={x:Static StringConverters.IsNullOrEmpty}}"
|
|
||||||
Opacity="0.5"
|
|
||||||
Text="{TemplateBinding Watermark}"
|
|
||||||
TextAlignment="{TemplateBinding TextAlignment}"
|
|
||||||
TextWrapping="{TemplateBinding TextWrapping}" />
|
|
||||||
<TextPresenter
|
|
||||||
Name="PART_TextPresenter"
|
|
||||||
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
|
|
||||||
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
|
|
||||||
CaretBrush="{TemplateBinding CaretBrush}"
|
|
||||||
CaretIndex="{TemplateBinding CaretIndex}"
|
|
||||||
LineHeight="{TemplateBinding LineHeight}"
|
|
||||||
PasswordChar="{TemplateBinding PasswordChar}"
|
|
||||||
RevealPassword="{TemplateBinding RevealPassword}"
|
|
||||||
SelectionBrush="{TemplateBinding SelectionBrush}"
|
|
||||||
SelectionEnd="{TemplateBinding SelectionEnd}"
|
|
||||||
SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
|
|
||||||
SelectionStart="{TemplateBinding SelectionStart}"
|
|
||||||
Text="{TemplateBinding Text, Mode=TwoWay}"
|
|
||||||
TextAlignment="{TemplateBinding TextAlignment}"
|
|
||||||
TextWrapping="{TemplateBinding TextWrapping}" />
|
|
||||||
</Panel>
|
|
||||||
</ScrollViewer>
|
|
||||||
<ContentPresenter
|
|
||||||
Grid.Column="2"
|
|
||||||
Padding="{DynamicResource TextBoxInnerRightContentPadding}"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Content="{TemplateBinding InnerRightContent}"
|
|
||||||
Foreground="{DynamicResource TextBoxInnerForeground}"
|
|
||||||
IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=InnerRightContent, Converter={x:Static ObjectConverters.IsNotNull}}" />
|
|
||||||
</Grid>
|
|
||||||
</Border>
|
|
||||||
</ControlTemplate>
|
|
||||||
</Setter>
|
|
||||||
|
|
||||||
<Style Selector="^:disabled">
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource TextBoxDisabledForeground}" />
|
|
||||||
</Style>
|
|
||||||
</ControlTheme>
|
|
||||||
|
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|||||||
@@ -136,7 +136,6 @@
|
|||||||
<Setter Property="CornerRadius" Value="3" />
|
<Setter Property="CornerRadius" Value="3" />
|
||||||
<Setter Property="HorizontalAlignment" Value="Left" />
|
<Setter Property="HorizontalAlignment" Value="Left" />
|
||||||
<Setter Property="VerticalAlignment" Value="Center" />
|
<Setter Property="VerticalAlignment" Value="Center" />
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonDefaultHeight}" />
|
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<ControlTemplate>
|
<ControlTemplate>
|
||||||
<DataValidationErrors>
|
<DataValidationErrors>
|
||||||
@@ -150,7 +149,7 @@
|
|||||||
Grid.ColumnSpan="2"
|
Grid.ColumnSpan="2"
|
||||||
Width="242"
|
Width="242"
|
||||||
MinWidth="242"
|
MinWidth="242"
|
||||||
MinHeight="{TemplateBinding MinHeight}"
|
MinHeight="{DynamicResource DateTimePickerButtonDefaultHeight}"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
Background="{TemplateBinding Background}"
|
Background="{TemplateBinding Background}"
|
||||||
@@ -172,19 +171,19 @@
|
|||||||
VerticalAlignment="Stretch">
|
VerticalAlignment="Stretch">
|
||||||
<TextBlock
|
<TextBlock
|
||||||
x:Name="PART_HourTextBlock"
|
x:Name="PART_HourTextBlock"
|
||||||
Padding="12,0"
|
Padding="12,4"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
FontFamily="{TemplateBinding FontFamily}"
|
FontFamily="{TemplateBinding FontFamily}"
|
||||||
FontSize="{TemplateBinding FontSize}"
|
FontSize="{TemplateBinding FontSize}"
|
||||||
FontWeight="{TemplateBinding FontWeight}"
|
FontWeight="{TemplateBinding FontWeight}" />
|
||||||
Text="{DynamicResource STRING_TIMEPICKER_HOUR_TEXT}" />
|
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
<Rectangle
|
<Rectangle
|
||||||
Name="PART_FirstColumnDivider"
|
Name="PART_FirstColumnDivider"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Width="1"
|
Width="1"
|
||||||
|
Margin="0,4"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
|
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
|
||||||
|
|
||||||
@@ -195,19 +194,19 @@
|
|||||||
VerticalAlignment="Stretch">
|
VerticalAlignment="Stretch">
|
||||||
<TextBlock
|
<TextBlock
|
||||||
x:Name="PART_MinuteTextBlock"
|
x:Name="PART_MinuteTextBlock"
|
||||||
Padding="12,0"
|
Padding="12,4"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
FontFamily="{TemplateBinding FontFamily}"
|
FontFamily="{TemplateBinding FontFamily}"
|
||||||
FontSize="{TemplateBinding FontSize}"
|
FontSize="{TemplateBinding FontSize}"
|
||||||
FontWeight="{TemplateBinding FontWeight}"
|
FontWeight="{TemplateBinding FontWeight}" />
|
||||||
Text="{DynamicResource STRING_TIMEPICKER_MINUTE_TEXT}" />
|
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
<Rectangle
|
<Rectangle
|
||||||
Name="PART_SecondColumnDivider"
|
Name="PART_SecondColumnDivider"
|
||||||
Grid.Column="3"
|
Grid.Column="3"
|
||||||
Width="1"
|
Width="1"
|
||||||
|
Margin="0,4"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
|
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
|
||||||
|
|
||||||
@@ -218,7 +217,7 @@
|
|||||||
VerticalAlignment="Stretch">
|
VerticalAlignment="Stretch">
|
||||||
<TextBlock
|
<TextBlock
|
||||||
x:Name="PART_PeriodTextBlock"
|
x:Name="PART_PeriodTextBlock"
|
||||||
Padding="12,0"
|
Padding="12,4"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
FontFamily="{TemplateBinding FontFamily}"
|
FontFamily="{TemplateBinding FontFamily}"
|
||||||
@@ -279,10 +278,10 @@
|
|||||||
<Setter Property="Foreground" Value="{DynamicResource DateTimePickerEmptyForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource DateTimePickerEmptyForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^.Large">
|
<Style Selector="^.Large /template/ Button#PART_FlyoutButton">
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonLargeHeight}" />
|
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonLargeHeight}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Small">
|
<Style Selector="^.Small /template/ Button#PART_FlyoutButton">
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonSmallHeight}" />
|
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonSmallHeight}" />
|
||||||
</Style>
|
</Style>
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
|
|||||||
@@ -20,30 +20,24 @@
|
|||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Design.PreviewWith>
|
</Design.PreviewWith>
|
||||||
<ControlTheme x:Key="{x:Type ToggleButton}" TargetType="ToggleButton">
|
<ControlTheme x:Key="{x:Type ToggleButton}" TargetType="ToggleButton">
|
||||||
<Setter Property="Background" Value="{DynamicResource ToggleButtonDefaultBackground}" />
|
<Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDefaultBackground}" />
|
||||||
<Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
|
<Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDefaultPrimaryForeground}" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ToggleButtonDefaultPrimaryForeground}" />
|
<Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonDefaultBorderBrush}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonDefaultBorderBrush}" />
|
<Setter Property="ToggleButton.CornerRadius" Value="{DynamicResource ToggleButtonCornerRadius}" />
|
||||||
<Setter Property="CornerRadius" Value="{DynamicResource ToggleButtonCornerRadius}" />
|
<Setter Property="ToggleButton.BorderThickness" Value="{DynamicResource ToggleButtonBorderThickness}" />
|
||||||
<Setter Property="BorderThickness" Value="{DynamicResource ToggleButtonBorderThickness}" />
|
<Setter Property="ToggleButton.Padding" Value="{DynamicResource ToggleButtonDefaultPadding}" />
|
||||||
<Setter Property="Padding" Value="{DynamicResource ButtonDefaultPadding}" />
|
<Setter Property="ToggleButton.RenderTransform" Value="none" />
|
||||||
<Setter Property="RenderTransform" Value="none" />
|
<Setter Property="ToggleButton.FontSize" Value="{DynamicResource ToggleButtonDefaultFontSize}" />
|
||||||
<Setter Property="FontSize" Value="{DynamicResource ToggleButtonDefaultFontSize}" />
|
<Setter Property="ToggleButton.FontWeight" Value="{DynamicResource ToggleButtonDefaultFontWeight}" />
|
||||||
<Setter Property="FontWeight" Value="{DynamicResource ToggleButtonDefaultFontWeight}" />
|
<Setter Property="ToggleButton.HorizontalContentAlignment" Value="Center" />
|
||||||
<Setter Property="HorizontalAlignment" Value="Center"/>
|
<Setter Property="ToggleButton.VerticalContentAlignment" Value="Center" />
|
||||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
<Setter Property="ToggleButton.MinHeight" Value="12" />
|
||||||
<Setter Property="HorizontalContentAlignment" Value="Center" />
|
<Setter Property="ToggleButton.Cursor" Value="Hand" />
|
||||||
<Setter Property="VerticalContentAlignment" Value="Center" />
|
<Setter Property="ToggleButton.Template">
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource ButtonDefaultHeight}" />
|
|
||||||
<Setter Property="Cursor" Value="Hand" />
|
|
||||||
<Setter Property="Template">
|
|
||||||
<ControlTemplate TargetType="ToggleButton">
|
<ControlTemplate TargetType="ToggleButton">
|
||||||
<ContentPresenter
|
<ContentPresenter
|
||||||
x:Name="PART_ContentPresenter"
|
x:Name="PART_ContentPresenter"
|
||||||
BackgroundSizing="{TemplateBinding BackgroundSizing}"
|
|
||||||
Padding="{TemplateBinding Padding}"
|
Padding="{TemplateBinding Padding}"
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
VerticalAlignment="Stretch"
|
|
||||||
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
|
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||||
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
|
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||||
Background="{TemplateBinding Background}"
|
Background="{TemplateBinding Background}"
|
||||||
@@ -260,11 +254,9 @@
|
|||||||
|
|
||||||
<Style Selector="^.Large">
|
<Style Selector="^.Large">
|
||||||
<Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
|
<Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource ButtonLargeHeight}" />
|
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Small">
|
<Style Selector="^.Small">
|
||||||
<Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
|
<Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
|
||||||
<Setter Property="MinHeight" Value="{DynamicResource ButtonSmallHeight}" />
|
|
||||||
</Style>
|
</Style>
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|||||||
23
src/Semi.Avalonia/Controls/UserControl.axaml
Normal file
23
src/Semi.Avalonia/Controls/UserControl.axaml
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
<ResourceDictionary
|
||||||
|
xmlns="https://github.com/avaloniaui"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
x:CompileBindings="True">
|
||||||
|
<!-- Add Resources Here -->
|
||||||
|
<ControlTheme x:Key="{x:Type UserControl}" TargetType="UserControl">
|
||||||
|
<Setter Property="Template">
|
||||||
|
<ControlTemplate TargetType="UserControl">
|
||||||
|
<ContentPresenter
|
||||||
|
Name="PART_ContentPresenter"
|
||||||
|
Padding="{TemplateBinding Padding}"
|
||||||
|
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||||
|
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||||
|
Background="{TemplateBinding Background}"
|
||||||
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
|
Content="{TemplateBinding Content}"
|
||||||
|
ContentTemplate="{TemplateBinding ContentTemplate}"
|
||||||
|
CornerRadius="{TemplateBinding CornerRadius}" />
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter>
|
||||||
|
</ControlTheme>
|
||||||
|
</ResourceDictionary>
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<ResourceDictionary
|
<ResourceDictionary
|
||||||
x:CompileBindings="True"
|
|
||||||
xmlns="https://github.com/avaloniaui"
|
xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
x:CompileBindings="True">
|
||||||
<ResourceDictionary.MergedDictionaries>
|
<ResourceDictionary.MergedDictionaries>
|
||||||
<ResourceInclude Source="avares://Semi.Avalonia/Controls/AdornerLayer.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Controls/AdornerLayer.axaml" />
|
||||||
<ResourceInclude Source="avares://Semi.Avalonia/Controls/AutoCompleteBox.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Controls/AutoCompleteBox.axaml" />
|
||||||
@@ -14,6 +14,7 @@
|
|||||||
<ResourceInclude Source="avares://Semi.Avalonia/Controls/Carousel.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Controls/Carousel.axaml" />
|
||||||
<ResourceInclude Source="avares://Semi.Avalonia/Controls/CheckBox.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Controls/CheckBox.axaml" />
|
||||||
<ResourceInclude Source="avares://Semi.Avalonia/Controls/ComboBox.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Controls/ComboBox.axaml" />
|
||||||
|
<ResourceInclude Source="avares://Semi.Avalonia/Controls/ContentControl.axaml" />
|
||||||
<ResourceInclude Source="avares://Semi.Avalonia/Controls/ContextMenu.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Controls/ContextMenu.axaml" />
|
||||||
<ResourceInclude Source="avares://Semi.Avalonia/Controls/DataValidationErrors.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Controls/DataValidationErrors.axaml" />
|
||||||
<ResourceInclude Source="avares://Semi.Avalonia/Controls/DatePicker.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Controls/DatePicker.axaml" />
|
||||||
@@ -24,7 +25,6 @@
|
|||||||
<ResourceInclude Source="avares://Semi.Avalonia/Controls/FlyoutPresenter.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Controls/FlyoutPresenter.axaml" />
|
||||||
<ResourceInclude Source="avares://Semi.Avalonia/Controls/GridSplitter.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Controls/GridSplitter.axaml" />
|
||||||
<ResourceInclude Source="avares://Semi.Avalonia/Controls/HeaderedContentControl.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Controls/HeaderedContentControl.axaml" />
|
||||||
<ResourceInclude Source="avares://Semi.Avalonia/Controls/HyperlinkButton.axaml" />
|
|
||||||
<ResourceInclude Source="avares://Semi.Avalonia/Controls/ItemsControl.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Controls/ItemsControl.axaml" />
|
||||||
<ResourceInclude Source="avares://Semi.Avalonia/Controls/Label.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Controls/Label.axaml" />
|
||||||
<ResourceInclude Source="avares://Semi.Avalonia/Controls/ListBox.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Controls/ListBox.axaml" />
|
||||||
@@ -57,6 +57,7 @@
|
|||||||
<ResourceInclude Source="avares://Semi.Avalonia/Controls/Tooltip.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Controls/Tooltip.axaml" />
|
||||||
<ResourceInclude Source="avares://Semi.Avalonia/Controls/TransitioningContentControl.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Controls/TransitioningContentControl.axaml" />
|
||||||
<ResourceInclude Source="avares://Semi.Avalonia/Controls/TreeView.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Controls/TreeView.axaml" />
|
||||||
|
<ResourceInclude Source="avares://Semi.Avalonia/Controls/UserControl.axaml" />
|
||||||
<ResourceInclude Source="avares://Semi.Avalonia/Controls/Window.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Controls/Window.axaml" />
|
||||||
<ResourceInclude Source="avares://Semi.Avalonia/Controls/WindowNotificationManager.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Controls/WindowNotificationManager.axaml" />
|
||||||
</ResourceDictionary.MergedDictionaries>
|
</ResourceDictionary.MergedDictionaries>
|
||||||
|
|||||||
@@ -1,12 +1,5 @@
|
|||||||
<ResourceDictionary xmlns="https://github.com/avaloniaui"
|
<ResourceDictionary xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||||
<!-- DatePicker -->
|
|
||||||
<x:String x:Key="STRING_DATEPICKER_DAY_TEXT">day</x:String>
|
|
||||||
<x:String x:Key="STRING_DATEPICKER_MONTH_TEXT">month</x:String>
|
|
||||||
<x:String x:Key="STRING_DATEPICKER_YEAR_TEXT">year</x:String>
|
|
||||||
<!-- TimePicker -->
|
|
||||||
<x:String x:Key="STRING_TIMEPICKER_HOUR_TEXT">hour</x:String>
|
|
||||||
<x:String x:Key="STRING_TIMEPICKER_MINUTE_TEXT">minute</x:String>
|
|
||||||
<!-- TextBox/SelectableTextBox flyout -->
|
<!-- TextBox/SelectableTextBox flyout -->
|
||||||
<x:String x:Key="STRING_MENU_CUT">Cut</x:String>
|
<x:String x:Key="STRING_MENU_CUT">Cut</x:String>
|
||||||
<x:String x:Key="STRING_MENU_COPY">Copy</x:String>
|
<x:String x:Key="STRING_MENU_COPY">Copy</x:String>
|
||||||
|
|||||||
@@ -1,12 +1,5 @@
|
|||||||
<ResourceDictionary xmlns="https://github.com/avaloniaui"
|
<ResourceDictionary xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||||
<!-- DatePicker -->
|
|
||||||
<x:String x:Key="STRING_DATEPICKER_DAY_TEXT">日</x:String>
|
|
||||||
<x:String x:Key="STRING_DATEPICKER_MONTH_TEXT">月</x:String>
|
|
||||||
<x:String x:Key="STRING_DATEPICKER_YEAR_TEXT">年</x:String>
|
|
||||||
<!-- TimePicker -->
|
|
||||||
<x:String x:Key="STRING_TIMEPICKER_HOUR_TEXT">时</x:String>
|
|
||||||
<x:String x:Key="STRING_TIMEPICKER_MINUTE_TEXT">分</x:String>
|
|
||||||
<!-- TextBox/SelectableTextBox flyout -->
|
<!-- TextBox/SelectableTextBox flyout -->
|
||||||
<x:String x:Key="STRING_MENU_CUT">剪切</x:String>
|
<x:String x:Key="STRING_MENU_CUT">剪切</x:String>
|
||||||
<x:String x:Key="STRING_MENU_COPY">复制</x:String>
|
<x:String x:Key="STRING_MENU_COPY">复制</x:String>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Title>Semi.Avalonia</Title>
|
<Title>Semi.Avalonia</Title>
|
||||||
<PackageReleaseNotes>Update to Avalonia 11.1-rc2</PackageReleaseNotes>
|
<PackageReleaseNotes>Update to 11.0.7.5</PackageReleaseNotes>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
|
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<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">
|
||||||
<BoxShadows x:Key="AutoCompleteBoxPopupBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
|
<BoxShadows x:Key="AutoCompleteBoxPopupBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
|
||||||
<SolidColorBrush x:Key="AutoCompleteBoxPopupBackground" Color="#35363C" />
|
<SolidColorBrush x:Key="AutoCompleteBoxPopupBackground" Color="#35363C" />
|
||||||
<SolidColorBrush x:Key="AutoCompleteBoxPopupBorderBrush" Opacity="0.08" Color="White" />
|
<SolidColorBrush x:Key="AutoCompleteBoxPopupBorderBrush" Opacity="0.08" Color="#F9F9F9" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<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">
|
||||||
<BoxShadows x:Key="BorderCardBoxShadow">0 0 14 0 #1AFFFFFF</BoxShadows>
|
|
||||||
<SolidColorBrush x:Key="BorderCardBackground" Color="#232429" />
|
<SolidColorBrush x:Key="BorderCardBackground" Color="#232429" />
|
||||||
<SolidColorBrush x:Key="BorderCardBorderBrush" Opacity="0.08" Color="White" />
|
<SolidColorBrush x:Key="BorderCardBorderBrush" Opacity="0.08" Color="White" />
|
||||||
|
<BoxShadows x:Key="BorderCardBoxShadow">0 0 14 0 #1AFFFFFF</BoxShadows>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@@ -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">
|
||||||
<SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBackground" Color="#35363C" />
|
<SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBackground" Color="#FF35363C" />
|
||||||
<SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPointeroverBackground" Opacity="0.12" Color="White" />
|
<SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPointeroverBackground" Opacity="0.12" Color="White" />
|
||||||
<SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPressedBackground" Opacity="0.16" Color="White" />
|
<SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPressedBackground" Opacity="0.16" Color="White" />
|
||||||
<SolidColorBrush x:Key="ButtonSpinnerRepeatButtonDisabledBackground" Opacity="0.04" Color="#2E3238" />
|
<SolidColorBrush x:Key="ButtonSpinnerRepeatButtonDisabledBackground" Opacity="0.04" Color="#FF2E3238" />
|
||||||
<SolidColorBrush x:Key="ButtonSpinnerRepeatButtonForeground" Opacity="0.6" Color="#F9F9F9" />
|
<SolidColorBrush x:Key="ButtonSpinnerRepeatButtonForeground" Opacity="0.6" Color="#F9F9F9" />
|
||||||
<SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBorderBrush" Opacity="0.08" Color="White" />
|
<SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBorderBrush" Opacity="0.08" Color="#F9F9F9" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<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="CalendarBackground" Color="#232429" />
|
<SolidColorBrush x:Key="CalendarBackground" Color="#232429" />
|
||||||
<SolidColorBrush x:Key="CalendarForeground" Color="#F9F9F9" />
|
<SolidColorBrush x:Key="CalendarForeground" Color="#F9F9F9" />
|
||||||
<SolidColorBrush x:Key="CalendarBorderBrush" Opacity="0.08" Color="White" />
|
<SolidColorBrush x:Key="CalendarBorderBrush" Opacity="0.08" Color="#F9F9F9" />
|
||||||
<SolidColorBrush x:Key="CalendarItemWeekDayNameForeground" Opacity="0.6" Color="#F9F9F9" />
|
<SolidColorBrush x:Key="CalendarItemWeekDayNameForeground" Opacity="0.6" Color="#F9F9F9" />
|
||||||
<SolidColorBrush x:Key="CalendarItemIconForeground" Opacity="0.6" Color="#F9F9F9" />
|
<SolidColorBrush x:Key="CalendarItemIconForeground" Opacity="0.6" Color="#F9F9F9" />
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
<BoxShadows x:Key="CalendarDatePickerPopupBoxShadows">0 0 8 0 #1AFFFFFF</BoxShadows>
|
<BoxShadows x:Key="CalendarDatePickerPopupBoxShadows">0 0 8 0 #1AFFFFFF</BoxShadows>
|
||||||
|
|
||||||
<SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBackground" Color="Transparent" />
|
<SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBackground" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBorderBrush" Opacity="0.08" Color="White" />
|
<SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBorderBrush" Opacity="0.12" Color="White" />
|
||||||
<SolidColorBrush x:Key="CalendarDatePickerBorderedPointeroverBackground" Color="Transparent" />
|
<SolidColorBrush x:Key="CalendarDatePickerBorderedPointeroverBackground" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="CalendarDatePickerBorderedPointeroverBorderBrush" Color="#7FC1FF" />
|
<SolidColorBrush x:Key="CalendarDatePickerBorderedPointeroverBorderBrush" Color="#0062D6" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|||||||
@@ -20,15 +20,15 @@
|
|||||||
<SolidColorBrush x:Key="CheckBoxCheckedPressedBorderBrush" Color="#A9D7FF" />
|
<SolidColorBrush x:Key="CheckBoxCheckedPressedBorderBrush" Color="#A9D7FF" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="CheckBoxDefaultDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
|
<SolidColorBrush x:Key="CheckBoxDefaultDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
|
||||||
<SolidColorBrush x:Key="CheckBoxDefaultDisabledBorderBrush" Opacity="0.08" Color="White" />
|
<SolidColorBrush x:Key="CheckBoxDefaultDisabledBorderBrush" Opacity="0.08" Color="#F9F9F9" />
|
||||||
<SolidColorBrush x:Key="CheckBoxCheckedDisabledBackground" Color="#135CB8" />
|
<SolidColorBrush x:Key="CheckBoxCheckedDisabledBackground" Color="#135cb8" />
|
||||||
<SolidColorBrush x:Key="CheckBoxCheckedDisabledBorderBrush" Color="#135CB8" />
|
<SolidColorBrush x:Key="CheckBoxCheckedDisabledBorderBrush" Color="#135cb8" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="CheckBoxCardCheckedBackground" Opacity="0.2" Color="#54A9FF" />
|
<SolidColorBrush x:Key="CheckBoxCardCheckedBackground" Opacity="0.2" Color="#FF54A9FF" />
|
||||||
<SolidColorBrush x:Key="CheckBoxCardCheckedBorderBrush" Color="#54A9FF" />
|
<SolidColorBrush x:Key="CheckBoxCardCheckedBorderBrush" Color="#FF54A9FF" />
|
||||||
<SolidColorBrush x:Key="CheckBoxCardCheckedDisabledBorderBrush" Color="#135CB8" />
|
<SolidColorBrush x:Key="CheckBoxCardCheckedDisabledBorderBrush" Color="#FF135CB8" />
|
||||||
<SolidColorBrush x:Key="CheckBoxCardPointeroverBackground" Opacity="0.12" Color="White" />
|
<SolidColorBrush x:Key="CheckBoxCardPointeroverBackground" Opacity="0.05" Color="#FFFFFFFF" />
|
||||||
<SolidColorBrush x:Key="CheckBoxCardPressedBackground" Opacity="0.16" Color="White" />
|
<SolidColorBrush x:Key="CheckBoxCardPressedBackground" Opacity="0.09" Color="#FFFFFFFF" />
|
||||||
<SolidColorBrush x:Key="CheckBoxCardCheckedPointeroverBorderBrush" Color="#7FC1FF" />
|
<SolidColorBrush x:Key="CheckBoxCardCheckedPointeroverBorderBrush" Color="#FF7FC1FF" />
|
||||||
<SolidColorBrush x:Key="CheckBoxCardCheckedPressedBorderBrush" Color="#A9D7FF" />
|
<SolidColorBrush x:Key="CheckBoxCardCheckedPressedBorderBrush" Color="#FFA9D7FF" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@@ -1,17 +1,14 @@
|
|||||||
<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="ComboBoxSelectorBackground" Opacity="0.12" Color="White" />
|
<SolidColorBrush x:Key="ComboBoxSelectorBackground" Opacity="0.12" Color="White" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorPointeroverBackground" Opacity="0.16" Color="White" />
|
<SolidColorBrush x:Key="ComboBoxSelectorPointeroverBackground" Opacity="0.16" Color="White" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorFocusBackground" Opacity="0.16" Color="White" />
|
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorPressedBackground" Opacity="0.20" Color="White" />
|
<SolidColorBrush x:Key="ComboBoxSelectorPressedBackground" Opacity="0.20" Color="White" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
|
<SolidColorBrush x:Key="ComboBoxSelectorDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorBorderBrush" Color="Transparent" />
|
<SolidColorBrush x:Key="ComboBoxSelectorBorderBrush" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorPointeroverBorderBrush" Color="Transparent" />
|
<SolidColorBrush x:Key="ComboBoxSelectorPointeroverBorderBrush" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorFocusBorderBrush" Color="#54A9FF" />
|
<SolidColorBrush x:Key="ComboBoxSelectorPressedBorderBrush" Color="#A9D7FF" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorPressedBorderBrush" Color="#54A9FF" />
|
|
||||||
|
|
||||||
<SolidColorBrush x:Key="ComboBoxIconDefaultForeground" Opacity="0.6" Color="#F9F9F9" />
|
<SolidColorBrush x:Key="ComboBoxIconDefaultForeground" Opacity="0.6" Color="#F9F9F9" />
|
||||||
<SolidColorBrush x:Key="ComboBoxIconPointeroverForeground" Color="#F9F9F9" />
|
<SolidColorBrush x:Key="ComboBoxIconPointeroverForeground" Color="#F9F9F9" />
|
||||||
<SolidColorBrush x:Key="ComboBoxIconFocusForeground" Color="#F9F9F9" />
|
|
||||||
<SolidColorBrush x:Key="ComboBoxIconPressedForeground" Color="#F9F9F9" />
|
<SolidColorBrush x:Key="ComboBoxIconPressedForeground" Color="#F9F9F9" />
|
||||||
<SolidColorBrush x:Key="ComboBoxIconDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
|
<SolidColorBrush x:Key="ComboBoxIconDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
|
||||||
|
|
||||||
@@ -19,13 +16,12 @@
|
|||||||
|
|
||||||
<BoxShadows x:Key="ComboBoxPopupBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
|
<BoxShadows x:Key="ComboBoxPopupBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
|
||||||
<SolidColorBrush x:Key="ComboBoxPopupBackground" Color="#35363C" />
|
<SolidColorBrush x:Key="ComboBoxPopupBackground" Color="#35363C" />
|
||||||
<SolidColorBrush x:Key="ComboBoxPopupBorderBrush" Opacity="0.08" Color="White" />
|
<SolidColorBrush x:Key="ComboBoxPopupBorderBrush" Opacity="0.08" Color="#F9F9F9" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="ComboBoxItemForeground" Color="#F9F9F9" />
|
<SolidColorBrush x:Key="ComboBoxItemForeground" Color="#F9F9F9" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="ComboBoxItemBackground" Color="Transparent" />
|
<SolidColorBrush x:Key="ComboBoxItemBackground" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="ComboBoxItemPointeroverBackground" Opacity="0.12" Color="White" />
|
<SolidColorBrush x:Key="ComboBoxItemPointeroverBackground" Opacity="0.12" Color="White" />
|
||||||
<SolidColorBrush x:Key="ComboBoxItemFocusBackground" Opacity="0.12" Color="White" />
|
|
||||||
<SolidColorBrush x:Key="ComboBoxItemPressedBackground" Opacity="0.16" Color="White" />
|
<SolidColorBrush x:Key="ComboBoxItemPressedBackground" Opacity="0.16" Color="White" />
|
||||||
<SolidColorBrush x:Key="ComboBoxItemSelectedBackground" Opacity="0.2" Color="#54A9FF" />
|
<SolidColorBrush x:Key="ComboBoxItemSelectedBackground" Opacity="0.2" Color="#54A9FF" />
|
||||||
<SolidColorBrush x:Key="ComboBoxItemSelectedPointeroverBackground" Opacity="0.3" Color="#54A9FF" />
|
<SolidColorBrush x:Key="ComboBoxItemSelectedPointeroverBackground" Opacity="0.3" Color="#54A9FF" />
|
||||||
@@ -34,11 +30,9 @@
|
|||||||
<SolidColorBrush x:Key="ComboBoxItemSelectedDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
|
<SolidColorBrush x:Key="ComboBoxItemSelectedDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorBorderedBackground" Color="Transparent" />
|
<SolidColorBrush x:Key="ComboBoxSelectorBorderedBackground" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorBorderedBorderBrush" Opacity="0.08" Color="White" />
|
<SolidColorBrush x:Key="ComboBoxSelectorBorderedBorderBrush" Opacity="0.12" Color="White" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorBorderedPointeroverBackground" Color="Transparent" />
|
<SolidColorBrush x:Key="ComboBoxSelectorBorderedPointeroverBackground" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorBorderedPointeroverBorderBrush" Color="#7FC1FF" />
|
<SolidColorBrush x:Key="ComboBoxSelectorBorderedPointeroverBorderBrush" Color="#7FC1FF" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorBorderedFocusBackground" Color="Transparent" />
|
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorBorderedFocusBorderBrush" Color="#7FC1FF" />
|
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorBorderedPressedBackground" Color="Transparent" />
|
<SolidColorBrush x:Key="ComboBoxSelectorBorderedPressedBackground" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorBorderedPressedBorderBrush" Color="#A9D7FF" />
|
<SolidColorBrush x:Key="ComboBoxSelectorBorderedPressedBorderBrush" Color="#7FC1FF" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
<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="DataValidationErrorsForeground" Color="#FC725A" />
|
<SolidColorBrush x:Key="DataValidationErrorsForeground" Color="#FFFC725A" />
|
||||||
<SolidColorBrush x:Key="DataValidationErrorsBackground" Opacity="0.2" Color="#FC725A" />
|
<SolidColorBrush x:Key="DataValidationErrorsBackground" Opacity="0.2" Color="#FFFC725A" />
|
||||||
<SolidColorBrush x:Key="DataValidationErrorsBorderBrush" Opacity="0.2" Color="#FC725A" />
|
<SolidColorBrush x:Key="DataValidationErrorsBorderBrush" Opacity="0.2" Color="#FFFC725A" />
|
||||||
<SolidColorBrush x:Key="DataValidationErrorsPointerOverBackground" Opacity="0.3" Color="#FC725A" />
|
<SolidColorBrush x:Key="DataValidationErrorsPointerOverBackground" Opacity="0.3" Color="#FFFC725A" />
|
||||||
<SolidColorBrush x:Key="DataValidationErrorsPointerOverBorderBrush" Opacity="0.3" Color="#FC725A" />
|
<SolidColorBrush x:Key="DataValidationErrorsPointerOverBorderBrush" Opacity="0.3" Color="#FFFC725A" />
|
||||||
<SolidColorBrush x:Key="DataValidationErrorsPressedBackground" Opacity="0.4" Color="#FC725A" />
|
<SolidColorBrush x:Key="DataValidationErrorsPressedBackground" Opacity="0.4" Color="#FFFC725A" />
|
||||||
<SolidColorBrush x:Key="DataValidationErrorsPressedBorderBrush" Opacity="0.4" Color="#FC725A" />
|
<SolidColorBrush x:Key="DataValidationErrorsPressedBorderBrush" Opacity="0.4" Color="#FFFC725A" />
|
||||||
<SolidColorBrush x:Key="DataValidationErrorsSelectedBackground" Opacity="0.2" Color="#FC725A" />
|
<SolidColorBrush x:Key="DataValidationErrorsSelectedBackground" Opacity="0.2" Color="#FFFC725A" />
|
||||||
<SolidColorBrush x:Key="DataValidationErrorsSelectedBorderBrush" Color="#FC725A" />
|
<SolidColorBrush x:Key="DataValidationErrorsSelectedBorderBrush" Color="#FFFC725A" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
<SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverBackground" Opacity="0.16" Color="White" />
|
<SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverBackground" Opacity="0.16" Color="White" />
|
||||||
<SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedBackground" Opacity="0.20" Color="White" />
|
<SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedBackground" Opacity="0.20" Color="White" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="DateTimePickerSeparatorBackground" Opacity="0.08" Color="White" />
|
<SolidColorBrush x:Key="DateTimePickerSeparatorBackground" Opacity="0.08" Color="#F9F9F9" />
|
||||||
|
|
||||||
|
|
||||||
<SolidColorBrush x:Key="DateTimePickerButtonBorderBrush" Color="Transparent" />
|
<SolidColorBrush x:Key="DateTimePickerButtonBorderBrush" Color="Transparent" />
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<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="ExpanderSeparatorBorderBrush" Opacity="0.08" Color="White" />
|
<SolidColorBrush x:Key="ExpanderSeparatorBorderBrush" Opacity="0.08" Color="#F9F9F9" />
|
||||||
<SolidColorBrush x:Key="ExpanderHeaderForeground" Color="#F9F9F9" />
|
<SolidColorBrush x:Key="ExpanderHeaderForeground" Color="#F9F9F9" />
|
||||||
<SolidColorBrush x:Key="ExpanderHeaderDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
|
<SolidColorBrush x:Key="ExpanderHeaderDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
|
||||||
<SolidColorBrush x:Key="ExpanderHeaderDefaultBackground" Color="Transparent" />
|
<SolidColorBrush x:Key="ExpanderHeaderDefaultBackground" Color="Transparent" />
|
||||||
|
|||||||
@@ -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">
|
||||||
<SolidColorBrush x:Key="FlyoutBackground" Color="#35363C" />
|
<SolidColorBrush x:Key="FlyoutBackground" Color="#35363C" />
|
||||||
<SolidColorBrush x:Key="FlyoutForeground" Color="#F9F9F9" />
|
<SolidColorBrush x:Key="FlyoutForeground" Color="#F9F9F9" />
|
||||||
<SolidColorBrush x:Key="FlyoutBorderBrush" Opacity="0.08" Color="White" />
|
<SolidColorBrush x:Key="FlyoutBorderBrush" Opacity="0.08" Color="#F9F9F9" />
|
||||||
<BoxShadows x:Key="FlyoutBorderBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
|
<BoxShadows x:Key="FlyoutBorderBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
<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="HeaderedContentControlDefaultBackground" Color="Transparent" />
|
<SolidColorBrush x:Key="HeaderedContentControlDefaultBackground" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="HeaderedContentControlDefaultBorderBrush" Opacity="0.08" Color="White" />
|
<SolidColorBrush x:Key="HeaderedContentControlDefaultBorderBrush" Opacity="0.08" Color="#F9F9F9" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
|
||||||
<SolidColorBrush x:Key="HyperlinkButtonForeground" Color="#F9F9F9" />
|
|
||||||
<SolidColorBrush x:Key="HyperlinkButtonDefaultBackground" Color="Transparent" />
|
|
||||||
<SolidColorBrush x:Key="HyperlinkButtonOverForeground" Color="#54A9FF" />
|
|
||||||
<SolidColorBrush x:Key="HyperlinkButtonDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
|
|
||||||
<SolidColorBrush x:Key="HyperlinkButtonVisitedForeground" Color="#681DA8" />
|
|
||||||
</ResourceDictionary>
|
|
||||||
@@ -5,8 +5,8 @@
|
|||||||
<SolidColorBrush x:Key="ListBoxItemDefaultBackground" Color="Transparent" />
|
<SolidColorBrush x:Key="ListBoxItemDefaultBackground" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemPointeroverBackground" Opacity="0.12" Color="White" />
|
<SolidColorBrush x:Key="ListBoxItemPointeroverBackground" Opacity="0.12" Color="White" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemPressedBackground" Opacity="0.16" Color="White" />
|
<SolidColorBrush x:Key="ListBoxItemPressedBackground" Opacity="0.16" Color="White" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemSelectedBackground" Opacity="0.2" Color="#54A9FF" />
|
<SolidColorBrush x:Key="ListBoxItemSelectedBackground" Opacity="0.2" Color="#FF54A9FF" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemSelectedPointeroverBackground" Opacity="0.3" Color="#54A9FF" />
|
<SolidColorBrush x:Key="ListBoxItemSelectedPointeroverBackground" Opacity="0.3" Color="#FF54A9FF" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemDisabledBackground" Color="Transparent" />
|
<SolidColorBrush x:Key="ListBoxItemDisabledBackground" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
|
<SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
|
||||||
|
|
||||||
@@ -21,17 +21,17 @@
|
|||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupUncheckIconDefaultBorderBrush" Opacity="0.35" Color="#F9F9F9" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupUncheckIconDefaultBorderBrush" Opacity="0.35" Color="#F9F9F9" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupUncheckIconPointeroverBorderBrush" Color="#7FC1FF" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupUncheckIconPointeroverBorderBrush" Color="#7FC1FF" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupUncheckIconPressedBorderBrush" Color="#A9D7FF" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupUncheckIconPressedBorderBrush" Color="#A9D7FF" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupUncheckIconDisabledBorderBrush" Opacity="0.08" Color="White" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupUncheckIconDisabledBorderBrush" Opacity="0.08" Color="#F9F9F9" />
|
||||||
|
|
||||||
|
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconDefaultBackground" Color="#54A9FF" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconDefaultBackground" Color="#54A9FF" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconPointeroverBackground" Color="#7FC1FF" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconPointeroverBackground" Color="#7FC1FF" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconPressedBackground" Color="#A9D7FF" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconPressedBackground" Color="#A9D7FF" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconDisabledBackground" Color="#135CB8" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconDisabledBackground" Color="#135cb8" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconDefaultBorderBrush" Color="#54A9FF" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconDefaultBorderBrush" Color="#54A9FF" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconPointeroverBorderBrush" Color="#7FC1FF" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconPointeroverBorderBrush" Color="#7FC1FF" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconPressedBorderBrush" Color="#A9D7FF" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconPressedBorderBrush" Color="#A9D7FF" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconDisabledBorderBrush" Color="#135CB8" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconDisabledBorderBrush" Color="#135cb8" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupCheckGlyphFill" Color="White" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupCheckGlyphFill" Color="White" />
|
||||||
|
|
||||||
@@ -50,7 +50,7 @@
|
|||||||
<!-- CardRadioGroupListBox -->
|
<!-- CardRadioGroupListBox -->
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardDefaultBackground" Color="Transparent" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardDefaultBackground" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardDefaultBorderBrush" Color="Transparent" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardDefaultBorderBrush" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckedBackground" Opacity="0.2" Color="#54A9FF" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckedBackground" Opacity="0.2" Color="#FF54A9FF" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckDefaultBorderBrush" Color="#54A9FF" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckDefaultBorderBrush" Color="#54A9FF" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckPointeroverBorderBrush" Color="#7FC1FF" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckPointeroverBorderBrush" Color="#7FC1FF" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckPressedBorderBrush" Color="#A9D7FF" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckPressedBorderBrush" Color="#A9D7FF" />
|
||||||
@@ -79,16 +79,16 @@
|
|||||||
<SolidColorBrush x:Key="ListBoxItemCheckCheckedPressedBorderBrush" Color="#A9D7FF" />
|
<SolidColorBrush x:Key="ListBoxItemCheckCheckedPressedBorderBrush" Color="#A9D7FF" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="ListBoxItemCheckDefaultDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
|
<SolidColorBrush x:Key="ListBoxItemCheckDefaultDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemCheckDefaultDisabledBorderBrush" Opacity="0.08" Color="White" />
|
<SolidColorBrush x:Key="ListBoxItemCheckDefaultDisabledBorderBrush" Opacity="0.08" Color="#F9F9F9" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemCheckCheckedDisabledBackground" Color="#135CB8" />
|
<SolidColorBrush x:Key="ListBoxItemCheckCheckedDisabledBackground" Color="#135cb8" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemCheckCheckedDisabledBorderBrush" Color="#135CB8" />
|
<SolidColorBrush x:Key="ListBoxItemCheckCheckedDisabledBorderBrush" Color="#135cb8" />
|
||||||
|
|
||||||
<!-- CardCheckGroupListBox -->
|
<!-- CardCheckGroupListBox -->
|
||||||
<SolidColorBrush x:Key="ListBoxItemCheckCardCheckedBackground" Opacity="0.2" Color="#54A9FF" />
|
<SolidColorBrush x:Key="ListBoxItemCheckCardCheckedBackground" Opacity="0.2" Color="#FF54A9FF" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemCheckCardCheckedBorderBrush" Color="#54A9FF" />
|
<SolidColorBrush x:Key="ListBoxItemCheckCardCheckedBorderBrush" Color="#FF54A9FF" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemCheckCardCheckedDisabledBorderBrush" Color="#135CB8" />
|
<SolidColorBrush x:Key="ListBoxItemCheckCardCheckedDisabledBorderBrush" Color="#FF135CB8" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemCheckCardPointeroverBackground" Opacity="0.12" Color="White" />
|
<SolidColorBrush x:Key="ListBoxItemCheckCardPointeroverBackground" Opacity="0.05" Color="#FFFFFFFF" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemCheckCardPressedBackground" Opacity="0.16" Color="White" />
|
<SolidColorBrush x:Key="ListBoxItemCheckCardPressedBackground" Opacity="0.09" Color="#FFFFFFFF" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemCheckCardCheckedPointeroverBorderBrush" Color="#7FC1FF" />
|
<SolidColorBrush x:Key="ListBoxItemCheckCardCheckedPointeroverBorderBrush" Color="#FF7FC1FF" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemCheckCardCheckedPressedBorderBrush" Color="#A9D7FF" />
|
<SolidColorBrush x:Key="ListBoxItemCheckCardCheckedPressedBorderBrush" Color="#FFA9D7FF" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@@ -3,14 +3,14 @@
|
|||||||
|
|
||||||
<!-- MenuFlyout -->
|
<!-- MenuFlyout -->
|
||||||
<SolidColorBrush x:Key="MenuFlyoutBackground" Color="#35363C" />
|
<SolidColorBrush x:Key="MenuFlyoutBackground" Color="#35363C" />
|
||||||
<SolidColorBrush x:Key="MenuFlyoutBorderBrush" Opacity="0.08" Color="White" />
|
<SolidColorBrush x:Key="MenuFlyoutBorderBrush" Opacity="0.08" Color="#F9F9F9" />
|
||||||
<BoxShadows x:Key="MenuFlyoutBorderBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
|
<BoxShadows x:Key="MenuFlyoutBorderBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
|
||||||
|
|
||||||
<!-- MenuItem -->
|
<!-- MenuItem -->
|
||||||
<SolidColorBrush x:Key="MenuItemBackground" Color="#35363C" />
|
<SolidColorBrush x:Key="MenuItemBackground" Color="#35363C" />
|
||||||
<SolidColorBrush x:Key="MenuItemForeground" Color="#F9F9F9" />
|
<SolidColorBrush x:Key="MenuItemForeground" Color="#F9F9F9" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="MenuItemSeparatorBackground" Opacity="0.08" Color="White" />
|
<SolidColorBrush x:Key="MenuItemSeparatorBackground" Opacity="0.08" Color="#F9F9F9" />
|
||||||
<SolidColorBrush x:Key="MenuItemPointeroverBackground" Opacity="0.12" Color="White" />
|
<SolidColorBrush x:Key="MenuItemPointeroverBackground" Opacity="0.12" Color="White" />
|
||||||
<SolidColorBrush x:Key="MenuItemPressedBackground" Opacity="0.16" Color="White" />
|
<SolidColorBrush x:Key="MenuItemPressedBackground" Opacity="0.16" Color="White" />
|
||||||
|
|
||||||
|
|||||||
@@ -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">
|
||||||
<SolidColorBrush x:Key="NotificationCardForeground" Color="#F9F9F9" />
|
<SolidColorBrush x:Key="NotificationCardForeground" Color="#F9F9F9" />
|
||||||
<SolidColorBrush x:Key="NotificationCardBorderBrush" Opacity="0.08" Color="White" />
|
<SolidColorBrush x:Key="NotificationCardBorderBrush" Opacity="0.08" Color="#F9F9F9" />
|
||||||
<SolidColorBrush x:Key="NotificationCardBackground" Color="#43444A" />
|
<SolidColorBrush x:Key="NotificationCardBackground" Color="#43444A" />
|
||||||
<SolidColorBrush x:Key="NotificationCardInformationIconForeground" Color="#54A9FF" />
|
<SolidColorBrush x:Key="NotificationCardInformationIconForeground" Color="#54A9FF" />
|
||||||
<SolidColorBrush x:Key="NotificationCardSuccessIconForeground" Color="#5DC264" />
|
<SolidColorBrush x:Key="NotificationCardSuccessIconForeground" Color="#5DC264" />
|
||||||
|
|||||||
@@ -160,6 +160,11 @@
|
|||||||
<Color x:Key="SemiGrey7Color">#C6CACD</Color>
|
<Color x:Key="SemiGrey7Color">#C6CACD</Color>
|
||||||
<Color x:Key="SemiGrey8Color">#E6E8EA</Color>
|
<Color x:Key="SemiGrey8Color">#E6E8EA</Color>
|
||||||
<Color x:Key="SemiGrey9Color">#F9F9F9</Color>
|
<Color x:Key="SemiGrey9Color">#F9F9F9</Color>
|
||||||
|
<Color x:Key="SemiBackground0Color">#16161A</Color>
|
||||||
|
<Color x:Key="SemiBackground1Color">#232429</Color>
|
||||||
|
<Color x:Key="SemiBackground2Color">#35363C</Color>
|
||||||
|
<Color x:Key="SemiBackground3Color">#43444A</Color>
|
||||||
|
<Color x:Key="SemiBackground4Color">#4F5159</Color>
|
||||||
|
|
||||||
<SolidColorBrush x:Key="SemiRed0" Color="{StaticResource SemiRed0Color}" />
|
<SolidColorBrush x:Key="SemiRed0" Color="{StaticResource SemiRed0Color}" />
|
||||||
<SolidColorBrush x:Key="SemiRed1" Color="{StaticResource SemiRed1Color}" />
|
<SolidColorBrush x:Key="SemiRed1" Color="{StaticResource SemiRed1Color}" />
|
||||||
@@ -396,11 +401,11 @@
|
|||||||
<SolidColorBrush x:Key="SemiColorLinkVisited" Color="{StaticResource SemiBlue5Color}" />
|
<SolidColorBrush x:Key="SemiColorLinkVisited" Color="{StaticResource SemiBlue5Color}" />
|
||||||
|
|
||||||
<!-- Background -->
|
<!-- Background -->
|
||||||
<SolidColorBrush x:Key="SemiColorBackground0" Color="#16161A" />
|
<SolidColorBrush x:Key="SemiColorBackground0" Color="{StaticResource SemiBackground0Color}" />
|
||||||
<SolidColorBrush x:Key="SemiColorBackground1" Color="#232429" />
|
<SolidColorBrush x:Key="SemiColorBackground1" Color="{StaticResource SemiBackground1Color}" />
|
||||||
<SolidColorBrush x:Key="SemiColorBackground2" Color="#35363C" />
|
<SolidColorBrush x:Key="SemiColorBackground2" Color="{StaticResource SemiBackground2Color}" />
|
||||||
<SolidColorBrush x:Key="SemiColorBackground3" Color="#43444A" />
|
<SolidColorBrush x:Key="SemiColorBackground3" Color="{StaticResource SemiBackground3Color}" />
|
||||||
<SolidColorBrush x:Key="SemiColorBackground4" Color="#4F5159" />
|
<SolidColorBrush x:Key="SemiColorBackground4" Color="{StaticResource SemiBackground4Color}" />
|
||||||
|
|
||||||
<!-- Fill -->
|
<!-- Fill -->
|
||||||
<SolidColorBrush x:Key="SemiColorFill0" Opacity="0.12" Color="White" />
|
<SolidColorBrush x:Key="SemiColorFill0" Opacity="0.12" Color="White" />
|
||||||
|
|||||||
@@ -10,17 +10,17 @@
|
|||||||
<SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBorderBrush" Opacity="0.35" Color="#F9F9F9" />
|
<SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBorderBrush" Opacity="0.35" Color="#F9F9F9" />
|
||||||
<SolidColorBrush x:Key="RadioButtonUncheckIconPointeroverBorderBrush" Color="#7FC1FF" />
|
<SolidColorBrush x:Key="RadioButtonUncheckIconPointeroverBorderBrush" Color="#7FC1FF" />
|
||||||
<SolidColorBrush x:Key="RadioButtonUncheckIconPressedBorderBrush" Color="#A9D7FF" />
|
<SolidColorBrush x:Key="RadioButtonUncheckIconPressedBorderBrush" Color="#A9D7FF" />
|
||||||
<SolidColorBrush x:Key="RadioButtonUncheckIconDisabledBorderBrush" Opacity="0.08" Color="White" />
|
<SolidColorBrush x:Key="RadioButtonUncheckIconDisabledBorderBrush" Opacity="0.08" Color="#F9F9F9" />
|
||||||
|
|
||||||
|
|
||||||
<SolidColorBrush x:Key="RadioButtonCheckIconDefaultBackground" Color="#54A9FF" />
|
<SolidColorBrush x:Key="RadioButtonCheckIconDefaultBackground" Color="#54A9FF" />
|
||||||
<SolidColorBrush x:Key="RadioButtonCheckIconPointeroverBackground" Color="#7FC1FF" />
|
<SolidColorBrush x:Key="RadioButtonCheckIconPointeroverBackground" Color="#7FC1FF" />
|
||||||
<SolidColorBrush x:Key="RadioButtonCheckIconPressedBackground" Color="#A9D7FF" />
|
<SolidColorBrush x:Key="RadioButtonCheckIconPressedBackground" Color="#A9D7FF" />
|
||||||
<SolidColorBrush x:Key="RadioButtonCheckIconDisabledBackground" Color="#135CB8" />
|
<SolidColorBrush x:Key="RadioButtonCheckIconDisabledBackground" Color="#135cb8" />
|
||||||
<SolidColorBrush x:Key="RadioButtonCheckIconDefaultBorderBrush" Color="#54A9FF" />
|
<SolidColorBrush x:Key="RadioButtonCheckIconDefaultBorderBrush" Color="#54A9FF" />
|
||||||
<SolidColorBrush x:Key="RadioButtonCheckIconPointeroverBorderBrush" Color="#7FC1FF" />
|
<SolidColorBrush x:Key="RadioButtonCheckIconPointeroverBorderBrush" Color="#7FC1FF" />
|
||||||
<SolidColorBrush x:Key="RadioButtonCheckIconPressedBorderBrush" Color="#A9D7FF" />
|
<SolidColorBrush x:Key="RadioButtonCheckIconPressedBorderBrush" Color="#A9D7FF" />
|
||||||
<SolidColorBrush x:Key="RadioButtonCheckIconDisabledBorderBrush" Color="#135CB8" />
|
<SolidColorBrush x:Key="RadioButtonCheckIconDisabledBorderBrush" Color="#135cb8" />
|
||||||
<SolidColorBrush x:Key="RadioButtonCheckGlyphFill" Color="White" />
|
<SolidColorBrush x:Key="RadioButtonCheckGlyphFill" Color="White" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="RadioButtonForeground" Color="#F9F9F9" />
|
<SolidColorBrush x:Key="RadioButtonForeground" Color="#F9F9F9" />
|
||||||
@@ -40,7 +40,7 @@
|
|||||||
<!-- CardRadioButton -->
|
<!-- CardRadioButton -->
|
||||||
<SolidColorBrush x:Key="RadioButtonCardDefaultBackground" Color="Transparent" />
|
<SolidColorBrush x:Key="RadioButtonCardDefaultBackground" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="RadioButtonCardDefaultBorderBrush" Color="Transparent" />
|
<SolidColorBrush x:Key="RadioButtonCardDefaultBorderBrush" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="RadioButtonCardCheckedBackground" Opacity="0.2" Color="#54A9FF" />
|
<SolidColorBrush x:Key="RadioButtonCardCheckedBackground" Opacity="0.2" Color="#FF54A9FF" />
|
||||||
<SolidColorBrush x:Key="RadioButtonCardCheckDefaultBorderBrush" Color="#54A9FF" />
|
<SolidColorBrush x:Key="RadioButtonCardCheckDefaultBorderBrush" Color="#54A9FF" />
|
||||||
<SolidColorBrush x:Key="RadioButtonCardCheckPointeroverBorderBrush" Color="#7FC1FF" />
|
<SolidColorBrush x:Key="RadioButtonCardCheckPointeroverBorderBrush" Color="#7FC1FF" />
|
||||||
<SolidColorBrush x:Key="RadioButtonCardCheckPressedBorderBrush" Color="#A9D7FF" />
|
<SolidColorBrush x:Key="RadioButtonCardCheckPressedBorderBrush" Color="#A9D7FF" />
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<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="RefreshVisualizerIconForeground" Color="#54A9FF" />
|
<SolidColorBrush x:Key="RefreshContainerIconForeground" Color="#54A9FF" />
|
||||||
<SolidColorBrush x:Key="RefreshVisualizerIconBackground" Color="Transparent" />
|
<SolidColorBrush x:Key="RefreshContainerIconBackground" Color="Transparent" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
<SolidColorBrush x:Key="SliderThumbPointeroverBorderBrush" Color="#7FC1FF" />
|
<SolidColorBrush x:Key="SliderThumbPointeroverBorderBrush" Color="#7FC1FF" />
|
||||||
<SolidColorBrush x:Key="SliderThumbPressedBorderBrush" Color="#A9D7FF" />
|
<SolidColorBrush x:Key="SliderThumbPressedBorderBrush" Color="#A9D7FF" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="SliderTrackDisabledForeground" Color="#41464C" />
|
<SolidColorBrush x:Key="SliderTrackDisabledForeground" Color="#FF41464C" />
|
||||||
<SolidColorBrush x:Key="SliderThumbDisabledBorderBrush" Color="#0A4694" />
|
<SolidColorBrush x:Key="SliderThumbDisabledBorderBrush" Color="#0A4694" />
|
||||||
<SolidColorBrush x:Key="SliderTrackDisabledBackground" Color="#1C1F23" />
|
<SolidColorBrush x:Key="SliderTrackDisabledBackground" Color="#1C1F23" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
<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="SplitViewSeparatorBackground" Opacity="0.08" Color="White" />
|
<SolidColorBrush x:Key="SplitViewSeparatorBackground" Opacity="0.08" Color="#F9F9F9" />
|
||||||
<SolidColorBrush x:Key="SplitViewMaskBrush" Opacity="0.2" Color="#A7ABB0" />
|
|
||||||
<SolidColorBrush x:Key="SplitViewPaneBackground" Color="#16161A" />
|
<SolidColorBrush x:Key="SplitViewPaneBackground" Color="#16161A" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@@ -12,6 +12,5 @@
|
|||||||
<SolidColorBrush x:Key="TextBlockCodeBackground" Opacity="0.16" Color="White" />
|
<SolidColorBrush x:Key="TextBlockCodeBackground" Opacity="0.16" Color="White" />
|
||||||
<SolidColorBrush x:Key="TextBlockCodeBorderBrush" Opacity="0.08" Color="White" />
|
<SolidColorBrush x:Key="TextBlockCodeBorderBrush" Opacity="0.08" Color="White" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="TextBlockSelectionBackground" Opacity="0.8" Color="#0041C5" />
|
<SolidColorBrush x:Key="TextBlockSelectionBackground" Opacity="0.2" Color="#54A9FF" />
|
||||||
<SolidColorBrush x:Key="TextBlockSelectionForeground" Color="White" />
|
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@@ -21,7 +21,6 @@
|
|||||||
<ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Flyout.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Flyout.axaml" />
|
||||||
<ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/GridSplitter.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/GridSplitter.axaml" />
|
||||||
<ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml" />
|
||||||
<ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml" />
|
|
||||||
<ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Label.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Label.axaml" />
|
||||||
<ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/ListBox.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/ListBox.axaml" />
|
||||||
<ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml" />
|
<ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml" />
|
||||||
|
|||||||
@@ -8,4 +8,7 @@
|
|||||||
</ResourceDictionary.MergedDictionaries>
|
</ResourceDictionary.MergedDictionaries>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
</Styles.Resources>
|
</Styles.Resources>
|
||||||
|
<Style Selector=":is(UserControl)">
|
||||||
|
<Setter Property="Theme" Value="{DynamicResource {x:Type UserControl}}" />
|
||||||
|
</Style>
|
||||||
</Styles>
|
</Styles>
|
||||||
@@ -13,4 +13,7 @@
|
|||||||
</ResourceDictionary.MergedDictionaries>
|
</ResourceDictionary.MergedDictionaries>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
</Styles.Resources>
|
</Styles.Resources>
|
||||||
|
<Style Selector=":is(UserControl)">
|
||||||
|
<Setter Property="Theme" Value="{DynamicResource {x:Type UserControl}}" />
|
||||||
|
</Style>
|
||||||
</Styles>
|
</Styles>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<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">
|
||||||
<BoxShadows x:Key="BorderCardBoxShadow">0 0 14 0 #1A000000</BoxShadows>
|
|
||||||
<SolidColorBrush x:Key="BorderCardBackground" Color="White" />
|
<SolidColorBrush x:Key="BorderCardBackground" Color="White" />
|
||||||
<SolidColorBrush x:Key="BorderCardBorderBrush" Opacity="0.08" Color="#1C1F23" />
|
<SolidColorBrush x:Key="BorderCardBorderBrush" Opacity="0.08" Color="#1C1F23" />
|
||||||
|
<BoxShadows x:Key="BorderCardBoxShadow">0 0 14 0 #1A000000</BoxShadows>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@@ -5,4 +5,4 @@
|
|||||||
<SolidColorBrush x:Key="ButtonSpinnerRepeatButtonDisabledBackground" Opacity="0.05" Color="#2E3238" />
|
<SolidColorBrush x:Key="ButtonSpinnerRepeatButtonDisabledBackground" Opacity="0.05" Color="#2E3238" />
|
||||||
<SolidColorBrush x:Key="ButtonSpinnerRepeatButtonForeground" Opacity="0.62" Color="#1C1F23" />
|
<SolidColorBrush x:Key="ButtonSpinnerRepeatButtonForeground" Opacity="0.62" Color="#1C1F23" />
|
||||||
<SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBorderBrush" Opacity="0.08" Color="#1C1F23" />
|
<SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBorderBrush" Opacity="0.08" Color="#1C1F23" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|||||||
@@ -2,15 +2,15 @@
|
|||||||
<SolidColorBrush x:Key="CalendarDatePickerIconForeground" Opacity="0.62" Color="#1C1F23" />
|
<SolidColorBrush x:Key="CalendarDatePickerIconForeground" Opacity="0.62" Color="#1C1F23" />
|
||||||
<SolidColorBrush x:Key="CalendarDatePickerForeground" Color="#1C1F23" />
|
<SolidColorBrush x:Key="CalendarDatePickerForeground" Color="#1C1F23" />
|
||||||
<SolidColorBrush x:Key="CalendarDatePickerIconPointeroverForeground" Color="#1C1F23" />
|
<SolidColorBrush x:Key="CalendarDatePickerIconPointeroverForeground" Color="#1C1F23" />
|
||||||
<SolidColorBrush x:Key="CalendarDatePickerBackground" Opacity="0.05" Color="#2E3238" />
|
<SolidColorBrush x:Key="CalendarDatePickerBackground" Opacity="0.05" Color="#FF2E3238" />
|
||||||
<SolidColorBrush x:Key="CalendarDatePickerPointeroverBackground" Opacity="0.09" Color="#2E3238" />
|
<SolidColorBrush x:Key="CalendarDatePickerPointeroverBackground" Opacity="0.09" Color="#FF2E3238" />
|
||||||
<SolidColorBrush x:Key="CalendarDatePickerFocusBorderBrush" Color="#0077FA" />
|
<SolidColorBrush x:Key="CalendarDatePickerFocusBorderBrush" Color="#FF0077FA" />
|
||||||
<SolidColorBrush x:Key="CalendarDatePickerDisabledBackground" Opacity="0.02" Color="#2E3238" />
|
<SolidColorBrush x:Key="CalendarDatePickerDisabledBackground" Opacity="0.02" Color="#2E3238" />
|
||||||
<SolidColorBrush x:Key="CalendarDatePickerDisabledIconForeground" Opacity="0.4" Color="#2E3238" />
|
<SolidColorBrush x:Key="CalendarDatePickerDisabledIconForeground" Opacity="0.4" Color="#2E3238" />
|
||||||
<BoxShadows x:Key="CalendarDatePickerPopupBoxShadows">0 0 8 0 #1A000000</BoxShadows>
|
<BoxShadows x:Key="CalendarDatePickerPopupBoxShadows">0 0 8 0 #1A000000</BoxShadows>
|
||||||
|
|
||||||
<SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBackground" Color="Transparent" />
|
<SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBackground" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBorderBrush" Opacity="0.08" Color="#1C1F23" />
|
<SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBorderBrush" Opacity="0.08" Color="#FF1C1F23" />
|
||||||
<SolidColorBrush x:Key="CalendarDatePickerBorderedPointeroverBackground" Color="Transparent" />
|
<SolidColorBrush x:Key="CalendarDatePickerBorderedPointeroverBackground" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="CalendarDatePickerBorderedPointeroverBorderBrush" Color="#0062D6" />
|
<SolidColorBrush x:Key="CalendarDatePickerBorderedPointeroverBorderBrush" Color="#0062D6" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@@ -26,11 +26,11 @@
|
|||||||
<SolidColorBrush x:Key="CheckBoxCheckedDisabledBackground" Color="#98CDFD" />
|
<SolidColorBrush x:Key="CheckBoxCheckedDisabledBackground" Color="#98CDFD" />
|
||||||
<SolidColorBrush x:Key="CheckBoxCheckedDisabledBorderBrush" Color="#98CDFD" />
|
<SolidColorBrush x:Key="CheckBoxCheckedDisabledBorderBrush" Color="#98CDFD" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="CheckBoxCardCheckedBackground" Color="#EAF5FF" />
|
<SolidColorBrush x:Key="CheckBoxCardCheckedBackground" Color="#FFEAF5FF" />
|
||||||
<SolidColorBrush x:Key="CheckBoxCardCheckedBorderBrush" Color="#0077FA" />
|
<SolidColorBrush x:Key="CheckBoxCardCheckedBorderBrush" Color="#FF0077FA" />
|
||||||
<SolidColorBrush x:Key="CheckBoxCardCheckedDisabledBorderBrush" Color="#98CDFD" />
|
<SolidColorBrush x:Key="CheckBoxCardCheckedDisabledBorderBrush" Color="#FF98CDFD" />
|
||||||
<SolidColorBrush x:Key="CheckBoxCardPointeroverBackground" Opacity="0.05" Color="#2E3238" />
|
<SolidColorBrush x:Key="CheckBoxCardPointeroverBackground" Opacity="0.05" Color="#FF2E3238" />
|
||||||
<SolidColorBrush x:Key="CheckBoxCardPressedBackground" Opacity="0.09" Color="#2E3238" />
|
<SolidColorBrush x:Key="CheckBoxCardPressedBackground" Opacity="0.09" Color="#FF2E3238" />
|
||||||
<SolidColorBrush x:Key="CheckBoxCardCheckedPointeroverBorderBrush" Color="#0062D6" />
|
<SolidColorBrush x:Key="CheckBoxCardCheckedPointeroverBorderBrush" Color="#FF0062D6" />
|
||||||
<SolidColorBrush x:Key="CheckBoxCardCheckedPressedBorderBrush" Color="#004FB3" />
|
<SolidColorBrush x:Key="CheckBoxCardCheckedPressedBorderBrush" Color="#FF004FB3" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@@ -1,13 +1,11 @@
|
|||||||
<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="ComboBoxSelectorBackground" Opacity="0.05" Color="#2E3238" />
|
<SolidColorBrush x:Key="ComboBoxSelectorBackground" Opacity="0.05" Color="#2E3238" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorPointeroverBackground" Opacity="0.09" Color="#2E3238" />
|
<SolidColorBrush x:Key="ComboBoxSelectorPointeroverBackground" Opacity="0.09" Color="#2E3238" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorFocusBackground" Opacity="0.09" Color="#2E3238" />
|
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorPressedBackground" Opacity="0.13" Color="#2E3238" />
|
<SolidColorBrush x:Key="ComboBoxSelectorPressedBackground" Opacity="0.13" Color="#2E3238" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorDisabledBackground" Opacity="0.02" Color="#2E3238" />
|
<SolidColorBrush x:Key="ComboBoxSelectorDisabledBackground" Opacity="0.02" Color="#2E3238" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorBorderBrush" Color="Transparent" />
|
<SolidColorBrush x:Key="ComboBoxSelectorBorderBrush" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorPointeroverBorderBrush" Color="Transparent" />
|
<SolidColorBrush x:Key="ComboBoxSelectorPointeroverBorderBrush" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorFocusBorderBrush" Color="#0077FA" />
|
<SolidColorBrush x:Key="ComboBoxSelectorPressedBorderBrush" Color="#004FB3" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorPressedBorderBrush" Color="#0077FA" />
|
|
||||||
|
|
||||||
<SolidColorBrush x:Key="ComboBoxIconDefaultForeground" Opacity="0.62" Color="#1C1F23" />
|
<SolidColorBrush x:Key="ComboBoxIconDefaultForeground" Opacity="0.62" Color="#1C1F23" />
|
||||||
<SolidColorBrush x:Key="ComboBoxIconPointeroverForeground" Color="#1C1F23" />
|
<SolidColorBrush x:Key="ComboBoxIconPointeroverForeground" Color="#1C1F23" />
|
||||||
@@ -24,7 +22,6 @@
|
|||||||
|
|
||||||
<SolidColorBrush x:Key="ComboBoxItemBackground" Color="Transparent" />
|
<SolidColorBrush x:Key="ComboBoxItemBackground" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="ComboBoxItemPointeroverBackground" Opacity="0.05" Color="#2E3238" />
|
<SolidColorBrush x:Key="ComboBoxItemPointeroverBackground" Opacity="0.05" Color="#2E3238" />
|
||||||
<SolidColorBrush x:Key="ComboBoxItemFocusBackground" Opacity="0.05" Color="#2E3238" />
|
|
||||||
<SolidColorBrush x:Key="ComboBoxItemPressedBackground" Opacity="0.09" Color="#2E3238" />
|
<SolidColorBrush x:Key="ComboBoxItemPressedBackground" Opacity="0.09" Color="#2E3238" />
|
||||||
<SolidColorBrush x:Key="ComboBoxItemSelectedBackground" Color="#EAF5FF" />
|
<SolidColorBrush x:Key="ComboBoxItemSelectedBackground" Color="#EAF5FF" />
|
||||||
<SolidColorBrush x:Key="ComboBoxItemSelectedPointeroverBackground" Color="#CBE7FE" />
|
<SolidColorBrush x:Key="ComboBoxItemSelectedPointeroverBackground" Color="#CBE7FE" />
|
||||||
@@ -33,11 +30,9 @@
|
|||||||
<SolidColorBrush x:Key="ComboBoxItemSelectedDisabledBackground" Opacity="0.02" Color="#2E3238" />
|
<SolidColorBrush x:Key="ComboBoxItemSelectedDisabledBackground" Opacity="0.02" Color="#2E3238" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorBorderedBackground" Color="Transparent" />
|
<SolidColorBrush x:Key="ComboBoxSelectorBorderedBackground" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorBorderedBorderBrush" Opacity="0.08" Color="#1C1F23" />
|
<SolidColorBrush x:Key="ComboBoxSelectorBorderedBorderBrush" Opacity="0.08" Color="#FF1C1F23" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorBorderedPointeroverBackground" Color="Transparent" />
|
<SolidColorBrush x:Key="ComboBoxSelectorBorderedPointeroverBackground" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorBorderedPointeroverBorderBrush" Color="#0062D6" />
|
<SolidColorBrush x:Key="ComboBoxSelectorBorderedPointeroverBorderBrush" Color="#0062D6" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorBorderedFocusBackground" Color="Transparent" />
|
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorBorderedFocusBorderBrush" Color="#0062D6" />
|
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorBorderedPressedBackground" Color="Transparent" />
|
<SolidColorBrush x:Key="ComboBoxSelectorBorderedPressedBackground" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="ComboBoxSelectorBorderedPressedBorderBrush" Color="#004FB3" />
|
<SolidColorBrush x:Key="ComboBoxSelectorBorderedPressedBorderBrush" Color="#0062D6" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@@ -1,11 +1,11 @@
|
|||||||
<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="DataValidationErrorsForeground" Color="#F93920" />
|
<SolidColorBrush x:Key="DataValidationErrorsForeground" Color="#FFF93920" />
|
||||||
<SolidColorBrush x:Key="DataValidationErrorsBackground" Color="#FEF2ED" />
|
<SolidColorBrush x:Key="DataValidationErrorsBackground" Color="#FFFEF2ED" />
|
||||||
<SolidColorBrush x:Key="DataValidationErrorsBorderBrush" Color="#FEF2ED" />
|
<SolidColorBrush x:Key="DataValidationErrorsBorderBrush" Color="#FFFEF2ED" />
|
||||||
<SolidColorBrush x:Key="DataValidationErrorsPointerOverBackground" Color="#FEDDD2" />
|
<SolidColorBrush x:Key="DataValidationErrorsPointerOverBackground" Color="#FFFEDDD2" />
|
||||||
<SolidColorBrush x:Key="DataValidationErrorsPointerOverBorderBrush" Color="#FEDDD2" />
|
<SolidColorBrush x:Key="DataValidationErrorsPointerOverBorderBrush" Color="#FFFEDDD2" />
|
||||||
<SolidColorBrush x:Key="DataValidationErrorsPressedBackground" Color="#FDB7A5" />
|
<SolidColorBrush x:Key="DataValidationErrorsPressedBackground" Color="#FFFDB7A5" />
|
||||||
<SolidColorBrush x:Key="DataValidationErrorsPressedBorderBrush" Color="#FDB7A5" />
|
<SolidColorBrush x:Key="DataValidationErrorsPressedBorderBrush" Color="#FFFDB7A5" />
|
||||||
<SolidColorBrush x:Key="DataValidationErrorsSelectedBackground" Color="#FEF2ED" />
|
<SolidColorBrush x:Key="DataValidationErrorsSelectedBackground" Color="#FFFEF2ED" />
|
||||||
<SolidColorBrush x:Key="DataValidationErrorsSelectedBorderBrush" Color="#F93920" />
|
<SolidColorBrush x:Key="DataValidationErrorsSelectedBorderBrush" Color="#FFF93920" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@@ -15,16 +15,14 @@
|
|||||||
|
|
||||||
|
|
||||||
<SolidColorBrush x:Key="DateTimePickerButtonBorderBrush" Color="Transparent" />
|
<SolidColorBrush x:Key="DateTimePickerButtonBorderBrush" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="DateTimePickerButtonBackground" Opacity="0.05" Color="#2E3238" />
|
<SolidColorBrush x:Key="DateTimePickerButtonBackground" Opacity="0.05" Color="#FF2E3238" />
|
||||||
<SolidColorBrush x:Key="DateTimePickerButtonForeground" Color="#1C1F23" />
|
<SolidColorBrush x:Key="DateTimePickerButtonForeground" Color="#1C1F23" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="DateTimePickerIconForeground" Opacity="0.62" Color="#1C1F23" />
|
<SolidColorBrush x:Key="DateTimePickerIconForeground" Opacity="0.62" Color="#1C1F23" />
|
||||||
<SolidColorBrush x:Key="DateTimePickerEmptyForeground" Opacity="0.5" Color="#1C1F23" />
|
<SolidColorBrush x:Key="DateTimePickerEmptyForeground" Opacity="0.5" Color="#1C1F23" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="DateTimePickerButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
|
<SolidColorBrush x:Key="DateTimePickerButtonPointeroverBackground" Opacity="0.09" Color="#FF2E3238" />
|
||||||
<SolidColorBrush x:Key="DateTimePickerButtonDisabledBorderBrush" Color="Transparent" />
|
<SolidColorBrush x:Key="DateTimePickerButtonDisabledBorderBrush" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="DateTimePickerButtonDisabledBackground" Opacity="0.02" Color="#2E3238" />
|
<SolidColorBrush x:Key="DateTimePickerButtonDisabledBackground" Opacity="0.02" Color="#2E3238" />
|
||||||
<SolidColorBrush x:Key="DateTimePickerButtonDisabledIconForeground" Opacity="0.4" Color="#2E3238" />
|
<SolidColorBrush x:Key="DateTimePickerButtonDisabledIconForeground" Opacity="0.4" Color="#2E3238" />
|
||||||
|
|
||||||
<BoxShadows x:Key="DateTimePickerFlyoutBoxShadow">0 0 8 0 #1A000000</BoxShadows>
|
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
|
||||||
<SolidColorBrush x:Key="HyperlinkButtonForeground" Color="#1C1F23" />
|
|
||||||
<SolidColorBrush x:Key="HyperlinkButtonDefaultBackground" Color="Transparent" />
|
|
||||||
<SolidColorBrush x:Key="HyperlinkButtonOverForeground" Color="#0077FA" />
|
|
||||||
<SolidColorBrush x:Key="HyperlinkButtonDisabledForeground" Opacity="0.35" Color="#1C1F23" />
|
|
||||||
<SolidColorBrush x:Key="HyperlinkButtonVisitedForeground" Color="#681DA8" />
|
|
||||||
</ResourceDictionary>
|
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
<SolidColorBrush x:Key="LabelTagLightGreyForeground" Color="#2E3238" />
|
<SolidColorBrush x:Key="LabelTagLightGreyForeground" Color="#2E3238" />
|
||||||
<SolidColorBrush x:Key="LabelTagLightGreyBackground" Opacity="0.15" Color="#6B7075" />
|
<SolidColorBrush x:Key="LabelTagLightGreyBackground" Opacity="0.15" Color="#6B7075" />
|
||||||
<SolidColorBrush x:Key="LabelTagLightWhiteForeground" Color="#1C1F23" />
|
<SolidColorBrush x:Key="LabelTagLightWhiteForeground" Color="#1C1F23" />
|
||||||
<SolidColorBrush x:Key="LabelTagLightWhiteBackground" Opacity="0.15" Color="White" />
|
<SolidColorBrush x:Key="LabelTagLightWhiteBackground" Opacity="0.15" Color="#FFFFFF" />
|
||||||
<SolidColorBrush x:Key="LabelTagLightWhiteBorderBrush" Color="#C6CACD" />
|
<SolidColorBrush x:Key="LabelTagLightWhiteBorderBrush" Color="#C6CACD" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="LabelTagGhostRedBorderBrush" Color="#FA664C" />
|
<SolidColorBrush x:Key="LabelTagGhostRedBorderBrush" Color="#FA664C" />
|
||||||
@@ -71,7 +71,7 @@
|
|||||||
<SolidColorBrush x:Key="LabelTagGhostWhiteBorderBrush" Color="#C6CACD" />
|
<SolidColorBrush x:Key="LabelTagGhostWhiteBorderBrush" Color="#C6CACD" />
|
||||||
<SolidColorBrush x:Key="LabelTagGhostWhiteForeground" Color="#1C1F23" />
|
<SolidColorBrush x:Key="LabelTagGhostWhiteForeground" Color="#1C1F23" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="LabelTagSolidForeground" Color="White" />
|
<SolidColorBrush x:Key="LabelTagSolidForeground" Color="#FFFFFF" />
|
||||||
<SolidColorBrush x:Key="LabelTagSolidRedBackground" Color="#F93920" />
|
<SolidColorBrush x:Key="LabelTagSolidRedBackground" Color="#F93920" />
|
||||||
<SolidColorBrush x:Key="LabelTagSolidPinkBackground" Color="#E91E63" />
|
<SolidColorBrush x:Key="LabelTagSolidPinkBackground" Color="#E91E63" />
|
||||||
<SolidColorBrush x:Key="LabelTagSolidPurpleBackground" Color="#9E28B3" />
|
<SolidColorBrush x:Key="LabelTagSolidPurpleBackground" Color="#9E28B3" />
|
||||||
@@ -89,7 +89,7 @@
|
|||||||
<SolidColorBrush x:Key="LabelTagSolidOrangeBackground" Color="#FC8800" />
|
<SolidColorBrush x:Key="LabelTagSolidOrangeBackground" Color="#FC8800" />
|
||||||
<SolidColorBrush x:Key="LabelTagSolidGreyBackground" Color="#6B7075" />
|
<SolidColorBrush x:Key="LabelTagSolidGreyBackground" Color="#6B7075" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="LabelTagSolidWhiteBackground" Color="White" />
|
<SolidColorBrush x:Key="LabelTagSolidWhiteBackground" Color="#FFFFFF" />
|
||||||
<SolidColorBrush x:Key="LabelTagSolidWhiteBorderBrush" Color="#C6CACD" />
|
<SolidColorBrush x:Key="LabelTagSolidWhiteBorderBrush" Color="#C6CACD" />
|
||||||
<SolidColorBrush x:Key="LabelTagSolidWhiteForeground" Color="#1C1F23" />
|
<SolidColorBrush x:Key="LabelTagSolidWhiteForeground" Color="#1C1F23" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@@ -50,7 +50,7 @@
|
|||||||
<!-- CardRadioGroupListBox -->
|
<!-- CardRadioGroupListBox -->
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardDefaultBackground" Color="Transparent" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardDefaultBackground" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardDefaultBorderBrush" Color="Transparent" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardDefaultBorderBrush" Color="Transparent" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckedBackground" Color="#EAF5FF" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckedBackground" Color="#FFEAF5FF" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckDefaultBorderBrush" Color="#0077FA" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckDefaultBorderBrush" Color="#0077FA" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckPointeroverBorderBrush" Color="#0062D6" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckPointeroverBorderBrush" Color="#0062D6" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckPressedBorderBrush" Color="#004FB3" />
|
<SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckPressedBorderBrush" Color="#004FB3" />
|
||||||
@@ -84,11 +84,11 @@
|
|||||||
<SolidColorBrush x:Key="ListBoxItemCheckCheckedDisabledBorderBrush" Color="#98CDFD" />
|
<SolidColorBrush x:Key="ListBoxItemCheckCheckedDisabledBorderBrush" Color="#98CDFD" />
|
||||||
|
|
||||||
<!-- CardCheckGroupListBox -->
|
<!-- CardCheckGroupListBox -->
|
||||||
<SolidColorBrush x:Key="ListBoxItemCheckCardCheckedBackground" Color="#EAF5FF" />
|
<SolidColorBrush x:Key="ListBoxItemCheckCardCheckedBackground" Color="#FFEAF5FF" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemCheckCardCheckedBorderBrush" Color="#0077FA" />
|
<SolidColorBrush x:Key="ListBoxItemCheckCardCheckedBorderBrush" Color="#FF0077FA" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemCheckCardCheckedDisabledBorderBrush" Color="#98CDFD" />
|
<SolidColorBrush x:Key="ListBoxItemCheckCardCheckedDisabledBorderBrush" Color="#FF98CDFD" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemCheckCardPointeroverBackground" Opacity="0.05" Color="#2E3238" />
|
<SolidColorBrush x:Key="ListBoxItemCheckCardPointeroverBackground" Opacity="0.05" Color="#FF2E3238" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemCheckCardPressedBackground" Opacity="0.09" Color="#2E3238" />
|
<SolidColorBrush x:Key="ListBoxItemCheckCardPressedBackground" Opacity="0.09" Color="#FF2E3238" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemCheckCardCheckedPointeroverBorderBrush" Color="#0062D6" />
|
<SolidColorBrush x:Key="ListBoxItemCheckCardCheckedPointeroverBorderBrush" Color="#FF0062D6" />
|
||||||
<SolidColorBrush x:Key="ListBoxItemCheckCardCheckedPressedBorderBrush" Color="#004FB3" />
|
<SolidColorBrush x:Key="ListBoxItemCheckCardCheckedPressedBorderBrush" Color="#FF004FB3" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user
