From c0b454dd30d65eec1a560ffe1272517f04d9ee3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=99=E4=BB=A3=E7=A0=81=E7=9A=84=E5=8E=A8=E5=AD=90?=
 <465351405@qq.com>
Date: Fri, 10 Mar 2023 15:07:34 +0800
Subject: [PATCH] fixed listviewgridviewstyle

---
 .../Windows/Helpers/ResourceHelper.cs         | 14 +++
 .../Communal/Attached/DataGridViewAttached.cs | 44 ---------
 .../Controls/DialogBox/DialogExtensions.cs    | 10 +-
 .../ItemsControl/ListViewAssistant.cs         | 84 ++++++++++++++++-
 .../Controls/Thumb/GridViewColumThumb.cs      |  4 +-
 CookPopularControl/CookPopularControl.xml     | 53 ++++++-----
 .../Themes/BaseStyle/ListBoxBaseStyle.xaml    |  2 +-
 CookPopularControl/Themes/ListViewStyle.xaml  | 94 ++++++++++---------
 8 files changed, 184 insertions(+), 121 deletions(-)
 delete mode 100644 CookPopularControl/Communal/Attached/DataGridViewAttached.cs

diff --git a/CookPopularCSharpToolkit/Windows/Helpers/ResourceHelper.cs b/CookPopularCSharpToolkit/Windows/Helpers/ResourceHelper.cs
index 9e0a7f4..e85542b 100644
--- a/CookPopularCSharpToolkit/Windows/Helpers/ResourceHelper.cs
+++ b/CookPopularCSharpToolkit/Windows/Helpers/ResourceHelper.cs
@@ -25,5 +25,19 @@ public static TResource GetResource<TResource>(string resourceKey)
 
             return default(TResource);
         }
+
+        /// <summary>
+        /// 根据Key获取资源
+        /// </summary>
+        /// <typeparam name="TResource"></typeparam>
+        /// <param name="resourceKey"></param>
+        /// <returns></returns>
+        public static TResource GetResource<TResource>(object resourceKey)
+        {
+            if (Application.Current.TryFindResource(resourceKey) is TResource resource)
+                return resource;
+
+            return default(TResource);
+        }
     }
 }
