Browse Source
TreeViewItem.cs - Moved CalculateDistanceFromLogicalParent from LogicalExtensions. TreeViewItem.xaml - Cleaned up selectors. PropertyEqualsSelector.cs - Default null to string.Empty. ContentControl.cs - Added valid & invalid pseudoclasses for ContentProperty. BaseLight.xaml - Removed unused resources. CheckBox.xaml - Hide ContentPresenter#PART_ContentPresenter when Content is null.pull/1831/head
7 changed files with 160 additions and 161 deletions
@ -1,60 +1,56 @@ |
|||||
<Style xmlns="https://github.com/avaloniaui" |
<Style xmlns="https://github.com/avaloniaui" |
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
||||
xmlns:sys="clr-namespace:System;assembly=mscorlib"> |
xmlns:sys="clr-namespace:System;assembly=mscorlib"> |
||||
<Style.Resources> |
<Style.Resources> |
||||
|
|
||||
<Color x:Key="ThemeAccentColor">#CC119EDA</Color> |
|
||||
<Color x:Key="ThemeAccentColor2">#99119EDA</Color> |
|
||||
<Color x:Key="ThemeAccentColor3">#66119EDA</Color> |
|
||||
<Color x:Key="ThemeAccentColor4">#33119EDA</Color> |
|
||||
|
|
||||
<Color x:Key="ThemeBackgroundColor">#FFFFFFFF</Color> |
|
||||
<Color x:Key="ThemeBorderLightColor">#FFAAAAAA</Color> |
|
||||
<Color x:Key="ThemeBorderMidColor">#FF888888</Color> |
|
||||
<Color x:Key="ThemeBorderDarkColor">#FF333333</Color> |
|
||||
<Color x:Key="ThemeControlLightColor">#FFFFFFFF</Color> |
|
||||
<Color x:Key="ThemeControlMidColor">#FFAAAAAA</Color> |
|
||||
<Color x:Key="ThemeControlDarkColor">#FF888888</Color> |
|
||||
<Color x:Key="ThemeControlHighlightLowColor">#FFF0F0F0</Color> |
|
||||
<Color x:Key="ThemeControlHighlightMidColor">#FFD0D0D0</Color> |
|
||||
<Color x:Key="ThemeControlHighlightDarkColor">#FF808080</Color> |
|
||||
<Color x:Key="ThemeForegroundColor">#FF000000</Color> |
|
||||
<Color x:Key="ThemeForegroundLightColor">#FF808080</Color> |
|
||||
|
|
||||
<Color x:Key="HighlightColor">#FF086F9E</Color> |
|
||||
<Color x:Key="ErrorColor">#FFFF0000</Color> |
|
||||
<Color x:Key="ErrorLightColor">#10FF0000</Color> |
|
||||
|
|
||||
<Color x:Key="InvisibleSelectionColor">#01000000</Color> |
<Color x:Key="ThemeAccentColor">#CC119EDA</Color> |
||||
|
<Color x:Key="ThemeAccentColor2">#99119EDA</Color> |
||||
|
<Color x:Key="ThemeAccentColor3">#66119EDA</Color> |
||||
|
<Color x:Key="ThemeAccentColor4">#33119EDA</Color> |
||||
|
|
||||
<SolidColorBrush x:Key="ThemeBackgroundBrush" Color="{DynamicResource ThemeBackgroundColor}"></SolidColorBrush> |
<Color x:Key="ThemeBackgroundColor">#FFFFFFFF</Color> |
||||
<SolidColorBrush x:Key="ThemeBorderLightBrush" Color="{DynamicResource ThemeBorderLightColor}"></SolidColorBrush> |
<Color x:Key="ThemeBorderLightColor">#FFAAAAAA</Color> |
||||
<SolidColorBrush x:Key="ThemeBorderMidBrush" Color="{DynamicResource ThemeBorderMidColor}"></SolidColorBrush> |
<Color x:Key="ThemeBorderMidColor">#FF888888</Color> |
||||
<SolidColorBrush x:Key="ThemeBorderDarkBrush" Color="{DynamicResource ThemeBorderDarkColor}"></SolidColorBrush> |
<Color x:Key="ThemeBorderDarkColor">#FF333333</Color> |
||||
<SolidColorBrush x:Key="ThemeControlLightBrush" Color="{DynamicResource ThemeControlLightColor}"></SolidColorBrush> |
<Color x:Key="ThemeControlLightColor">#FFFFFFFF</Color> |
||||
<SolidColorBrush x:Key="ThemeControlMidBrush" Color="{DynamicResource ThemeControlMidColor}"></SolidColorBrush> |
<Color x:Key="ThemeControlMidColor">#FFAAAAAA</Color> |
||||
<SolidColorBrush x:Key="ThemeControlDarkBrush" Color="{DynamicResource ThemeControlDarkColor}"></SolidColorBrush> |
<Color x:Key="ThemeControlDarkColor">#FF888888</Color> |
||||
<SolidColorBrush x:Key="ThemeControlHighlightLowBrush" Color="{DynamicResource ThemeControlHighlightLowColor}"></SolidColorBrush> |
<Color x:Key="ThemeControlHighlightLowColor">#FFF0F0F0</Color> |
||||
<SolidColorBrush x:Key="ThemeControlHighlightMidBrush" Color="{DynamicResource ThemeControlHighlightMidColor}"></SolidColorBrush> |
<Color x:Key="ThemeControlHighlightMidColor">#FFD0D0D0</Color> |
||||
<SolidColorBrush x:Key="ThemeControlHighlightDarkBrush" Color="{DynamicResource ThemeControlHighlightDarkColor}"></SolidColorBrush> |
<Color x:Key="ThemeControlHighlightDarkColor">#FF808080</Color> |
||||
<SolidColorBrush x:Key="ThemeForegroundBrush" Color="{DynamicResource ThemeForegroundColor}"></SolidColorBrush> |
<Color x:Key="ThemeForegroundColor">#FF000000</Color> |
||||
<SolidColorBrush x:Key="ThemeForegroundLightBrush" Color="{DynamicResource ThemeForegroundLightColor}"></SolidColorBrush> |
<Color x:Key="ThemeForegroundLightColor">#FF808080</Color> |
||||
|
|
||||
<SolidColorBrush x:Key="HighlightBrush" Color="{DynamicResource HighlightColor}"></SolidColorBrush> |
|
||||
<SolidColorBrush x:Key="ThemeAccentBrush" Color="{DynamicResource ThemeAccentColor}"></SolidColorBrush> |
|
||||
<SolidColorBrush x:Key="ThemeAccentBrush2" Color="{DynamicResource ThemeAccentColor2}"></SolidColorBrush> |
|
||||
<SolidColorBrush x:Key="ThemeAccentBrush3" Color="{DynamicResource ThemeAccentColor3}"></SolidColorBrush> |
|
||||
<SolidColorBrush x:Key="ThemeAccentBrush4" Color="{DynamicResource ThemeAccentColor4}"></SolidColorBrush> |
|
||||
<SolidColorBrush x:Key="ErrorBrush" Color="{DynamicResource ErrorColor}"></SolidColorBrush> |
|
||||
<SolidColorBrush x:Key="ErrorLightBrush" Color="{DynamicResource ErrorLightColor}"></SolidColorBrush> |
|
||||
|
|
||||
<SolidColorBrush x:Key="InvisibleSelectionBrush" Color="{DynamicResource InvisibleSelectionColor}"></SolidColorBrush> |
|
||||
|
|
||||
<Thickness x:Key="ThemeBorderThickness">2</Thickness> |
|
||||
<sys:Double x:Key="ThemeDisabledOpacity">0.5</sys:Double> |
|
||||
|
|
||||
<sys:Double x:Key="FontSizeSmall">10</sys:Double> |
<Color x:Key="HighlightColor">#FF086F9E</Color> |
||||
<sys:Double x:Key="FontSizeNormal">12</sys:Double> |
<Color x:Key="ErrorColor">#FFFF0000</Color> |
||||
<sys:Double x:Key="FontSizeLarge">16</sys:Double> |
<Color x:Key="ErrorLightColor">#10FF0000</Color> |
||||
</Style.Resources> |
|
||||
|
<SolidColorBrush x:Key="ThemeBackgroundBrush" Color="{DynamicResource ThemeBackgroundColor}"></SolidColorBrush> |
||||
|
<SolidColorBrush x:Key="ThemeBorderLightBrush" Color="{DynamicResource ThemeBorderLightColor}"></SolidColorBrush> |
||||
|
<SolidColorBrush x:Key="ThemeBorderMidBrush" Color="{DynamicResource ThemeBorderMidColor}"></SolidColorBrush> |
||||
|
<SolidColorBrush x:Key="ThemeBorderDarkBrush" Color="{DynamicResource ThemeBorderDarkColor}"></SolidColorBrush> |
||||
|
<SolidColorBrush x:Key="ThemeControlLightBrush" Color="{DynamicResource ThemeControlLightColor}"></SolidColorBrush> |
||||
|
<SolidColorBrush x:Key="ThemeControlMidBrush" Color="{DynamicResource ThemeControlMidColor}"></SolidColorBrush> |
||||
|
<SolidColorBrush x:Key="ThemeControlDarkBrush" Color="{DynamicResource ThemeControlDarkColor}"></SolidColorBrush> |
||||
|
<SolidColorBrush x:Key="ThemeControlHighlightLowBrush" Color="{DynamicResource ThemeControlHighlightLowColor}"></SolidColorBrush> |
||||
|
<SolidColorBrush x:Key="ThemeControlHighlightMidBrush" Color="{DynamicResource ThemeControlHighlightMidColor}"></SolidColorBrush> |
||||
|
<SolidColorBrush x:Key="ThemeControlHighlightDarkBrush" Color="{DynamicResource ThemeControlHighlightDarkColor}"></SolidColorBrush> |
||||
|
<SolidColorBrush x:Key="ThemeForegroundBrush" Color="{DynamicResource ThemeForegroundColor}"></SolidColorBrush> |
||||
|
<SolidColorBrush x:Key="ThemeForegroundLightBrush" Color="{DynamicResource ThemeForegroundLightColor}"></SolidColorBrush> |
||||
|
|
||||
|
<SolidColorBrush x:Key="HighlightBrush" Color="{DynamicResource HighlightColor}"></SolidColorBrush> |
||||
|
<SolidColorBrush x:Key="ThemeAccentBrush" Color="{DynamicResource ThemeAccentColor}"></SolidColorBrush> |
||||
|
<SolidColorBrush x:Key="ThemeAccentBrush2" Color="{DynamicResource ThemeAccentColor2}"></SolidColorBrush> |
||||
|
<SolidColorBrush x:Key="ThemeAccentBrush3" Color="{DynamicResource ThemeAccentColor3}"></SolidColorBrush> |
||||
|
<SolidColorBrush x:Key="ThemeAccentBrush4" Color="{DynamicResource ThemeAccentColor4}"></SolidColorBrush> |
||||
|
<SolidColorBrush x:Key="ErrorBrush" Color="{DynamicResource ErrorColor}"></SolidColorBrush> |
||||
|
<SolidColorBrush x:Key="ErrorLightBrush" Color="{DynamicResource ErrorLightColor}"></SolidColorBrush> |
||||
|
|
||||
|
<Thickness x:Key="ThemeBorderThickness">2</Thickness> |
||||
|
<sys:Double x:Key="ThemeDisabledOpacity">0.5</sys:Double> |
||||
|
|
||||
|
<sys:Double x:Key="FontSizeSmall">10</sys:Double> |
||||
|
<sys:Double x:Key="FontSizeNormal">12</sys:Double> |
||||
|
<sys:Double x:Key="FontSizeLarge">16</sys:Double> |
||||
|
</Style.Resources> |
||||
</Style> |
</Style> |
||||
|
|||||
@ -1,92 +1,92 @@ |
|||||
<Styles xmlns="https://github.com/avaloniaui" |
<Styles xmlns="https://github.com/avaloniaui" |
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
||||
xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"> |
xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"> |
||||
<Style Selector="TreeViewItem"> |
<Style Selector="TreeViewItem"> |
||||
<Style.Resources> |
<Style.Resources> |
||||
<converters:MarginMultiplierConverter Indent="16" Left="True" x:Key="LeftMarginConverter" /> |
<converters:MarginMultiplierConverter Indent="16" Left="True" x:Key="LeftMarginConverter" /> |
||||
</Style.Resources> |
</Style.Resources> |
||||
<Setter Property="Padding" Value="2"/> |
<Setter Property="Padding" Value="2"/> |
||||
<Setter Property="Background" Value="{DynamicResource InvisibleSelectionBrush}"/> |
<Setter Property="Background" Value="Transparent"/> |
||||
<Setter Property="Template"> |
<Setter Property="Template"> |
||||
<ControlTemplate> |
<ControlTemplate> |
||||
<StackPanel> |
<StackPanel> |
||||
<Border Name="SelectionBorder" |
<Border Name="SelectionBorder" |
||||
Focusable="True" |
Focusable="True" |
||||
Background="{TemplateBinding Background}" |
Background="{TemplateBinding Background}" |
||||
BorderBrush="{TemplateBinding BorderBrush}" |
BorderBrush="{TemplateBinding BorderBrush}" |
||||
BorderThickness="{TemplateBinding BorderThickness}" |
BorderThickness="{TemplateBinding BorderThickness}" |
||||
TemplatedControl.IsTemplateFocusTarget="True"> |
TemplatedControl.IsTemplateFocusTarget="True"> |
||||
<Grid ColumnDefinitions="16, *" |
<Grid ColumnDefinitions="16, *" |
||||
Margin="{TemplateBinding Depth, Mode=OneWay, Converter={StaticResource LeftMarginConverter}}" > |
Margin="{TemplateBinding Level, Mode=OneWay, Converter={StaticResource LeftMarginConverter}}" > |
||||
<ToggleButton Name="expander" |
<ToggleButton Name="expander" |
||||
Focusable="False" |
Focusable="False" |
||||
IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}"/> |
IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}"/> |
||||
<ContentPresenter Name="PART_HeaderPresenter" |
<ContentPresenter Name="PART_HeaderPresenter" |
||||
Focusable="False" |
Focusable="False" |
||||
Content="{TemplateBinding Header}" |
Content="{TemplateBinding Header}" |
||||
HorizontalContentAlignment="{TemplateBinding HorizontalAlignment}" |
HorizontalContentAlignment="{TemplateBinding HorizontalAlignment}" |
||||
Padding="{TemplateBinding Padding}" |
Padding="{TemplateBinding Padding}" |
||||
Grid.Column="1"/> |
Grid.Column="1"/> |
||||
</Grid> |
</Grid> |
||||
</Border> |
</Border> |
||||
<ItemsPresenter Name="PART_ItemsPresenter" |
<ItemsPresenter Name="PART_ItemsPresenter" |
||||
IsVisible="{TemplateBinding IsExpanded}" |
IsVisible="{TemplateBinding IsExpanded}" |
||||
Items="{TemplateBinding Items}" |
Items="{TemplateBinding Items}" |
||||
ItemsPanel="{TemplateBinding ItemsPanel}" |
ItemsPanel="{TemplateBinding ItemsPanel}" |
||||
MemberSelector="{TemplateBinding MemberSelector}"/> |
MemberSelector="{TemplateBinding MemberSelector}"/> |
||||
</StackPanel> |
</StackPanel> |
||||
</ControlTemplate> |
</ControlTemplate> |
||||
</Setter> |
</Setter> |
||||
</Style> |
</Style> |
||||
|
|
||||
<Style Selector="TreeViewItem /template/ ToggleButton#expander"> |
<Style Selector="TreeViewItem /template/ ToggleButton#expander"> |
||||
<Setter Property="Template"> |
<Setter Property="Template"> |
||||
<ControlTemplate> |
<ControlTemplate> |
||||
<Border Background="Transparent" |
<Border Background="Transparent" |
||||
Width="14" |
Width="14" |
||||
Height="12" |
Height="12" |
||||
HorizontalAlignment="Center" |
HorizontalAlignment="Center" |
||||
VerticalAlignment="Center"> |
VerticalAlignment="Center"> |
||||
<Path Fill="{DynamicResource ThemeForegroundBrush}" |
<Path Fill="{DynamicResource ThemeForegroundBrush}" |
||||
HorizontalAlignment="Center" |
HorizontalAlignment="Center" |
||||
VerticalAlignment="Center" |
VerticalAlignment="Center" |
||||
Data="M 0 2 L 4 6 L 0 10 Z"/> |
Data="M 0 2 L 4 6 L 0 10 Z"/> |
||||
</Border> |
</Border> |
||||
</ControlTemplate> |
</ControlTemplate> |
||||
</Setter> |
</Setter> |
||||
</Style> |
</Style> |
||||
|
|
||||
<Style Selector="TreeViewItem /template/ ContentPresenter#PART_HeaderPresenter"> |
<Style Selector="TreeViewItem /template/ ContentPresenter#PART_HeaderPresenter"> |
||||
<Setter Property="Padding" Value="2"/> |
<Setter Property="Padding" Value="2"/> |
||||
</Style> |
</Style> |
||||
|
|
||||
<Style Selector="TreeViewItem[IsSelected=false] /template/ Border#SelectionBorder[IsPointerOver=true]"> |
<Style Selector="TreeViewItem /template/ Border#SelectionBorder:pointerover"> |
||||
<Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}"/> |
<Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}"/> |
||||
</Style> |
</Style> |
||||
|
|
||||
<Style Selector="TreeViewItem[IsSelected=true] /template/ Border#SelectionBorder"> |
<Style Selector="TreeViewItem:selected /template/ Border#SelectionBorder"> |
||||
<Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/> |
<Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/> |
||||
</Style> |
</Style> |
||||
|
|
||||
<Style Selector="TreeViewItem[IsSelected=true] /template/ Border#SelectionBorder[IsPointerOver=false][IsFocused=true]"> |
<Style Selector="TreeViewItem:selected /template/ Border#SelectionBorder:focus"> |
||||
<Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/> |
<Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/> |
||||
</Style> |
</Style> |
||||
|
|
||||
<Style Selector="TreeViewItem[IsSelected=true] /template/ Border#SelectionBorder[IsPointerOver=true][IsFocused=false]"> |
<Style Selector="TreeViewItem:selected /template/ Border#SelectionBorder:pointerover"> |
||||
<Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/> |
<Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/> |
||||
</Style> |
</Style> |
||||
|
|
||||
<Style Selector="TreeViewItem[IsSelected=true] /template/ Border#SelectionBorder[IsPointerOver=true][IsFocused=true]"> |
<Style Selector="TreeViewItem:selected /template/ Border#SelectionBorder:pointerover:focus"> |
||||
<Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/> |
<Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/> |
||||
</Style> |
</Style> |
||||
|
|
||||
<Style Selector="TreeViewItem /template/ ToggleButton#expander:checked"> |
<Style Selector="TreeViewItem /template/ ToggleButton#expander:checked"> |
||||
<Setter Property="RenderTransform"> |
<Setter Property="RenderTransform"> |
||||
<RotateTransform Angle="45"/> |
<RotateTransform Angle="45"/> |
||||
</Setter> |
</Setter> |
||||
</Style> |
</Style> |
||||
|
|
||||
<Style Selector="TreeViewItem:empty /template/ ToggleButton#expander"> |
<Style Selector="TreeViewItem:empty /template/ ToggleButton#expander"> |
||||
<Setter Property="IsVisible" Value="False"/> |
<Setter Property="IsVisible" Value="False"/> |
||||
</Style> |
</Style> |
||||
</Styles> |
</Styles> |
||||
|
|||||
Loading…
Reference in new issue