Skip to content

Commit 9efb6a0

Browse files
NaBianNaBian
committed
fix(style): close #980 
1 parent 3d5e63b commit 9efb6a0

File tree

8 files changed

+240
-298
lines changed

8 files changed

+240
-298
lines changed

‎src/Net_40/HandyControl_Net_40/Themes/Styles/ListView.xaml‎

Lines changed: 3 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -2,82 +2,7 @@
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:hc="clr-namespace:HandyControl.Controls">
44

5-
<Style x:Key="GridViewColumnHeaderGripper" TargetType="Thumb">
6-
<Setter Property="Canvas.Right" Value="-9"/>
7-
<Setter Property="Width" Value="18"/>
8-
<Setter Property="Height" Value="{Binding ActualHeight, RelativeSource={RelativeSource TemplatedParent}}"/>
9-
<Setter Property="Padding" Value="0"/>
10-
<Setter Property="Background" Value="Transparent"/>
11-
<Setter Property="Template">
12-
<Setter.Value>
13-
<ControlTemplate TargetType="Thumb">
14-
<Border Background="Transparent" Padding="{TemplateBinding Padding}">
15-
<Rectangle Fill="{TemplateBinding Background}" HorizontalAlignment="Center" Width="1"/>
16-
</Border>
17-
</ControlTemplate>
18-
</Setter.Value>
19-
</Setter>
20-
</Style>
21-
22-
<Style TargetType="GridViewColumnHeader">
23-
<Setter Property="VerticalContentAlignment" Value="Center"/>
24-
<Setter Property="HorizontalContentAlignment" Value="Left"/>
25-
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
26-
<Setter Property="Padding" Value="12,6,12,12"/>
27-
<Setter Property="MinHeight" Value="44"/>
28-
<Setter Property="Template">
29-
<Setter.Value>
30-
<ControlTemplate TargetType="GridViewColumnHeader">
31-
<Grid SnapsToDevicePixels="true">
32-
<Border x:Name="HeaderBorder" BorderBrush="{TemplateBinding BorderBrush}" Background="Transparent">
33-
<ContentPresenter x:Name="HeaderContent" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
34-
</Border>
35-
<Canvas>
36-
<Thumb x:Name="PART_HeaderGripper" Style="{StaticResource GridViewColumnHeaderGripper}"/>
37-
</Canvas>
38-
</Grid>
39-
</ControlTemplate>
40-
</Setter.Value>
41-
</Setter>
42-
</Style>
43-
44-
<Style x:Key="ListViewItemBaseStyle" TargetType="ListViewItem">
45-
<Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
46-
<Setter Property="BorderThickness" Value="0"/>
47-
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
48-
<Setter Property="SnapsToDevicePixels" Value="true"/>
49-
<Setter Property="Margin" Value="0,0,0,4"/>
50-
<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}"/>
51-
<Setter Property="MinHeight" Value="44"/>
52-
<Setter Property="Template">
53-
<Setter.Value>
54-
<ControlTemplate TargetType="ListViewItem">
55-
<Border CornerRadius="4" x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
56-
<GridViewRowPresenter Content="{TemplateBinding Content}" Columns="{TemplateBinding GridView.ColumnCollection}"/>
57-
</Border>
58-
</ControlTemplate>
59-
</Setter.Value>
60-
</Setter>
61-
<Style.Triggers>
62-
<Trigger Property="IsMouseOver" Value="true">
63-
<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}"/>
64-
</Trigger>
65-
<Trigger Property="IsSelected" Value="True">
66-
<Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
67-
<Setter Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}"/>
68-
</Trigger>
69-
<MultiTrigger>
70-
<MultiTrigger.Conditions>
71-
<Condition Property="IsSelected" Value="true"/>
72-
<Condition Property="Selector.IsSelectionActive" Value="false"/>
73-
</MultiTrigger.Conditions>
74-
<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}"/>
75-
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
76-
</MultiTrigger>
77-
</Style.Triggers>
78-
</Style>
79-
80-
<Style TargetType="ListView">
5+
<Style x:Key="ListViewBaseStyle" TargetType="ListView">
816
<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
827
<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
838
<Setter Property="BorderThickness" Value="1"/>
@@ -117,4 +42,6 @@
11742
</Setter>
11843
</Style>
11944

45+
<Style BasedOn="{StaticResource ListViewBaseStyle}" TargetType="ListView"/>
46+
12047
</ResourceDictionary>

‎src/Net_40/HandyControl_Net_40/Themes/Theme.xaml‎