diff --git a/CookPopularControl/Communal/Attached/DataGridViewAttached.cs b/CookPopularControl/Communal/Attached/DataGridViewAttached.cs
deleted file mode 100644
index cf3ce86..0000000
--- a/CookPopularControl/Communal/Attached/DataGridViewAttached.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using CookPopularCSharpToolkit.Communal;
-using System.Windows;
-using System.Windows.Controls;
-
-
-
-/*
- * Copyright (c) 2021 All Rights Reserved.
- * Description：DataGridViewAttached
- * Author： Chance_写代码的厨子
- * Create Time：2021-03-30 11:21:15
- */
-namespace CookPopularControl.Communal
-{
-    /// <summary>
-    /// 提供<see cref="DataGrid"/>与<see cref="GridView"/>的附加属性基类
-    /// </summary>
-    public class DataGridViewAttached
-    {
-        public static double GetColumnMinWidth(DependencyObject obj) => (double)obj.GetValue(ColumnMinWidthProperty);
-        public static void SetColumnMinWidth(DependencyObject obj, double value) => obj.SetValue(ColumnMinWidthProperty, value);
-        /// <summary>
-        /// <see cref="ColumnMinWidthProperty"/>标识列项最小宽度
-        /// </summary>
-        public static readonly DependencyProperty ColumnMinWidthProperty =
-            DependencyProperty.RegisterAttached("ColumnMinWidth", typeof(double), typeof(DataGridViewAttached), new PropertyMetadata(ValueBoxes.Double30Box));
-
-        public static double GetColumnHeaderHeight(DependencyObject obj) => (double)obj.GetValue(ColumnHeaderHeightProperty);
-        public static void SetColumnHeaderHeight(DependencyObject obj, double value) => obj.SetValue(ColumnHeaderHeightProperty, value);
-        /// <summary>
-        /// 标识ColumnHeader的高度
-        /// </summary>
-        public static readonly DependencyProperty ColumnHeaderHeightProperty =
-            DependencyProperty.RegisterAttached("ColumnHeaderHeight", typeof(double), typeof(DataGridViewAttached), new PropertyMetadata(ValueBoxes.Double20Box));
-
-        public static Thickness GetColumnHeaderPadding(DependencyObject obj) => (Thickness)obj.GetValue(ColumnHeaderPaddingProperty);
-        public static void SetColumnHeaderPadding(DependencyObject obj, Thickness value) => obj.SetValue(ColumnHeaderPaddingProperty, value);
-        /// <summary>
-        /// 标识ColumnHeader的内容的内边距
-        /// </summary>
-        public static readonly DependencyProperty ColumnHeaderPaddingProperty =
-            DependencyProperty.RegisterAttached("ColumnHeaderPadding", typeof(Thickness), typeof(DataGridViewAttached), new PropertyMetadata(default(Thickness)));
-    }
-}
diff --git a/CookPopularControl/Controls/DialogBox/DialogExtensions.cs b/CookPopularControl/Controls/DialogBox/DialogExtensions.cs
index 6b053fb..9812699 100644
--- a/CookPopularControl/Controls/DialogBox/DialogExtensions.cs
+++ b/CookPopularControl/Controls/DialogBox/DialogExtensions.cs
@@ -93,15 +93,7 @@ void SetResult()
             {
                 try
                 {
-                    bool isExcute = false;
-                    if (dialog is Windows.DialogWindow win && win.IsConfirm)
-                        isExcute = true;
-                    else if (dialog is DialogBox dialogBox)
-                        isExcute = true;
-                    else
-                        isExcute = false;
-
-                    if (isExcute)
+                    if ((dialog is Windows.DialogWindow win && win.IsConfirm) || dialog is DialogBox)
                         tcs.TrySetResult(dialog.GetViewModel<IDialogResultable<TResult>>().Result);
                 }
                 catch (Exception e)
diff --git a/CookPopularControl/Controls/ItemsControl/ListViewAssistant.cs b/CookPopularControl/Controls/ItemsControl/ListViewAssistant.cs
index 7b40f0e..d21ce20 100644
--- a/CookPopularControl/Controls/ItemsControl/ListViewAssistant.cs
+++ b/CookPopularControl/Controls/ItemsControl/ListViewAssistant.cs
@@ -1,5 +1,10 @@
-using System.Windows;
+using CookPopularCSharpToolkit.Communal;
+using CookPopularCSharpToolkit.Windows;
+using System;
+using System.Linq;
+using System.Windows;
 using System.Windows.Controls;
+using System.Xml.Linq;
 
 
 
@@ -12,12 +17,87 @@
 namespace CookPopularControl.Controls
 {
     /// <summary>
-    /// <see cref="ListView"/>的附加属性基类
+    /// 表示<see cref="GridViewColumn"/>的附加属性基类
+    /// </summary>
+    public class GridViewColumnAssistant
+    {
+        public static GridLength GetColumnMinWidth(DependencyObject obj) => (GridLength)obj.GetValue(ColumnMinWidthProperty);
+        public static void SetColumnMinWidth(DependencyObject obj, GridLength value) => obj.SetValue(ColumnMinWidthProperty, value);
+        /// <summary>
+        /// 标识<see cref="GridViewColumnHeader"/>列项最小宽度
+        /// </summary>
+        public static readonly DependencyProperty ColumnMinWidthProperty =
+            DependencyProperty.RegisterAttached("ColumnMinWidth", typeof(GridLength), typeof(GridViewColumnAssistant), new PropertyMetadata(GridLength.Auto, OnColumnMinWidthChanged));
+
+        private static void OnColumnMinWidthChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is GridViewColumn column)
+            {
+                var defaultGridViewColumnHeaderStyle = ResourceHelper.GetResource<Style>(typeof(GridViewColumnHeader));
+                Style style = new Style(typeof(GridViewColumnHeader), defaultGridViewColumnHeaderStyle);
+                var setter = new Setter(GridViewColumnHeader.MinWidthProperty, GetColumnMinWidth(column).Value);
+                style.Setters.Add(setter);
+                column.HeaderContainerStyle = style;
+            }
+        }
+
+
+        public static Thickness GetColumnHeaderPadding(DependencyObject obj) => (Thickness)obj.GetValue(ColumnHeaderPaddingProperty);
+        internal static void SetColumnHeaderPadding(DependencyObject obj, Thickness value) => obj.SetValue(ColumnHeaderPaddingProperty, value);
+        /// <summary>
+        /// 标识<see cref="GridViewColumnHeader"/>的内边距
+        /// 暂时无效
+        /// </summary>
+        public static readonly DependencyProperty ColumnHeaderPaddingProperty =
+            DependencyProperty.RegisterAttached("ColumnHeaderPadding", typeof(Thickness), typeof(GridViewColumnAssistant), new PropertyMetadata(default(Thickness), OnColumnHeaderPaddingChanged));
+
+        private static void OnColumnHeaderPaddingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is GridViewColumn column)
+            {
+                var defaultGridViewColumnHeaderStyle = ResourceHelper.GetResource<Style>(typeof(GridViewColumnHeader));
+                Style style = new Style(typeof(GridViewColumnHeader), defaultGridViewColumnHeaderStyle);
+                var setter = new Setter(ColumnHeaderPaddingProperty, GetColumnHeaderPadding(column));
+                //var setter = new Setter(GridViewColumnHeader.PaddingProperty, GetColumnHeaderPadding(column));
+
+                //var setter = (Setter)style.Setters.FirstOrDefault(setter => ((Setter)setter).Property == GridViewColumnHeader.PaddingProperty)!;
+                //setter.Value = GetColumnHeaderPadding(column);
+
+                style.Setters.Add(setter);
+                column.HeaderContainerStyle = style;
+            }
+        }
+    }
+
+
+    /// <summary>
+    /// 表示<see cref="ListView"/>的附加属性基类
     /// </summary>
     public class ListViewAssistant
     {
+        public static double GetColumnHeaderHeight(DependencyObject obj) => (double)obj.GetValue(ColumnHeaderHeightProperty);
+        public static void SetColumnHeaderHeight(DependencyObject obj, double value) => obj.SetValue(ColumnHeaderHeightProperty, value);
+        /// <summary>
+        /// 标识<see cref="GridViewColumnHeader"/>的标头高度
+        /// </summary>
+        public static readonly DependencyProperty ColumnHeaderHeightProperty =
+            DependencyProperty.RegisterAttached("ColumnHeaderHeight", typeof(double), typeof(ListViewAssistant), new PropertyMetadata(ValueBoxes.Double30Box));
+
+
+        public static bool GetIsColumnHeaderFontWeight(DependencyObject obj) => (bool)obj.GetValue(IsColumnHeaderFontWeightProperty);
+        public static void SetIsColumnHeaderFontWeight(DependencyObject obj, bool value) => obj.SetValue(IsColumnHeaderFontWeightProperty, ValueBoxes.BooleanBox(value));
+        /// <summary>
+        /// 表示<see cref="GridViewColumnHeader"/>是否采用粗体
+        /// </summary>
+        public static readonly DependencyProperty IsColumnHeaderFontWeightProperty =
+            DependencyProperty.RegisterAttached("IsColumnHeaderFontWeight", typeof(bool), typeof(ListViewAssistant), new PropertyMetadata(ValueBoxes.FalseBox));
+
+
         public static Thickness GetListViewItemPadding(DependencyObject obj) => (Thickness)obj.GetValue(ListViewItemPaddingProperty);
         public static void SetListViewItemPadding(DependencyObject obj, Thickness value) => obj.SetValue(ListViewItemPaddingProperty, value);
+        /// <summary>
+        /// 表示<see cref="ListViewItem"/>的内边距
+        /// </summary>
         public static readonly DependencyProperty ListViewItemPaddingProperty =
             DependencyProperty.RegisterAttached("ListViewItemPadding", typeof(Thickness), typeof(ListViewAssistant), new PropertyMetadata(default(Thickness)));
     }
