Skip to content

Commit 8527c88

Browse files
NaBianNaBian
committed
chore: minor modify datagrid and listview style.
1 parent 7434aee commit 8527c88

File tree

8 files changed

+28
-28
lines changed

8 files changed

+28
-28
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<Setter Property="CellStyle" Value="{StaticResource DataGridCellStyle}"/>
2323
<Setter Property="Padding" Value="6"/>
2424
<Setter Property="RowHeight" Value="44"/>
25-
<Setter Property="ColumnHeaderHeight" Value="44"/>
25+
<Setter Property="ColumnHeaderHeight" Value="{StaticResource DefaultControlHeight}"/>
2626
<Setter Property="hc:DataGridAttach.TextColumnStyle" Value="{StaticResource DataGridTextColumnStyle}"/>
2727
<Setter Property="hc:DataGridAttach.EditingTextColumnStyle" Value="{StaticResource DataGridEditingTextColumnStyle}"/>
2828
<Setter Property="hc:DataGridAttach.ComboBoxColumnStyle" Value="{StaticResource DataGridComboBoxColumnStyle}"/>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
1616
<Setter Property="VerticalContentAlignment" Value="Center" />
1717
<Setter Property="ItemContainerStyle" Value="{StaticResource ListViewItemBaseStyle}" />
18-
<Setter Property="hc:GridViewAttach.ColumnHeaderHeight" Value="44" />
18+
<Setter Property="hc:GridViewAttach.ColumnHeaderHeight" Value="{StaticResource DefaultControlHeight}" />
1919
<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
2020
<Setter Property="Template">
2121
<Setter.Value>
@@ -52,9 +52,9 @@
5252
<RowDefinition Height="*" />
5353
<RowDefinition Height="Auto" />
5454
</Grid.RowDefinitions>
55-
<DockPanel Grid.ColumnSpan="2" x:Name="Header">
55+
<DockPanel Grid.ColumnSpan="2" x:Name="Header" Margin="0,0,0,6">
5656
<ScrollViewer DockPanel.Dock="Top" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" Focusable="false">
57-
<GridViewHeaderRowPresenter AllowsColumnReorder="{Binding View.AllowsColumnReorder, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderContainerStyle="{Binding View.ColumnHeaderContainerStyle, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderToolTip="{Binding View.ColumnHeaderToolTip, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderContextMenu="{Binding View.ColumnHeaderContextMenu, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderTemplate="{Binding View.ColumnHeaderTemplate, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderTemplateSelector="{Binding View.ColumnHeaderTemplateSelector, RelativeSource={RelativeSource AncestorType=ListView}}" Columns="{Binding View.Columns, RelativeSource={RelativeSource AncestorType=ListView}}" Margin="2,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
57+
<GridViewHeaderRowPresenter AllowsColumnReorder="{Binding View.AllowsColumnReorder, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderContainerStyle="{Binding View.ColumnHeaderContainerStyle, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderToolTip="{Binding View.ColumnHeaderToolTip, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderContextMenu="{Binding View.ColumnHeaderContextMenu, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderTemplate="{Binding View.ColumnHeaderTemplate, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderTemplateSelector="{Binding View.ColumnHeaderTemplateSelector, RelativeSource={RelativeSource AncestorType=ListView}}" Columns="{Binding View.Columns, RelativeSource={RelativeSource AncestorType=ListView}}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
5858
</ScrollViewer>
5959
</DockPanel>
6060
<hc:ToggleBlock Grid.Row="1" Grid.ColumnSpan="2" Grid.RowSpan="2" IsChecked="{Binding HasItems,RelativeSource={RelativeSource AncestorType=ListView},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
@@ -112,7 +112,7 @@
112112

113113
<Style x:Key="ListView.Small" BasedOn="{StaticResource ListViewBaseStyle}" TargetType="ListView">
114114
<Setter Property="ItemContainerStyle" Value="{StaticResource ListViewItemBaseStyle.Small}" />
115-
<Setter Property="hc:GridViewAttach.ColumnHeaderHeight" Value="30" />
115+
<Setter Property="hc:GridViewAttach.ColumnHeaderHeight" Value="20" />
116116
</Style>
117117

118118
</ResourceDictionary>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9335,7 +9335,7 @@
93359335
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
93369336
<Setter Property="SnapsToDevicePixels" Value="true" />
93379337
<Setter Property="Margin" Value="0,0,0,4" />
9338-
<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
9338+
<Setter Property="Padding" Value="6,0" />
93399339
<Setter Property="MinHeight" Value="44" />
93409340
<Setter Property="Template">
93419341
<Setter.Value>
@@ -11807,7 +11807,7 @@
1180711807
<Setter Property="VerticalContentAlignment" Value="Center" />
1180811808
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
1180911809
<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
11810-
<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
11810+
<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultInputPadding}" />
1181111811
<Setter Property="Template">
1181211812
<Setter.Value>
1181311813
<ControlTemplate TargetType="DataGridCell">
@@ -12474,7 +12474,7 @@
1247412474
<Setter Property="CellStyle" Value="{StaticResource DataGridCellStyle}" />
1247512475
<Setter Property="Padding" Value="6" />
1247612476
<Setter Property="RowHeight" Value="44" />
12477-
<Setter Property="ColumnHeaderHeight" Value="44" />
12477+
<Setter Property="ColumnHeaderHeight" Value="{StaticResource DefaultControlHeight}" />
1247812478
<Setter Property="hc:DataGridAttach.TextColumnStyle" Value="{StaticResource DataGridTextColumnStyle}" />
1247912479
<Setter Property="hc:DataGridAttach.EditingTextColumnStyle" Value="{StaticResource DataGridEditingTextColumnStyle}" />
1248012480
<Setter Property="hc:DataGridAttach.ComboBoxColumnStyle" Value="{StaticResource DataGridComboBoxColumnStyle}" />
@@ -12806,7 +12806,7 @@
1280612806
<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
1280712807
<Setter Property="VerticalContentAlignment" Value="Center" />
1280812808
<Setter Property="ItemContainerStyle" Value="{StaticResource ListViewItemBaseStyle}" />
12809-
<Setter Property="hc:GridViewAttach.ColumnHeaderHeight" Value="44" />
12809+
<Setter Property="hc:GridViewAttach.ColumnHeaderHeight" Value="{StaticResource DefaultControlHeight}" />
1281012810
<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
1281112811
<Setter Property="Template">
1281212812
<Setter.Value>
@@ -12843,9 +12843,9 @@
1284312843
<RowDefinition Height="*" />
1284412844
<RowDefinition Height="Auto" />
1284512845
</Grid.RowDefinitions>
12846-
<DockPanel Grid.ColumnSpan="2" x:Name="Header">
12846+
<DockPanel Grid.ColumnSpan="2" x:Name="Header" Margin="0,0,0,6">
1284712847
<ScrollViewer DockPanel.Dock="Top" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" Focusable="false">
12848-
<GridViewHeaderRowPresenter AllowsColumnReorder="{Binding View.AllowsColumnReorder, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderContainerStyle="{Binding View.ColumnHeaderContainerStyle, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderToolTip="{Binding View.ColumnHeaderToolTip, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderContextMenu="{Binding View.ColumnHeaderContextMenu, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderTemplate="{Binding View.ColumnHeaderTemplate, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderTemplateSelector="{Binding View.ColumnHeaderTemplateSelector, RelativeSource={RelativeSource AncestorType=ListView}}" Columns="{Binding View.Columns, RelativeSource={RelativeSource AncestorType=ListView}}" Margin="2,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
12848+
<GridViewHeaderRowPresenter AllowsColumnReorder="{Binding View.AllowsColumnReorder, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderContainerStyle="{Binding View.ColumnHeaderContainerStyle, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderToolTip="{Binding View.ColumnHeaderToolTip, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderContextMenu="{Binding View.ColumnHeaderContextMenu, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderTemplate="{Binding View.ColumnHeaderTemplate, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderTemplateSelector="{Binding View.ColumnHeaderTemplateSelector, RelativeSource={RelativeSource AncestorType=ListView}}" Columns="{Binding View.Columns, RelativeSource={RelativeSource AncestorType=ListView}}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
1284912849
</ScrollViewer>
1285012850
</DockPanel>
1285112851
<hc:ToggleBlock Grid.Row="1" Grid.ColumnSpan="2" Grid.RowSpan="2" IsChecked="{Binding HasItems,RelativeSource={RelativeSource AncestorType=ListView},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
@@ -12900,7 +12900,7 @@
1290012900
</Style>
1290112901
<Style x:Key="ListView.Small" BasedOn="{StaticResource ListViewBaseStyle}" TargetType="ListView">
1290212902
<Setter Property="ItemContainerStyle" Value="{StaticResource ListViewItemBaseStyle.Small}" />
12903-
<Setter Property="hc:GridViewAttach.ColumnHeaderHeight" Value="30" />
12903+
<Setter Property="hc:GridViewAttach.ColumnHeaderHeight" Value="20" />
1290412904
</Style>
1290512905
<Style BasedOn="{StaticResource LoadingLineBaseStyle}" TargetType="hc:LoadingLine" />
1290612906
<Style x:Key="LoadingLineLight" BasedOn="{StaticResource LoadingLineBaseStyle}" TargetType="hc:LoadingLine">

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:hc="clr-namespace:HandyControl.Controls"
44
xmlns:system="clr-namespace:System;assembly=mscorlib">
55

@@ -36,7 +36,7 @@
3636
<Setter Property="VerticalContentAlignment" Value="Center"/>
3737
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
3838
<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}"/>
39-
<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
39+
<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultInputPadding}"/>
4040
<Setter Property="Template">
4141
<Setter.Value>
4242
<ControlTemplate TargetType="DataGridCell">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
4848
<Setter Property="SnapsToDevicePixels" Value="true"/>
4949
<Setter Property="Margin" Value="0,0,0,4"/>
50-
<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}"/>
50+
<Setter Property="Padding" Value="6,0"/>
5151
<Setter Property="MinHeight" Value="44"/>
5252
<Setter Property="Template">
5353
<Setter.Value>

‎src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<Setter Property="CellStyle" Value="{StaticResource DataGridCellStyle}"/>
2323
<Setter Property="Padding" Value="6"/>
2424
<Setter Property="RowHeight" Value="44"/>
25-
<Setter Property="ColumnHeaderHeight" Value="44"/>
25+
<Setter Property="ColumnHeaderHeight" Value="{StaticResource DefaultControlHeight}"/>
2626
<Setter Property="hc:DataGridAttach.TextColumnStyle" Value="{StaticResource DataGridTextColumnStyle}"/>
2727
<Setter Property="hc:DataGridAttach.EditingTextColumnStyle" Value="{StaticResource DataGridEditingTextColumnStyle}"/>
2828
<Setter Property="hc:DataGridAttach.ComboBoxColumnStyle" Value="{StaticResource DataGridComboBoxColumnStyle}"/>

‎src/Shared/HandyControl_Shared/Themes/Styles/ListView.xaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
1616
<Setter Property="VerticalContentAlignment" Value="Center" />
1717
<Setter Property="ItemContainerStyle" Value="{StaticResource ListViewItemBaseStyle}" />
18-
<Setter Property="hc:GridViewAttach.ColumnHeaderHeight" Value="44" />
18+
<Setter Property="hc:GridViewAttach.ColumnHeaderHeight" Value="{StaticResource DefaultControlHeight}" />
1919
<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
2020
<Setter Property="Template">
2121
<Setter.Value>
@@ -52,9 +52,9 @@
5252
<RowDefinition Height="*" />
5353
<RowDefinition Height="Auto" />
5454
</Grid.RowDefinitions>
55-
<DockPanel Grid.ColumnSpan="2" x:Name="Header">
55+
<DockPanel Grid.ColumnSpan="2" x:Name="Header" Margin="0,0,0,6">
5656
<ScrollViewer DockPanel.Dock="Top" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" Focusable="false">
57-
<GridViewHeaderRowPresenter AllowsColumnReorder="{Binding View.AllowsColumnReorder, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderContainerStyle="{Binding View.ColumnHeaderContainerStyle, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderToolTip="{Binding View.ColumnHeaderToolTip, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderContextMenu="{Binding View.ColumnHeaderContextMenu, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderTemplate="{Binding View.ColumnHeaderTemplate, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderTemplateSelector="{Binding View.ColumnHeaderTemplateSelector, RelativeSource={RelativeSource AncestorType=ListView}}" Columns="{Binding View.Columns, RelativeSource={RelativeSource AncestorType=ListView}}" Margin="2,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
57+
<GridViewHeaderRowPresenter AllowsColumnReorder="{Binding View.AllowsColumnReorder, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderContainerStyle="{Binding View.ColumnHeaderContainerStyle, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderToolTip="{Binding View.ColumnHeaderToolTip, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderContextMenu="{Binding View.ColumnHeaderContextMenu, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderTemplate="{Binding View.ColumnHeaderTemplate, RelativeSource={RelativeSource AncestorType=ListView}}" ColumnHeaderTemplateSelector="{Binding View.ColumnHeaderTemplateSelector, RelativeSource={RelativeSource AncestorType=ListView}}" Columns="{Binding View.Columns, RelativeSource={RelativeSource AncestorType=ListView}}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
5858
</ScrollViewer>
5959
</DockPanel>
6060
<hc:ToggleBlock Grid.Row="1" Grid.ColumnSpan="2" Grid.RowSpan="2" IsChecked="{Binding HasItems,RelativeSource={RelativeSource AncestorType=ListView},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
@@ -119,7 +119,7 @@
119119

120120
<Style x:Key="ListView.Small" BasedOn="{StaticResource ListViewBaseStyle}" TargetType="ListView">
121121
<Setter Property="ItemContainerStyle" Value="{StaticResource ListViewItemBaseStyle.Small}" />
122-
<Setter Property="hc:GridViewAttach.ColumnHeaderHeight" Value="30" />
122+
<Setter Property="hc:GridViewAttach.ColumnHeaderHeight" Value="20" />
123123
</Style>
124124

125125
</ResourceDictionary>

0 commit comments

Comments
 (0)