Lines changed: 74 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -678,6 +678,22 @@
678678
</Setter.Value>
679679
</Setter>
680680
</Style>
681+
<Style x:Key="GridViewColumnHeaderGripper" TargetType="Thumb">
682+
<Setter Property="Canvas.Right" Value="-9" />
683+
<Setter Property="Width" Value="18" />
684+
<Setter Property="Height" Value="{Binding ActualHeight, RelativeSource={RelativeSource TemplatedParent}}" />
685+
<Setter Property="Padding" Value="0" />
686+
<Setter Property="Background" Value="Transparent" />
687+
<Setter Property="Template">
688+
<Setter.Value>
689+
<ControlTemplate TargetType="Thumb">
690+
<Border Background="Transparent" Padding="{TemplateBinding Padding}">
691+
<Rectangle Fill="{TemplateBinding Background}" HorizontalAlignment="Center" Width="1" />
692+
</Border>
693+
</ControlTemplate>
694+
</Setter.Value>
695+
</Setter>
696+
</Style>
681697
<DrawingBrush x:Key="SortByCategoryDrawingBrush" o:Freeze="True">
682698
<DrawingBrush.Drawing>
683699
<DrawingGroup o:Freeze="True">
@@ -803,22 +819,6 @@
803819
<ItemsPanelTemplate x:Key="StackPanelVerticalItemsPanelTemplate">
804820
<StackPanel FocusVisualStyle="{x:Null}" HorizontalAlignment="Stretch" />
805821
</ItemsPanelTemplate>
806-
<Style x:Key="GridViewColumnHeaderGripper" TargetType="Thumb">
807-
<Setter Property="Canvas.Right" Value="-9" />
808-
<Setter Property="Width" Value="18" />
809-
<Setter Property="Height" Value="{Binding ActualHeight, RelativeSource={RelativeSource TemplatedParent}}" />
810-
<Setter Property="Padding" Value="0" />
811-
<Setter Property="Background" Value="Transparent" />
812-
<Setter Property="Template">
813-
<Setter.Value>
814-
<ControlTemplate TargetType="Thumb">
815-
<Border Background="Transparent" Padding="{TemplateBinding Padding}">
816-
<Rectangle Fill="{TemplateBinding Background}" HorizontalAlignment="Center" Width="1" />
817-
</Border>
818-
</ControlTemplate>
819-
</Setter.Value>
820-
</Setter>
821-
</Style>
822822
<ItemsPanelTemplate x:Key="ComboBoxCapsuleItemsPanelTemplate">
823823
<UniformGrid FocusVisualStyle="{x:Null}" Rows="1" />
824824
</ItemsPanelTemplate>
@@ -9152,6 +9152,62 @@
91529152
</Setter.Value>
91539153
</Setter>
91549154
</Style>
9155+
<Style TargetType="GridViewColumnHeader">
9156+
<Setter Property="VerticalContentAlignment" Value="Center" />
9157+
<Setter Property="HorizontalContentAlignment" Value="Left" />
9158+
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
9159+
<Setter Property="Padding" Value="12,6,12,12" />
9160+
<Setter Property="MinHeight" Value="44" />
9161+
<Setter Property="Template">
9162+
<Setter.Value>
9163+
<ControlTemplate TargetType="GridViewColumnHeader">
9164+
<hc:SimplePanel SnapsToDevicePixels="true">
9165+
<Border x:Name="HeaderBorder" BorderBrush="{TemplateBinding BorderBrush}" Background="Transparent">
9166+
<ContentPresenter x:Name="HeaderContent" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
9167+
</Border>
9168+
<Canvas>
9169+
<Thumb x:Name="PART_HeaderGripper" Style="{StaticResource GridViewColumnHeaderGripper}" />
9170+
</Canvas>
9171+
</hc:SimplePanel>
9172+
</ControlTemplate>
9173+
</Setter.Value>
9174+
</Setter>
9175+
</Style>
9176+
<Style x:Key="ListViewItemBaseStyle" TargetType="ListViewItem">
9177+
<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
9178+
<Setter Property="BorderThickness" Value="0" />
9179+
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
9180+
<Setter Property="SnapsToDevicePixels" Value="true" />
9181+
<Setter Property="Margin" Value="0,0,0,4" />
9182+
<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
9183+
<Setter Property="MinHeight" Value="44" />
9184+
<Setter Property="Template">
9185+
<Setter.Value>
9186+
<ControlTemplate TargetType="ListViewItem">
9187+
<Border CornerRadius="4" x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
9188+
<GridViewRowPresenter Content="{TemplateBinding Content}" Columns="{TemplateBinding GridView.ColumnCollection}" />
9189+
</Border>
9190+
</ControlTemplate>
9191+
</Setter.Value>
9192+
</Setter>
9193+
<Style.Triggers>
9194+
<Trigger Property="IsMouseOver" Value="true">
9195+
<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
9196+
</Trigger>
9197+
<Trigger Property="IsSelected" Value="True">
9198+
<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
9199+
<Setter Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}" />
9200+
</Trigger>
9201+
<MultiTrigger>
9202+
<MultiTrigger.Conditions>
9203+
<Condition Property="IsSelected" Value="true" />
9204+
<Condition Property="Selector.IsSelectionActive" Value="false" />
9205+
</MultiTrigger.Conditions>
9206+
<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
9207+
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
9208+
</MultiTrigger>
9209+
</Style.Triggers>
9210+
</Style>
91559211
<Style x:Key="LoadingBaseStyle" TargetType="hc:LoadingBase">
91569212
<Setter Property="Focusable" Value="False" />
91579213
<Setter Property="DotDiameter" Value="10" />
@@ -12523,63 +12579,7 @@
1252312579
<Style x:Key="StackPanelVerticalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
1252412580
<Setter Property="ItemsPanel" Value="{StaticResource StackPanelVerticalItemsPanelTemplate}" />
1252512581
</Style>
12526-
<Style TargetType="GridViewColumnHeader">
12527-
<Setter Property="VerticalContentAlignment" Value="Center" />
12528-
<Setter Property="HorizontalContentAlignment" Value="Left" />
12529-
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
12530-
<Setter Property="Padding" Value="12,6,12,12" />
12531-
<Setter Property="MinHeight" Value="44" />
12532-
<Setter Property="Template">
12533-
<Setter.Value>
12534-
<ControlTemplate TargetType="GridViewColumnHeader">
12535-
<Grid SnapsToDevicePixels="true">
12536-
<Border x:Name="HeaderBorder" BorderBrush="{TemplateBinding BorderBrush}" Background="Transparent">
12537-
<ContentPresenter x:Name="HeaderContent" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
12538-
</Border>
12539-
<Canvas>
12540-
<Thumb x:Name="PART_HeaderGripper" Style="{StaticResource GridViewColumnHeaderGripper}" />
12541-
</Canvas>
12542-
</Grid>
12543-
</ControlTemplate>
12544-
</Setter.Value>
12545-
</Setter>
12546-
</Style>
12547-
<Style x:Key="ListViewItemBaseStyle" TargetType="ListViewItem">
12548-
<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
12549-
<Setter Property="BorderThickness" Value="0" />
12550-
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
12551-
<Setter Property="SnapsToDevicePixels" Value="true" />
12552-
<Setter Property="Margin" Value="0,0,0,4" />
12553-
<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
12554-
<Setter Property="MinHeight" Value="44" />
12555-
<Setter Property="Template">
12556-
<Setter.Value>
12557-
<ControlTemplate TargetType="ListViewItem">
12558-
<Border CornerRadius="4" x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
12559-
<GridViewRowPresenter Content="{TemplateBinding Content}" Columns="{TemplateBinding GridView.ColumnCollection}" />
12560-
</Border>
12561-
</ControlTemplate>
12562-
</Setter.Value>
12563-
</Setter>
12564-
<Style.Triggers>
12565-
<Trigger Property="IsMouseOver" Value="true">
12566-
<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
12567-
</Trigger>
12568-
<Trigger Property="IsSelected" Value="True">
12569-
<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
12570-
<Setter Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}" />
12571-
</Trigger>
12572-
<MultiTrigger>
12573-
<MultiTrigger.Conditions>
12574-
<Condition Property="IsSelected" Value="true" />
12575-
<Condition Property="Selector.IsSelectionActive" Value="false" />
12576-
</MultiTrigger.Conditions>
12577-
<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
12578-
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
12579-
</MultiTrigger>
12580-
</Style.Triggers>
12581-
</Style>
12582-
<Style TargetType="ListView">
12582+
<Style x:Key="ListViewBaseStyle" TargetType="ListView">
1258312583
<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
1258412584
<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
1258512585
<Setter Property="BorderThickness" Value="1" />
@@ -12618,6 +12618,7 @@
1261812618
</Setter.Value>
1261912619
</Setter>
1262012620
</Style>
12621+
<Style BasedOn="{StaticResource ListViewBaseStyle}" TargetType="ListView" />
1262112622
<Style BasedOn="{StaticResource LoadingLineBaseStyle}" TargetType="hc:LoadingLine" />
1262212623
<Style x:Key="LoadingLineLight" BasedOn="{StaticResource LoadingLineBaseStyle}" TargetType="hc:LoadingLine">
1262312624
<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />

‎src/Shared/HandyControl_Shared/HandyControl_Shared.projitems‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,9 @@
427427
<None Include="$(MSBuildThisFileDirectory)Themes\Styles\Base\AutoCompleteTextBoxBaseStyle.xaml">
428428
<SubType>Designer</SubType>
429429
</None>
430+
<None Include="$(MSBuildThisFileDirectory)Themes\Styles\Base\ListViewBaseStyle.xaml">
431+
<SubType>Designer</SubType>
432+
</None>
430433
<None Include="$(MSBuildThisFileDirectory)Themes\Styles\Base\DataGridBaseStyle.xaml">
431434
<SubType>Designer</SubType>
432435
</None>

‎src/Shared/HandyControl_Shared/Themes/Styles/Base/ListViewBaseStyle.xaml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3+
xmlns:hc="clr-namespace:HandyControl.Controls">
4+
5+
<Style x:Key="GridViewColumnHeaderGripper" TargetType="Thumb">
6+
<Setter Property="Canvas.Right" Value="-9"/>
7+
<Setter Property="Width" Value="18"/>
8+
<Setter Property="Height" Value="{Binding ActualHeight, RelativeSource={RelativeSource TemplatedParent}}"/>
9+
<Setter Property="Padding" Value="0"/>
10+
<Setter Property="Background" Value="Transparent"/>
11+
<Setter Property="Template">
12+
<Setter.Value>
13+
<ControlTemplate TargetType="Thumb">
14+
<Border Background="Transparent" Padding="{TemplateBinding Padding}">
15+
<Rectangle Fill="{TemplateBinding Background}" HorizontalAlignment="Center" Width="1"/>
16+
</Border>
17+
</ControlTemplate>
18+
</Setter.Value>
19+
</Setter>
20+
</Style>
21+
22+
<Style TargetType="GridViewColumnHeader">
23+
<Setter Property="VerticalContentAlignment" Value="Center"/>
24+
<Setter Property="HorizontalContentAlignment" Value="Left"/>
25+
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
26+
<Setter Property="Padding" Value="12,6,12,12"/>
27+
<Setter Property="MinHeight" Value="44"/>
28+
<Setter Property="Template">
29+
<Setter.Value>
30+
<ControlTemplate TargetType="GridViewColumnHeader">
31+
<hc:SimplePanel SnapsToDevicePixels="true">
32+
<Border x:Name="HeaderBorder" BorderBrush="{TemplateBinding BorderBrush}" Background="Transparent">
33+
<ContentPresenter x:Name="HeaderContent" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
34+
</Border>
35+
<Canvas>
36+
<Thumb x:Name="PART_HeaderGripper" Style="{StaticResource GridViewColumnHeaderGripper}"/>
37+
</Canvas>
38+
</hc:SimplePanel>
39+
</ControlTemplate>
40+
</Setter.Value>
41+
</Setter>
42+
</Style>
43+
44+
<Style x:Key="ListViewItemBaseStyle" TargetType="ListViewItem">
45+
<Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
46+
<Setter Property="BorderThickness" Value="0"/>
47+
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
48+
<Setter Property="SnapsToDevicePixels" Value="true"/>
49+
<Setter Property="Margin" Value="0,0,0,4"/>
50+
<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}"/>
51+
<Setter Property="MinHeight" Value="44"/>
52+
<Setter Property="Template">
53+
<Setter.Value>
54+
<ControlTemplate TargetType="ListViewItem">
55+
<Border CornerRadius="4" x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
56+
<GridViewRowPresenter Content="{TemplateBinding Content}" Columns="{TemplateBinding GridView.ColumnCollection}"/>
57+
</Border>
58+
</ControlTemplate>
59+
</Setter.Value>
60+
</Setter>
61+
<Style.Triggers>
62+
<Trigger Property="IsMouseOver" Value="true">
63+
<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}"/>
64+
</Trigger>
65+
<Trigger Property="IsSelected" Value="True">
66+
<Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
67+
<Setter Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}"/>
68+
</Trigger>
69+
<MultiTrigger>
70+
<MultiTrigger.Conditions>
71+
<Condition Property="IsSelected" Value="true"/>
72+
<Condition Property="Selector.IsSelectionActive" Value="false"/>
73+
</MultiTrigger.Conditions>
74+
<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}"/>
75+
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
76+
</MultiTrigger>
77+
</Style.Triggers>
78+
</Style>
79+
80+
81+
</ResourceDictionary>

0 commit comments

Comments
 (0)