diff --git a/CookPopularControl/Controls/Thumb/GridViewColumThumb.cs b/CookPopularControl/Controls/Thumb/GridViewColumThumb.cs
index b58909d..cfe174b 100644
--- a/CookPopularControl/Controls/Thumb/GridViewColumThumb.cs
+++ b/CookPopularControl/Controls/Thumb/GridViewColumThumb.cs
@@ -1,4 +1,5 @@
-using System.Windows.Input;
+using System.Windows;
+using System.Windows.Input;
 
 
 
@@ -24,7 +25,6 @@ protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
         protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
         {
             base.OnMouseLeftButtonUp(e);
-
             Mouse.OverrideCursor = null;
         }
     }
diff --git a/CookPopularControl/CookPopularControl.xml b/CookPopularControl/CookPopularControl.xml
index 3998c5c..29492a7 100644
--- a/CookPopularControl/CookPopularControl.xml
+++ b/CookPopularControl/CookPopularControl.xml
@@ -14,26 +14,6 @@
             <see cref="F:CookPopularControl.Communal.ButtonBaseAttached.IsShowRippleProperty"/>是否显示按钮点击的波纹效果
             </summary>
         </member>
-        <member name="T:CookPopularControl.Communal.DataGridViewAttached">
-            <summary>
-            提供<see cref="T:System.Windows.Controls.DataGrid"/>与<see cref="T:System.Windows.Controls.GridView"/>的附加属性基类
-            </summary>
-        </member>
-        <member name="F:CookPopularControl.Communal.DataGridViewAttached.ColumnMinWidthProperty">
-            <summary>
-            <see cref="F:CookPopularControl.Communal.DataGridViewAttached.ColumnMinWidthProperty"/>标识列项最小宽度
-            </summary>
-        </member>
-        <member name="F:CookPopularControl.Communal.DataGridViewAttached.ColumnHeaderHeightProperty">
-            <summary>
-            标识ColumnHeader的高度
-            </summary>
-        </member>
-        <member name="F:CookPopularControl.Communal.DataGridViewAttached.ColumnHeaderPaddingProperty">
-            <summary>
-            标识ColumnHeader的内容的内边距
-            </summary>
-        </member>
         <member name="T:CookPopularControl.Communal.FrameworkElementBaseAttached">
             <summary>
             提供WPF控件附加属性的基类
@@ -3798,9 +3778,40 @@
             <see cref="F:CookPopularControl.Controls.ComboBoxAssistant.IsShowDropDownButtonProperty"/>标识是否显示DropDownButton 
             </summary>
         </member>
+        <member name="T:CookPopularControl.Controls.GridViewColumnAssistant">
+            <summary>
+            表示<see cref="T:System.Windows.Controls.GridViewColumn"/>的附加属性基类
+            </summary>
+        </member>
+        <member name="F:CookPopularControl.Controls.GridViewColumnAssistant.ColumnMinWidthProperty">
+            <summary>
+            标识<see cref="T:System.Windows.Controls.GridViewColumnHeader"/>列项最小宽度
+            </summary>
+        </member>
+        <member name="F:CookPopularControl.Controls.GridViewColumnAssistant.ColumnHeaderPaddingProperty">
+            <summary>
+            标识<see cref="T:System.Windows.Controls.GridViewColumnHeader"/>的内边距
+            暂时无效
+            </summary>
+        </member>
         <member name="T:CookPopularControl.Controls.ListViewAssistant">
             <summary>
-            <see cref="T:System.Windows.Controls.ListView"/>的附加属性基类
+            表示<see cref="T:System.Windows.Controls.ListView"/>的附加属性基类
+            </summary>
+        </member>
+        <member name="F:CookPopularControl.Controls.ListViewAssistant.ColumnHeaderHeightProperty">
+            <summary>
+            标识<see cref="T:System.Windows.Controls.GridViewColumnHeader"/>的标头高度
+            </summary>
+        </member>
+        <member name="F:CookPopularControl.Controls.ListViewAssistant.IsColumnHeaderFontWeightProperty">
+            <summary>
+            表示<see cref="T:System.Windows.Controls.GridViewColumnHeader"/>是否采用粗体
+            </summary>
+        </member>
+        <member name="F:CookPopularControl.Controls.ListViewAssistant.ListViewItemPaddingProperty">
+            <summary>
+            表示<see cref="T:System.Windows.Controls.ListViewItem"/>的内边距
             </summary>
         </member>
         <member name="T:CookPopularControl.Controls.TreeViewAssistant">
diff --git a/CookPopularControl/Themes/BaseStyle/ListBoxBaseStyle.xaml b/CookPopularControl/Themes/BaseStyle/ListBoxBaseStyle.xaml
index 71749a8..54291c7 100644
--- a/CookPopularControl/Themes/BaseStyle/ListBoxBaseStyle.xaml
+++ b/CookPopularControl/Themes/BaseStyle/ListBoxBaseStyle.xaml
@@ -216,7 +216,7 @@
                                       pc:ScrollBarAssistant.HorizontalScrollBarHeight="{TemplateBinding pc:ScrollBarAssistant.HorizontalScrollBarHeight}"
                                       pc:ScrollBarAssistant.IsShowScrollBarRepeatButton="{TemplateBinding pc:ScrollBarAssistant.IsShowScrollBarRepeatButton}"
                                       pc:ScrollBarAssistant.VerticalScrollBarWidth="{TemplateBinding pc:ScrollBarAssistant.VerticalScrollBarWidth}">
-                            <!--<StackPanel SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" IsItemsHost="True" />-->
+                            <!--<StackPanel x:Name="ItemsPresenter" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" IsItemsHost="True" />-->
                             <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </ScrollViewer>
                     </Border>
diff --git a/CookPopularControl/Themes/ListViewStyle.xaml b/CookPopularControl/Themes/ListViewStyle.xaml
index 6066bb6..c319f65 100644
--- a/CookPopularControl/Themes/ListViewStyle.xaml
+++ b/CookPopularControl/Themes/ListViewStyle.xaml
@@ -9,29 +9,28 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="{x:Static GridView.GridViewScrollViewerStyleKey}" TargetType="{x:Type ScrollViewer}">
-        <Setter Property="CanContentScroll" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ScrollViewer}">
                     <Grid Background="{TemplateBinding Background}">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition />
+                            <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
-                            <RowDefinition />
+                            <RowDefinition Height="*" />
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
-                        <DockPanel Grid.Row="0" Grid.Column="0">
+                        <DockPanel Margin="{TemplateBinding Padding}">
                             <ScrollViewer DockPanel.Dock="Top"
-                                          Background="Transparent"
-                                          Focusable="false"
+                                          Focusable="False"
                                           HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"
                                           pc:ScrollViewerAssistant.SyncHorizontalOffset="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=HorizontalOffset, Mode=OneWay}">
                                 <Border BorderBrush="{DynamicResource PrimaryThemeBrush}" BorderThickness="0,0,0,1">
                                     <StackPanel Orientation="Horizontal">
                                         <GridViewHeaderRowPresenter x:Name="PART_GridViewHeaderRowPresenter"
                                                                     Columns="{Binding Path=TemplatedParent.View.Columns, RelativeSource={RelativeSource TemplatedParent}}"
+                                                                    Margin="2,0,2,0"
                                                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                                                     AllowsColumnReorder="{Binding Path=TemplatedParent.View.AllowsColumnReorder, RelativeSource={RelativeSource TemplatedParent}}"
                                                                     ColumnHeaderContainerStyle="{Binding Path=TemplatedParent.View.ColumnHeaderContainerStyle, RelativeSource={RelativeSource TemplatedParent}}"
@@ -46,8 +45,7 @@
                             <ScrollContentPresenter x:Name="PART_ScrollContentPresenter"
                                                     ContentTemplate="{TemplateBinding ContentTemplate}"
                                                     Margin="{TemplateBinding Padding}"
-                                                    CanContentScroll="{TemplateBinding CanContentScroll}"
-                                                    CanHorizontallyScroll="False" CanVerticallyScroll="False" />
+                                                    CanContentScroll="True" CanHorizontallyScroll="False" CanVerticallyScroll="False" />
                         </DockPanel>
 
                         <ScrollBar x:Name="PART_VerticalScrollBar" Grid.Row="0" Grid.Column="1"
@@ -55,12 +53,14 @@
                                    Maximum="{TemplateBinding ScrollableHeight}"
                                    AutomationProperties.AutomationId="VerticalScrollBar" Orientation="Vertical"
                                    ViewportSize="{TemplateBinding ViewportHeight}"
+                                   pc:ScrollBarAssistant.IsShowScrollBarRepeatButton="{TemplateBinding pc:ScrollBarAssistant.IsShowScrollBarRepeatButton}"
                                    Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" />
                         <ScrollBar x:Name="PART_HorizontalScrollBar" Grid.Row="1" Grid.Column="0"
                                    Value="{TemplateBinding HorizontalOffset}"
                                    Maximum="{TemplateBinding ScrollableWidth}"
                                    AutomationProperties.AutomationId="HorizontalScrollBar" Orientation="Horizontal"
                                    ViewportSize="{TemplateBinding ViewportWidth}"
+                                   pc:ScrollBarAssistant.IsShowScrollBarRepeatButton="{TemplateBinding pc:ScrollBarAssistant.IsShowScrollBarRepeatButton}"
                                    Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" />
                         <Rectangle x:Name="PART_Corner" Grid.Row="1" Grid.Column="1"
                                    Fill="{TemplateBinding Foreground}"
@@ -127,45 +127,49 @@
 
     <Style x:Key="GridViewColumnHeaderGripperThumb" TargetType="{x:Type Thumb}">
         <Setter Property="Width" Value="5" />
-        <Setter Property="Padding" Value="5" />
+        <Setter Property="Padding" Value="0" />
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border Background="{TemplateBinding Background}"
-                            Padding="{TemplateBinding Padding}"
-                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                            Cursor="SizeWE" />
+                    <Border Background="Transparent" Padding="{TemplateBinding Padding}" Cursor="SizeAll">
+                        <Rectangle Width="5" Fill="{TemplateBinding Background}" HorizontalAlignment="Left" />
+                    </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
     <Style x:Key="{x:Type GridViewColumnHeader}" TargetType="{x:Type GridViewColumnHeader}">
+        <Setter Property="Height" Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListView}, Path=(pc:ListViewAssistant.ColumnHeaderHeight)}" />
         <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListView}, Path=Foreground}" />
-        <Setter Property="Height" Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListView}, Path=(common:DataGridViewAttached.ColumnHeaderHeight)}" />
-        <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="TextBlock.FontWeight" Value="Medium" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="Padding" Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListView}, Path=(common:DataGridViewAttached.ColumnHeaderPadding)}" />
+        <Setter Property="BorderThickness" Value="0,0" />
+        <Setter Property="Padding" Value="2,0,0,0" />
+        <Setter Property="HorizontalContentAlignment" Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListView}, Path=HorizontalContentAlignment}" />
+        <Setter Property="VerticalContentAlignment" Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListView}, Path=VerticalContentAlignment}" />
+        <Setter Property="pc:GridViewColumnAssistant.ColumnHeaderPadding" Value="0" />
+        <Setter Property="pc:ListViewAssistant.IsColumnHeaderFontWeight" Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListView}, Path=(pc:ListViewAssistant.IsColumnHeaderFontWeight)}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type GridViewColumnHeader}">
                     <DockPanel>
                         <pc:GridViewColumThumb x:Name="PART_HeaderGripper" DockPanel.Dock="Right" Style="{StaticResource GridViewColumnHeaderGripperThumb}" />
-                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-                            <ContentPresenter RecognizesAccessKey="True"
-                                              Margin="{TemplateBinding Padding}"
+                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}">
+                            <ContentPresenter x:Name="HeaderContent"
+                                              RecognizesAccessKey="True"
+                                              Margin="{TemplateBinding pc:GridViewColumnAssistant.ColumnHeaderPadding}"
                                               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              TextElement.FontWeight="{TemplateBinding FontWeight}"
                                               TextElement.Foreground="{TemplateBinding Foreground}" />
                         </Border>
                     </DockPanel>
-                    <ControlTemplate.Triggers />
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="pc:ListViewAssistant.IsColumnHeaderFontWeight" Value="True">
+                            <Setter Property="FontWeight" Value="DemiBold" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -196,32 +200,35 @@
     </Style>
 
     <Style x:Key="ListViewGridViewItemStyle" TargetType="{x:Type ListViewItem}">
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="{DynamicResource PrimaryThemeBrush}" />
         <Setter Property="BorderThickness" Value="0,0,0,1" />
-        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Padding" Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListView}, Path=(pc:ListViewAssistant.ListViewItemPadding)}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListView}, Path=VerticalContentAlignment}" />
+        <Setter Property="SnapsToDevicePixels" Value="true" />
+        <Setter Property="OverridesDefaultStyle" Value="true" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="ListBoxItem">
+                <ControlTemplate TargetType="{x:Type ListViewItem}">
                     <Border x:Name="ItemBorder"
                             Height="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListView}, Path=(common:SelectorAttached.ItemHeight)}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             Background="{TemplateBinding Background}"
-                            Margin="-1"
-                            Padding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListView}, Path=(pc:ListViewAssistant.ListViewItemPadding)}"
                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                        <GridViewRowPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        <GridViewRowPresenter Columns="{TemplateBinding GridView.ColumnCollection}"
+                                              Content="{TemplateBinding Content}"
+                                              Margin="{TemplateBinding Padding}"
+                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsKeyboardFocusWithin" Value="True">
-                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="BorderThickness" Value="0,0,0,2" />
             </Trigger>
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter Property="Background" Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListView}, Path=(common:SelectorAttached.ItemMouseOverBackground)}" />
@@ -256,11 +263,14 @@
     <Style x:Key="DefaultListViewStyle" TargetType="{x:Type ListView}" BasedOn="{StaticResource DefaultListBoxStyle}" />
 
     <Style x:Key="ListViewGridViewStyle" TargetType="{x:Type ListView}" BasedOn="{StaticResource DefaultListBoxStyle}">
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="ItemContainerStyle" Value="{StaticResource ListViewGridViewItemStyle}" />
-        <Setter Property="common:DataGridViewAttached.ColumnHeaderHeight" Value="30" />
-        <Setter Property="common:DataGridViewAttached.ColumnHeaderPadding" Value="4,0,0,0" />
+        <Setter Property="pc:ListViewAssistant.ColumnHeaderHeight" Value="30" />
         <Setter Property="pc:ListViewAssistant.ListViewItemPadding" Value="0" />
-        <Setter Property="pc:ScrollViewerAssistant.IsCornerShow" Value="True" />
+        <Setter Property="pc:ListViewAssistant.IsColumnHeaderFontWeight" Value="False" />
+        <Setter Property="pc:ScrollBarAssistant.IsShowScrollBarRepeatButton" Value="False" />
+        <Setter Property="pc:ScrollViewerAssistant.IsCornerShow" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListView}">
@@ -268,20 +278,20 @@
                             BorderThickness="{TemplateBinding BorderThickness}"
                             Background="{TemplateBinding Background}"
                             CornerRadius="{TemplateBinding common:FrameworkElementBaseAttached.CornerRadius}">
-                        <ScrollViewer Background="Transparent"
-                                      HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                        <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                                       VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                                      pc:ScrollBarAssistant.IsShowScrollBarRepeatButton="{TemplateBinding pc:ScrollBarAssistant.IsShowScrollBarRepeatButton}"
                                       Style="{StaticResource {x:Static GridView.GridViewScrollViewerStyleKey}}">
-                            <StackPanel SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" IsItemsHost="True" />
+                            <StackPanel x:Name="ItemsPresenter" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" IsItemsHost="True" />
                         </ScrollViewer>
                     </Border>
                     <ControlTemplate.Triggers>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsGrouping" Value="true" />
-                                <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+                                <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="False" />
                             </MultiTrigger.Conditions>
-                            <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
                         </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>