From 7fa3a9969ac953b86c57d4e3a0f094b9d1169f70 Mon Sep 17 00:00:00 2001
From: Mahdi <mahdidvb72@gmail.com>
Date: Tue, 26 Nov 2019 22:48:27 +0330
Subject: [PATCH 01/17] add support icon for tabcontrol

---
 .../Controls/TabControlDemoCtl.xaml           |  8 +++----
 .../Themes/Styles/TabControl.xaml             | 21 +++++++++++++++----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
index 18dd0e5e..0c0aa790 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
@@ -46,16 +46,16 @@
                     <Label Style="{StaticResource LabelPrimary}" Margin="16,0,0,0" Content="IsEnableAnimation = True"/>
                 </StackPanel>
                 <hc:TabControl x:Name="TabControlDemo" IsEnableAnimation="True" ShowCloseButton="True" IsDraggable="True" IsEnableTabFill="True" Margin="32,0,32,32" Width="800" Height="300">
-                    <hc:TabItem Header="TabItem1">
+                    <hc:TabItem Header="TabItem1" hc:IconElement.Height="16" hc:IconElement.Width="16" hc:IconElement.Geometry="{DynamicResource ConfigGeometry}">
                         <hc:SimplePanel Background="{DynamicResource RegionBrush}"/>
                     </hc:TabItem>
-                    <hc:TabItem IsSelected="True" Header="TabItem2">
+                    <hc:TabItem IsSelected="True" Header="TabItem2" hc:IconElement.Height="16" hc:IconElement.Width="16" hc:IconElement.Geometry="{DynamicResource CalendarGeometry}">
                         <hc:SimplePanel Tag="123" Background="#FFE8563F"/>
                     </hc:TabItem>
-                    <hc:TabItem Header="TabItem3">
+                    <hc:TabItem Header="TabItem3" hc:IconElement.Height="16" hc:IconElement.Width="16" hc:IconElement.Geometry="{DynamicResource WindowsGeometry}">
                         <hc:SimplePanel Background="#FF3F4EE8"/>
                     </hc:TabItem>
-                    <hc:TabItem Header="TabItem4">
+                    <hc:TabItem Header="TabItem4" hc:IconElement.Height="16" hc:IconElement.Width="16" hc:IconElement.Geometry="{DynamicResource ClockGeometry}">
                         <hc:SimplePanel Background="#FFE83F6D"/>
                     </hc:TabItem>
                     <hc:TabItem Header="TabItem5">
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
index f5f0c5ce..654f47d0 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
@@ -43,13 +43,26 @@
                 <ControlTemplate TargetType="controls:TabItem">
                     <Grid x:Name="templateRoot" SnapsToDevicePixels="true" ContextMenu="{TemplateBinding Menu}">
                         <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
                             <ColumnDefinition/>
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
-                        <Border Grid.ColumnSpan="2" BorderThickness="{TemplateBinding BorderThickness}" x:Name="mainBorder" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" Margin="0">
-                            <Border Margin="0,0,0,-1" x:Name="innerBorder" Background="{DynamicResource RegionBrush}" Opacity="0"/>
+                        <Border Grid.ColumnSpan="3" BorderThickness="{TemplateBinding BorderThickness}" x:Name="mainBorder" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" Margin="0">
+                            <Border Margin="0,0,0,-1" x:Name="innerBorder" Background="{DynamicResource RegionBrush}" Opacity="1"/>
                         </Border>
-                        <ContentPresenter Grid.Column="0" x:Name="contentPresenter" ContentSource="Header" Focusable="False" HorizontalAlignment="Stretch" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center">
+                        <Path Grid.Column="0" Margin="10,0,0,0" x:Name="PathMain" Width="{TemplateBinding controls:IconElement.Width}" Height="{TemplateBinding controls:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding controls:IconElement.Geometry}">
+                            <Path.Style>
+                                <Style TargetType="Path">
+                                    <Setter Property="Visibility" Value="Visible"/>
+                                    <Style.Triggers>
+                                        <Trigger Property="Data" Value="{x:Null}">
+                                            <Setter Property="Visibility" Value="Collapsed"/>
+                                        </Trigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Path.Style>
+                        </Path>
+                        <ContentPresenter Grid.Column="1" x:Name="contentPresenter" ContentSource="Header" Focusable="False" HorizontalAlignment="Stretch" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center">
                             <ContentPresenter.OpacityMask>
                                 <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
                                     <GradientStop Offset="1"/>
@@ -57,7 +70,7 @@
                                 </LinearGradientBrush>
                             </ContentPresenter.OpacityMask>
                         </ContentPresenter>
-                        <Button Grid.Column="1" Focusable="False" Command="interactivity:ControlCommands.Close" Visibility="{TemplateBinding ShowCloseButton,Converter={StaticResource Boolean2VisibilityConverter}}" Background="Transparent" Style="{StaticResource ButtonCustom}" Width="28">
+                        <Button Grid.Column="2" Focusable="False" Command="interactivity:ControlCommands.Close" Visibility="{TemplateBinding ShowCloseButton,Converter={StaticResource Boolean2VisibilityConverter}}" Background="Transparent" Style="{StaticResource ButtonCustom}" Width="28">
                             <Path Fill="{DynamicResource PrimaryTextBrush}" Width="8" Height="8" Style="{StaticResource ClosePathStyle}"/>
                         </Button>
                     </Grid>

From ea3cf877ac789814fa3048a381f89d803901e6dc Mon Sep 17 00:00:00 2001
From: Mahdi Hosseini <mahdidvb72@gmail.com>
Date: Sat, 30 Nov 2019 19:30:16 +0330
Subject: [PATCH 02/17] Update TabControl.xaml

---
 src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
index 654f47d0..1f6cc8c0 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
@@ -48,7 +48,7 @@
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="3" BorderThickness="{TemplateBinding BorderThickness}" x:Name="mainBorder" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" Margin="0">
-                            <Border Margin="0,0,0,-1" x:Name="innerBorder" Background="{DynamicResource RegionBrush}" Opacity="1"/>
+                            <Border Margin="0,0,0,-1" x:Name="innerBorder" Background="{DynamicResource RegionBrush}" Opacity="0"/>
                         </Border>
                         <Path Grid.Column="0" Margin="10,0,0,0" x:Name="PathMain" Width="{TemplateBinding controls:IconElement.Width}" Height="{TemplateBinding controls:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding controls:IconElement.Geometry}">
                             <Path.Style>
@@ -348,4 +348,4 @@
         <Setter Property="controls:TitleElement.Foreground" Value="{DynamicResource TextIconBrush}"/>
     </Style>
 
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>

From 38b060f02bf2fcf5db3492ad6a57903fcd491364 Mon Sep 17 00:00:00 2001
From: guanguanchuangyu <3246907890@qq.com>
Date: Mon, 2 Dec 2019 21:48:30 +0800
Subject: [PATCH 03/17] add doc of native_control/Label,Listbox

---
 .../native_controls/image/index.md            |  27 +++-
 .../native_controls/label/index.md            |  89 ++++++++++-
 .../native_controls/listBox/index.md          | 139 +++++++++++++++++-
 3 files changed, 249 insertions(+), 6 deletions(-)

diff --git a/doc/source/handycontrol/native_controls/image/index.md b/doc/source/handycontrol/native_controls/image/index.md
index ca12ad62..d11560c0 100644
--- a/doc/source/handycontrol/native_controls/image/index.md
+++ b/doc/source/handycontrol/native_controls/image/index.md
@@ -1,5 +1,28 @@
 ---
-title: 建设中
+title: Image图片
 ---
 
-建设中
\ No newline at end of file
+在`HandyControl`中，对应原生的`Image`控件，仅仅提供了一个默认的控件样式，并未提供特殊样式，对于个性化定制，需要使用者自行定制
+
+默认样式定义：
+
+```
+    <Style TargetType="Image">
+    	<!--设定图片的长宽分布为均匀分布-->
+        <Setter Property="Stretch" Value="Uniform" />
+        <!--设置图片缩放模式为高质量位图缩放-->
+        <Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality" />
+    </Style>
+```
+
+案例：
+
+```
+    <StackPanel Background="LightGray">
+        <Image Source="Resources/Images/Image_basestyle.png" Margin="0,10"></Image>
+        <Image Source="Resources/Images/Image_basestyle.png" RenderOptions.BitmapScalingMode="HighQuality" Stretch="Uniform"></Image>
+    </StackPanel>
+```
+
+![image.baseStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/image.baseStyle.png)
+
diff --git a/doc/source/handycontrol/native_controls/label/index.md b/doc/source/handycontrol/native_controls/label/index.md
index ca12ad62..7d37086a 100644
--- a/doc/source/handycontrol/native_controls/label/index.md
+++ b/doc/source/handycontrol/native_controls/label/index.md
@@ -1,5 +1,90 @@
 ---
-title: 建设中
+title: Lable标签
 ---
 
-建设中
\ No newline at end of file
+# LabelBaseStyle
+
+Label标签 默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用，
+
+具体源码见：[LabelBaseStyle.xaml]( https://github.com/HandyOrg/HandyControl/blob/master/src/Shared/HandyControl_Shared/Themes/Styles/Base/LabelBaseStyle.xaml )
+
+使用如下：
+
+```
+    <Style BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+    </Style>
+```
+
+案例：
+
+```
+    <Label Content="Label默认样式" Margin="10"></Label>
+```
+
+![Label.BaseStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/Label.BaseStyle.png)
+
+# LabelPrimary
+
+Label标签 主样式
+
+案例：
+
+```
+    <Label Content="LabelPrimary样式" Margin="10" 
+    Style="{DynamicResource LabelPrimary}"></Label>
+```
+
+![Label.PrimaryStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/Label.PrimaryStyle.png)
+
+# LabelSuccess
+
+Label标签 成功类型样式
+
+案例：
+
+```
+    <Label Content="LabelSuccess样式" Margin="10" 
+    Style="{DynamicResource LabelSuccess}"></Label>
+```
+
+![Label.SuccessStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/Label.SuccessStyle.png)
+
+# LabelInfo
+
+Label标签 信息类型样式
+
+案例：
+
+```
+    <Label Content="LabelInfo样式" Margin="10" 
+    Style="{DynamicResource LabelInfo}"></Label>
+```
+
+![Label.InfoStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/Label.InfoStyle.png)
+
+# LabelWarning
+
+Label标签 警告类型样式
+
+案例：
+
+```
+    <Label Content="LabelWarning样式" Margin="10" 
+    Style="{DynamicResource LabelWarning}"></Label>
+```
+
+![Label.WarningStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/Label.WarningStyle.png)
+
+# LabelDanger
+
+Label标签 危险类型样式
+
+```
+    <Label Content="LabelDanger样式" Margin="10" 
+    Style="{DynamicResource LabelDanger}"></Label>
+```
+
+![Label.DangerStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/Label.DangerStyle.png)
+
diff --git a/doc/source/handycontrol/native_controls/listBox/index.md b/doc/source/handycontrol/native_controls/listBox/index.md
index ca12ad62..7c897e06 100644
--- a/doc/source/handycontrol/native_controls/listBox/index.md
+++ b/doc/source/handycontrol/native_controls/listBox/index.md
@@ -1,5 +1,140 @@
 ---
-title: 建设中
+title: ListBox 列表框
 ---
 
-建设中
\ No newline at end of file
+#  ListBoxBaseStyle
+
+ ListBox默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用，
+
+样式源码见[ListBoxBaseStyle.xaml](https://github.com/HandyOrg/HandyControl/blob/master/src/Shared/HandyControl_Shared/Themes/Styles/Base/ListBoxBaseStyle.xaml )。
+
+案例：
+
+```
+    <!--默认样式-->
+    <Style BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox"/>
+```
+
+![ListBox.BaseStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ListBox.BaseStyle.png)
+
+#  ListBoxCustom
+
+ListBox列表Custom样式，该样式保留了Listbox的基本属性样式，而数据显示样式由当前用户自定义，实现个性化定制
+
+案例：
+
+```
+    <ListBox Margin="10" ItemsSource="{Binding Datas}"  
+             Style="{DynamicResource ListBoxCustom}">
+        <ListBox.ItemTemplate>
+            <DataTemplate>
+                <Border BorderThickness="1" BorderBrush="Black" Margin="0,5">
+                    <DockPanel LastChildFill="True">
+                        <Path DockPanel.Dock="Left" Fill="YellowGreen" Width="20" Margin="10,0,10,0" HorizontalAlignment="Center" Data="{DynamicResource BubbleTailGeometry}"></Path>
+                        <TextBlock Padding="10" Text="{Binding Name}"></TextBlock>
+                    </DockPanel>
+                </Border>
+            </DataTemplate>
+        </ListBox.ItemTemplate>
+    </ListBox>
+```
+
+
+
+![ListBox.CustomStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ListBox.CustomStyle.png)
+
+#  WrapPanelHorizontalListBox
+
+ListBox列表显示布局容器为WrapPanel，水平方向显示样式
+
+案例：
+
+```
+<ListBox Margin="10" ItemsSource="{Binding Datas}"  
+             Style="{DynamicResource WrapPanelHorizontalListBox}">
+        <ListBox.ItemTemplate>
+            <DataTemplate>
+                <Border BorderThickness="1" BorderBrush="Black" Margin="5,0">
+                    <DockPanel LastChildFill="True">
+                        <Path DockPanel.Dock="Left" Fill="YellowGreen" Width="20" Margin="10,0,10,0" HorizontalAlignment="Center" Data="{DynamicResource BubbleTailGeometry}"></Path>
+                        <TextBlock Padding="10" Text="{Binding Name}"></TextBlock>
+                    </DockPanel>
+                </Border>
+            </DataTemplate>
+        </ListBox.ItemTemplate>
+    </ListBox>
+```
+
+![ListBox.WrapPanelHorizontalStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ListBox.WrapPanelHorizontalStyle.png)
+
+#  WrapPanelVerticalListBox
+
+ListBox列表显示布局容器为WrapPanel，垂直方向显示样式
+
+案例：
+
+```
+    <ListBox Margin="10" ItemsSource="{Binding Datas}"  
+             Style="{DynamicResource WrapPanelVerticalListBox}">
+        <ListBox.ItemTemplate>
+            <DataTemplate>
+                <Border BorderThickness="1" BorderBrush="Black" Margin="0,5">
+                    <DockPanel LastChildFill="True">
+                        <Path DockPanel.Dock="Left" Fill="YellowGreen" Width="20" Margin="10,0,10,0" HorizontalAlignment="Center" Data="{DynamicResource BubbleTailGeometry}"></Path>
+                        <TextBlock Padding="10" Text="{Binding Name}"></TextBlock>
+                    </DockPanel>
+                </Border>
+            </DataTemplate>
+        </ListBox.ItemTemplate>
+    </ListBox>
+```
+
+![ListBox.WrapPanelVerticalStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ListBox.WrapPanelVerticalStyle.png)
+
+#  StackPanelHorizontalListBox
+
+ListBox列表显示布局容器为StackPanel，水平方向显示样式
+
+案例：
+
+```
+    <ListBox Margin="10" ItemsSource="{Binding Datas}"  
+             Style="{DynamicResource StackPanelHorizontalListBox}">
+        <ListBox.ItemTemplate>
+            <DataTemplate>
+                <Border BorderThickness="1" BorderBrush="Black" Margin="5,0">
+                    <DockPanel LastChildFill="True">
+                        <Path DockPanel.Dock="Left" Fill="YellowGreen" Width="20" Margin="10,0,10,0" HorizontalAlignment="Center" Data="{DynamicResource BubbleTailGeometry}"></Path>
+                        <TextBlock Padding="10" Text="{Binding Name}"></TextBlock>
+                    </DockPanel>
+                </Border>
+            </DataTemplate>
+        </ListBox.ItemTemplate>
+    </ListBox>
+```
+
+![ListBox.StackPanelHorizontalStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ListBox.StackPanelHorizontalStyle.png)
+
+#  StackPanelVerticalListBox
+
+ListBox列表显示布局容器为StackPanel，垂直方向显示样式
+
+案例：
+
+```
+    <ListBox Margin="10" ItemsSource="{Binding Datas}"  
+             Style="{DynamicResource StackPanelVerticalListBox}">
+        <ListBox.ItemTemplate>
+            <DataTemplate>
+                <Border BorderThickness="1" BorderBrush="Black" Margin="0,1">
+                    <DockPanel LastChildFill="True">
+                        <Path DockPanel.Dock="Left" Fill="YellowGreen" Width="20" Margin="10,0,10,0" HorizontalAlignment="Center" Data="{DynamicResource BubbleTailGeometry}"></Path>
+                        <TextBlock Padding="10" Text="{Binding Name}"></TextBlock>
+                    </DockPanel>
+                </Border>
+            </DataTemplate>
+        </ListBox.ItemTemplate>
+    </ListBox>
+```
+
+![ListBox.StackPanelVerticalStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ListBox.StackPanelVerticalStyle.png)
\ No newline at end of file

From bb3e379ed422f284e0a6f11496481ff41b869c56 Mon Sep 17 00:00:00 2001
From: guanguanchuangyu <3246907890@qq.com>
Date: Sun, 8 Dec 2019 22:33:00 +0800
Subject: [PATCH 04/17] doc of attach/tipElement doc of
 native_controls/listview,menu,passwordbox

---
 .../handycontrol/attach/tipElement/index.md   | 41 +++++++++-
 .../native_controls/listView/index.md         | 22 ++++-
 .../native_controls/menu/index.md             | 81 ++++++++++++++++++-
 .../native_controls/passwordBox/index.md      | 45 ++++++++++-
 .../native_controls/progressBar/index.md      |  3 +-
 5 files changed, 182 insertions(+), 10 deletions(-)

diff --git a/doc/source/handycontrol/attach/tipElement/index.md b/doc/source/handycontrol/attach/tipElement/index.md
index ca12ad62..6b91f48d 100644
--- a/doc/source/handycontrol/attach/tipElement/index.md
+++ b/doc/source/handycontrol/attach/tipElement/index.md
@@ -1,5 +1,42 @@
 ---
-title: 建设中
+title: TipElement 提示元素
 ---
 
-建设中
\ No newline at end of file
+# 属性
+
+| 名称       | 用途     |
+| ---------- | -------- |
+| Placement | 提示元素显示位置 |
+| Visibility | 是否可见 |
+
+
+# 使用案例
+
+## Placement 提示元素显示位置
+
+该属性，用于设定提示元素显示位置，目前支持BottomRight和TopLeft（默认值）
+
+```
+<hc:RangeSlider Width="400" 
+                    hc:TipElement.Visibility="Visible" 
+                    TickPlacement="BottomRight" 
+                    IsSnapToTickEnabled="True" 
+                    Maximum="100" ValueEnd="60" 
+                    TickFrequency="10" 
+                    Margin="0,32,0,0"/>
+    <hc:RangeSlider Width="400" 
+                    hc:TipElement.Visibility="Visible"
+                    hc:TipElement.Placement="BottomRight"
+                    TickPlacement="BottomRight" 
+                    IsSnapToTickEnabled="True" 
+                    Maximum="100" ValueEnd="60" 
+                    TickFrequency="10" 
+                    Margin="0,32,0,0"/>
+```
+
+效果
+
+![TipElement.Default](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/attach/TipElement.Default.png)
+
+![TipElement.TopLeft](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/attach/TipElement.TopLeft.png)
+
diff --git a/doc/source/handycontrol/native_controls/listView/index.md b/doc/source/handycontrol/native_controls/listView/index.md
index ca12ad62..308ecd17 100644
--- a/doc/source/handycontrol/native_controls/listView/index.md
+++ b/doc/source/handycontrol/native_controls/listView/index.md
@@ -1,5 +1,23 @@
 ---
-title: 建设中
+title: ListView 列表视图
 ---
 
-建设中
\ No newline at end of file
+`HandyControl`中仅仅提供了一个默认的`ListView`的资源样式，可根据个人需求，自行定义
+
+# 案例
+
+```
+    <ListView ItemsSource="{Binding DataList}" Margin="20">
+        <ListView.View>
+            <GridView>
+                <GridViewColumn Width="80" Header="标题1" DisplayMemberBinding="{Binding Index}"/>
+                <GridViewColumn Width="100" Header="标题2" DisplayMemberBinding="{Binding Name}"/>
+                <GridViewColumn Width="200" Header="标题3" DisplayMemberBinding="{Binding Remark}"/>
+            </GridView>
+        </ListView.View>
+    </ListView>
+```
+
+
+
+![ListView.DefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ListView.DefaultStyle.png)
\ No newline at end of file
diff --git a/doc/source/handycontrol/native_controls/menu/index.md b/doc/source/handycontrol/native_controls/menu/index.md
index ca12ad62..33edb44e 100644
--- a/doc/source/handycontrol/native_controls/menu/index.md
+++ b/doc/source/handycontrol/native_controls/menu/index.md
@@ -1,5 +1,82 @@
 ---
-title: 建设中
+title: Menu 菜单
 ---
 
-建设中
\ No newline at end of file
+# MenuBaseStyle
+
+`HandyControl`中的菜单默认样式，一般不建议直接使用，而是选择继承，便于个人自定义风格
+
+样式
+
+```xml
+    <Style BasedOn="{StaticResource MenuItemBaseStyle}" TargetType="MenuItem"/>
+    <Style BasedOn="{StaticResource MenuBaseStyle}" TargetType="Menu"/>
+```
+
+使用
+
+```
+<Menu ItemsSource="{Binding Menus}">
+        <Menu.ItemTemplate>
+            <HierarchicalDataTemplate ItemsSource="{Binding Children}">
+                <TextBlock Text="{Binding Name}"></TextBlock>
+            </HierarchicalDataTemplate>
+        </Menu.ItemTemplate>
+</Menu>
+```
+
+数据视图
+
+```c#
+    //菜单子项视图类
+    public class MenuItemViewModel
+    {
+        public List<MenuItemViewModel> Children { get; set; }
+        public MenuItemViewModel Parent { get; set; }
+        public string Name { get; set; }
+        public string Remark { get; set; }
+    }
+    //菜单数据视图类
+    public class MenuViewModel
+    {
+        public MenuViewModel()
+        {
+            Menus = new List<MenuItemViewModel>
+            {
+               new MenuItemViewModel
+               {
+                 Name="一级菜单",
+                 Children =  new List<MenuItemViewModel>{
+                  new MenuItemViewModel{
+                    Name="二级菜单"
+                  }
+                 }
+               },
+               new MenuItemViewModel
+               {
+                 Name="一级菜单",
+                 Children =  new List<MenuItemViewModel>{
+                  new MenuItemViewModel{
+                    Name="二级菜单"
+                  }
+                 }
+               },
+               new MenuItemViewModel
+               {
+                 Name="一级菜单",
+                 Children =  new List<MenuItemViewModel>{
+                  new MenuItemViewModel{
+                    Name="二级菜单"
+                  }
+                 }
+               }
+            };
+        }
+        public List<MenuItemViewModel> Menus { get; set; }
+    }
+```
+
+效果
+
+![Menu.BaseStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/Menu.BaseStyle.png)
+
diff --git a/doc/source/handycontrol/native_controls/passwordBox/index.md b/doc/source/handycontrol/native_controls/passwordBox/index.md
index ca12ad62..19bbda94 100644
--- a/doc/source/handycontrol/native_controls/passwordBox/index.md
+++ b/doc/source/handycontrol/native_controls/passwordBox/index.md
@@ -1,5 +1,46 @@
 ---
-title: 建设中
+title: PasswordBox 密码框
 ---
 
-建设中
\ No newline at end of file
+# PasswordBoxBaseStyle
+
+控件默认样式，该样式不建议直接使用，而是选择继承的方式进行个人控件样式的处理，参考在线资源[PasswordBoxBaseStyle](https://github.com/HandyOrg/HandyControl/blob/master/src/Shared/HandyControl_Shared/Themes/Styles/Base/PasswordBoxBaseStyle.xaml)
+
+```
+<Style BasedOn="{StaticResource PasswordBoxBaseStyle}" TargetType="PasswordBox"/>
+```
+
+使用
+
+```
+    <PasswordBox PasswordChar="*"
+                 VerticalAlignment="Center"
+                 Width="120"></PasswordBox>
+```
+
+效果
+
+![PasswordBox.BaseStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/PasswordBox.BaseStyle.png)
+
+# PasswordBoxExtendBaseStyle
+
+控件拓展基础样式，是样式`PasswordBoxExtend`的基本样式，不建议直接使用，而是选择使用`PasswordBoxExtend`，该样式支持添加`PasswordBox`专用附加属性`PasswordBoxAttach`、额外信息元素`InfoElement`和标题元素`TitleElement`
+
+```
+    <!--为使普通密码输入文本框显示水印,需要设定PasswordBoxAttach.PasswordLength="0"-->
+    <PasswordBox Style="{DynamicResource PasswordBoxExtend}" PasswordChar="*" 
+                 hc:PasswordBoxAttach.PasswordLength="0"
+                 hc:InfoElement.Placeholder="请输入密码" 
+                 VerticalAlignment="Center"
+                 Width="120"></PasswordBox>
+    <PasswordBox Style="{DynamicResource PasswordBoxExtend}" PasswordChar="*" 
+                 hc:TitleElement.Title="用户密码："
+                 hc:TitleElement.TitleAlignment="Top"
+                 VerticalAlignment="Center"
+                 Width="120"></PasswordBox>
+```
+
+效果
+
+![PasswordBox.ExtendStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/PasswordBox.ExtendStyle.png)
+
diff --git a/doc/source/handycontrol/native_controls/progressBar/index.md b/doc/source/handycontrol/native_controls/progressBar/index.md
index ca12ad62..794ae369 100644
--- a/doc/source/handycontrol/native_controls/progressBar/index.md
+++ b/doc/source/handycontrol/native_controls/progressBar/index.md
@@ -1,5 +1,4 @@
 ---
-title: 建设中
+title: ProgressBar 进度条
 ---
 
-建设中
\ No newline at end of file

From 7f03a1015a1b41f8983e3ae458afd6b4c5cc1937 Mon Sep 17 00:00:00 2001
From: guanguanchuangyu <3246907890@qq.com>
Date: Mon, 23 Dec 2019 21:31:09 +0800
Subject: [PATCH 05/17] add progressbar.md

---
 .../native_controls/progressBar/index.md      | 81 +++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/doc/source/handycontrol/native_controls/progressBar/index.md b/doc/source/handycontrol/native_controls/progressBar/index.md
index 794ae369..4e37ca4c 100644
--- a/doc/source/handycontrol/native_controls/progressBar/index.md
+++ b/doc/source/handycontrol/native_controls/progressBar/index.md
@@ -2,3 +2,84 @@
 title: ProgressBar 进度条
 ---
 
+# ProgressBarBaseStyle
+
+`HandyControl`中自带的默认样式，不建议直接使用而是选择继承的方式，案例如下：
+
+```
+<Style BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}"/>
+</Style>
+```
+
+# 其他样式
+
+`HandyControl`中自带的其他样式和效果，其中包含如下样式：
+
+| 样式Key            | 用途 |
+| ------------------ | ---- |
+| ProgressBarSuccess | 成功色进度条 |
+| ProgressBarInfo | 提示色进度条 |
+| ProgressBarWarning | 警告色进度条 |
+| ProgressBarDanger | 危险色进度条 |
+| ProgressBarPrimaryStripe | 主题色条纹进度条 |
+| ProgressBarSuccessStripe | 成功色条纹进度条 |
+| ProgressBarInfoStripe | 信息色条纹进度条 |
+| ProgressBarWarningStripe | 警告色条纹进度条 |
+| ProgressBarDangerStripe | 危险色条纹进度条 |
+| ProgressBarFlat | 扁平风格 |
+
+案例：
+```xml
+<StackPanel Margin="20">
+        <TextBlock Text="默认样式"></TextBlock>
+        <ProgressBar Value="40"></ProgressBar>
+    </StackPanel>
+    <StackPanel Margin="20">
+        <TextBlock Text="ProgressBarSuccess"></TextBlock>
+        <ProgressBar Style="{DynamicResource ProgressBarSuccess}" Value="40"></ProgressBar>
+    </StackPanel>
+    <StackPanel Margin="20">
+        <TextBlock Text="ProgressBarInfo"></TextBlock>
+        <ProgressBar Style="{DynamicResource ProgressBarInfo}" Value="40"></ProgressBar>
+    </StackPanel>
+    <StackPanel Margin="20">
+        <TextBlock Text="ProgressBarWarning"></TextBlock>
+        <ProgressBar Style="{DynamicResource ProgressBarWarning}" Value="40"></ProgressBar>
+    </StackPanel>
+    <StackPanel Margin="20">
+        <TextBlock Text="ProgressBarDanger"></TextBlock>
+        <ProgressBar Style="{DynamicResource ProgressBarDanger}" Value="40"></ProgressBar>
+    </StackPanel>
+    <StackPanel Margin="20">
+        <TextBlock Text="ProgressBarPrimaryStripe"></TextBlock>
+        <ProgressBar Style="{DynamicResource ProgressBarPrimaryStripe}" Value="40"></ProgressBar>
+    </StackPanel>
+    <StackPanel Margin="20">
+        <TextBlock Text="ProgressBarSuccessStripe"></TextBlock>
+        <ProgressBar Style="{DynamicResource ProgressBarSuccessStripe}" Value="40"></ProgressBar>
+    </StackPanel>
+    <StackPanel Margin="20">
+        <TextBlock Text="ProgressBarInfoStripe"></TextBlock>
+        <ProgressBar Style="{DynamicResource ProgressBarInfoStripe}" Value="40"></ProgressBar>
+    </StackPanel>
+    <StackPanel Margin="20">
+        <TextBlock Text="ProgressBarWarningStripe"></TextBlock>
+        <ProgressBar Style="{DynamicResource ProgressBarWarningStripe}" Value="40"></ProgressBar>
+    </StackPanel>
+    <StackPanel Margin="20">
+        <TextBlock Text="ProgressBarDangerStripe"></TextBlock>
+        <ProgressBar Style="{DynamicResource ProgressBarDangerStripe}" Value="40"></ProgressBar>
+    </StackPanel>
+    <StackPanel Margin="20">
+        <TextBlock Text="ProgressBarFlat"></TextBlock>
+        <ProgressBar Style="{DynamicResource ProgressBarFlat}" Value="40"></ProgressBar>
+    </StackPanel>
+```
+效果：
+![ProgressBar.Styles](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ProgressBar.Styles.png)
+
+# 温馨提示
+
+对于进度条进度颜色、圆角以及其他样式的个人使用需求，可查看`HandyControl`开源目中的[源码样式部分](https://github.com/HandyOrg/HandyControl/blob/master/src/Shared/HandyControl_Shared/Themes/Styles/ProgressBar.xaml)自行定义
+

From 585f49306e38032b5b089dda2a390f8bdb03d331 Mon Sep 17 00:00:00 2001
From: guanguanchuangyu <3246907890@qq.com>
Date: Mon, 23 Dec 2019 22:07:08 +0800
Subject: [PATCH 06/17] reset The progressbar.md

---
 .../native_controls/progressBar/index.md      | 85 -------------------
 1 file changed, 85 deletions(-)

diff --git a/doc/source/handycontrol/native_controls/progressBar/index.md b/doc/source/handycontrol/native_controls/progressBar/index.md
index 4e37ca4c..e69de29b 100644
--- a/doc/source/handycontrol/native_controls/progressBar/index.md
+++ b/doc/source/handycontrol/native_controls/progressBar/index.md
@@ -1,85 +0,0 @@
----
-title: ProgressBar 进度条
----
-
-# ProgressBarBaseStyle
-
-`HandyControl`中自带的默认样式，不建议直接使用而是选择继承的方式，案例如下：
-
-```
-<Style BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}"/>
-</Style>
-```
-
-# 其他样式
-
-`HandyControl`中自带的其他样式和效果，其中包含如下样式：
-
-| 样式Key            | 用途 |
-| ------------------ | ---- |
-| ProgressBarSuccess | 成功色进度条 |
-| ProgressBarInfo | 提示色进度条 |
-| ProgressBarWarning | 警告色进度条 |
-| ProgressBarDanger | 危险色进度条 |
-| ProgressBarPrimaryStripe | 主题色条纹进度条 |
-| ProgressBarSuccessStripe | 成功色条纹进度条 |
-| ProgressBarInfoStripe | 信息色条纹进度条 |
-| ProgressBarWarningStripe | 警告色条纹进度条 |
-| ProgressBarDangerStripe | 危险色条纹进度条 |
-| ProgressBarFlat | 扁平风格 |
-
-案例：
-```xml
-<StackPanel Margin="20">
-        <TextBlock Text="默认样式"></TextBlock>
-        <ProgressBar Value="40"></ProgressBar>
-    </StackPanel>
-    <StackPanel Margin="20">
-        <TextBlock Text="ProgressBarSuccess"></TextBlock>
-        <ProgressBar Style="{DynamicResource ProgressBarSuccess}" Value="40"></ProgressBar>
-    </StackPanel>
-    <StackPanel Margin="20">
-        <TextBlock Text="ProgressBarInfo"></TextBlock>
-        <ProgressBar Style="{DynamicResource ProgressBarInfo}" Value="40"></ProgressBar>
-    </StackPanel>
-    <StackPanel Margin="20">
-        <TextBlock Text="ProgressBarWarning"></TextBlock>
-        <ProgressBar Style="{DynamicResource ProgressBarWarning}" Value="40"></ProgressBar>
-    </StackPanel>
-    <StackPanel Margin="20">
-        <TextBlock Text="ProgressBarDanger"></TextBlock>
-        <ProgressBar Style="{DynamicResource ProgressBarDanger}" Value="40"></ProgressBar>
-    </StackPanel>
-    <StackPanel Margin="20">
-        <TextBlock Text="ProgressBarPrimaryStripe"></TextBlock>
-        <ProgressBar Style="{DynamicResource ProgressBarPrimaryStripe}" Value="40"></ProgressBar>
-    </StackPanel>
-    <StackPanel Margin="20">
-        <TextBlock Text="ProgressBarSuccessStripe"></TextBlock>
-        <ProgressBar Style="{DynamicResource ProgressBarSuccessStripe}" Value="40"></ProgressBar>
-    </StackPanel>
-    <StackPanel Margin="20">
-        <TextBlock Text="ProgressBarInfoStripe"></TextBlock>
-        <ProgressBar Style="{DynamicResource ProgressBarInfoStripe}" Value="40"></ProgressBar>
-    </StackPanel>
-    <StackPanel Margin="20">
-        <TextBlock Text="ProgressBarWarningStripe"></TextBlock>
-        <ProgressBar Style="{DynamicResource ProgressBarWarningStripe}" Value="40"></ProgressBar>
-    </StackPanel>
-    <StackPanel Margin="20">
-        <TextBlock Text="ProgressBarDangerStripe"></TextBlock>
-        <ProgressBar Style="{DynamicResource ProgressBarDangerStripe}" Value="40"></ProgressBar>
-    </StackPanel>
-    <StackPanel Margin="20">
-        <TextBlock Text="ProgressBarFlat"></TextBlock>
-        <ProgressBar Style="{DynamicResource ProgressBarFlat}" Value="40"></ProgressBar>
-    </StackPanel>
-```
-效果：
-![ProgressBar.Styles](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ProgressBar.Styles.png)
-
-# 温馨提示
-
-对于进度条进度颜色、圆角以及其他样式的个人使用需求，可查看`HandyControl`开源目中的[源码样式部分](https://github.com/HandyOrg/HandyControl/blob/master/src/Shared/HandyControl_Shared/Themes/Styles/ProgressBar.xaml)自行定义
-

From dd45e7e32314211e1b49dbc2e81c3f50ed159e16 Mon Sep 17 00:00:00 2001
From: guanguanchuangyu <3246907890@qq.com>
Date: Mon, 23 Dec 2019 22:07:51 +0800
Subject: [PATCH 07/17] add doc of native_controls.progressbar.md

---
 .../native_controls/progressBar/index.md      | 85 +++++++++++++++++++
 1 file changed, 85 insertions(+)

diff --git a/doc/source/handycontrol/native_controls/progressBar/index.md b/doc/source/handycontrol/native_controls/progressBar/index.md
index e69de29b..4e37ca4c 100644
--- a/doc/source/handycontrol/native_controls/progressBar/index.md
+++ b/doc/source/handycontrol/native_controls/progressBar/index.md
@@ -0,0 +1,85 @@
+---
+title: ProgressBar 进度条
+---
+
+# ProgressBarBaseStyle
+
+`HandyControl`中自带的默认样式，不建议直接使用而是选择继承的方式，案例如下：
+
+```
+<Style BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}"/>
+</Style>
+```
+
+# 其他样式
+
+`HandyControl`中自带的其他样式和效果，其中包含如下样式：
+
+| 样式Key            | 用途 |
+| ------------------ | ---- |
+| ProgressBarSuccess | 成功色进度条 |
+| ProgressBarInfo | 提示色进度条 |
+| ProgressBarWarning | 警告色进度条 |
+| ProgressBarDanger | 危险色进度条 |
+| ProgressBarPrimaryStripe | 主题色条纹进度条 |
+| ProgressBarSuccessStripe | 成功色条纹进度条 |
+| ProgressBarInfoStripe | 信息色条纹进度条 |
+| ProgressBarWarningStripe | 警告色条纹进度条 |
+| ProgressBarDangerStripe | 危险色条纹进度条 |
+| ProgressBarFlat | 扁平风格 |
+
+案例：
+```xml
+<StackPanel Margin="20">
+        <TextBlock Text="默认样式"></TextBlock>
+        <ProgressBar Value="40"></ProgressBar>
+    </StackPanel>
+    <StackPanel Margin="20">
+        <TextBlock Text="ProgressBarSuccess"></TextBlock>
+        <ProgressBar Style="{DynamicResource ProgressBarSuccess}" Value="40"></ProgressBar>
+    </StackPanel>
+    <StackPanel Margin="20">
+        <TextBlock Text="ProgressBarInfo"></TextBlock>
+        <ProgressBar Style="{DynamicResource ProgressBarInfo}" Value="40"></ProgressBar>
+    </StackPanel>
+    <StackPanel Margin="20">
+        <TextBlock Text="ProgressBarWarning"></TextBlock>
+        <ProgressBar Style="{DynamicResource ProgressBarWarning}" Value="40"></ProgressBar>
+    </StackPanel>
+    <StackPanel Margin="20">
+        <TextBlock Text="ProgressBarDanger"></TextBlock>
+        <ProgressBar Style="{DynamicResource ProgressBarDanger}" Value="40"></ProgressBar>
+    </StackPanel>
+    <StackPanel Margin="20">
+        <TextBlock Text="ProgressBarPrimaryStripe"></TextBlock>
+        <ProgressBar Style="{DynamicResource ProgressBarPrimaryStripe}" Value="40"></ProgressBar>
+    </StackPanel>
+    <StackPanel Margin="20">
+        <TextBlock Text="ProgressBarSuccessStripe"></TextBlock>
+        <ProgressBar Style="{DynamicResource ProgressBarSuccessStripe}" Value="40"></ProgressBar>
+    </StackPanel>
+    <StackPanel Margin="20">
+        <TextBlock Text="ProgressBarInfoStripe"></TextBlock>
+        <ProgressBar Style="{DynamicResource ProgressBarInfoStripe}" Value="40"></ProgressBar>
+    </StackPanel>
+    <StackPanel Margin="20">
+        <TextBlock Text="ProgressBarWarningStripe"></TextBlock>
+        <ProgressBar Style="{DynamicResource ProgressBarWarningStripe}" Value="40"></ProgressBar>
+    </StackPanel>
+    <StackPanel Margin="20">
+        <TextBlock Text="ProgressBarDangerStripe"></TextBlock>
+        <ProgressBar Style="{DynamicResource ProgressBarDangerStripe}" Value="40"></ProgressBar>
+    </StackPanel>
+    <StackPanel Margin="20">
+        <TextBlock Text="ProgressBarFlat"></TextBlock>
+        <ProgressBar Style="{DynamicResource ProgressBarFlat}" Value="40"></ProgressBar>
+    </StackPanel>
+```
+效果：
+![ProgressBar.Styles](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ProgressBar.Styles.png)
+
+# 温馨提示
+
+对于进度条进度颜色、圆角以及其他样式的个人使用需求，可查看`HandyControl`开源目中的[源码样式部分](https://github.com/HandyOrg/HandyControl/blob/master/src/Shared/HandyControl_Shared/Themes/Styles/ProgressBar.xaml)自行定义
+

From 3fec1a56bf6c0184376c4987b3d5f3b0bb701463 Mon Sep 17 00:00:00 2001
From: Mahdi <mahdidvb72@gmail.com>
Date: Fri, 27 Dec 2019 17:52:07 +0330
Subject: [PATCH 08/17] Fix poptip background

---
 .../HandyControl_Shared/Themes/Styles/Base/PoptipBaseStyle.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/PoptipBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/PoptipBaseStyle.xaml
index 9c513359..76c1f24e 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/PoptipBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/PoptipBaseStyle.xaml
@@ -12,7 +12,7 @@
         <Setter Property="VerticalAlignment" Value="Top"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="Offset" Value="6"/>
-        <Setter Property="Background" Value="{DynamicResource BackgroundBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="controls:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}"/>

From 35c43cabf1616c3007df8414179f2c4a8a5349c0 Mon Sep 17 00:00:00 2001
From: Mahdi <mahdidvb72@gmail.com>
Date: Sun, 29 Dec 2019 18:50:32 +0330
Subject: [PATCH 09/17] fix #281

---
 .../Themes/Styles/Base/TextBoxBaseStyle.xaml              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml
index 88975e61..b2179bd3 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml
@@ -76,7 +76,7 @@
                 <RowDefinition MinHeight="{Binding Path=(controls:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(controls:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}"/>
             </Grid.RowDefinitions>
             <StackPanel Visibility="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" Orientation="Horizontal" Margin="{TemplateBinding Padding}">
-                <TextBlock Foreground="{DynamicResource PrimaryTextBrush}" Margin="1,0,0,0" Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <TextBlock Margin="1,0,0,0" Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
             </StackPanel>
             <Border x:Name="border" Grid.Row="1" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"/>
@@ -105,7 +105,7 @@
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
             <StackPanel Visibility="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" Orientation="Horizontal" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="0,7,6,7">
-                <TextBlock Foreground="{DynamicResource PrimaryTextBrush}" Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <TextBlock Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
             </StackPanel>
             <Border x:Name="border" Grid.Column="1" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"/>
@@ -157,7 +157,7 @@
             </Grid.RowDefinitions>
             <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1"/>
             <StackPanel Grid.Row="0" Visibility="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" Orientation="Horizontal" Margin="{TemplateBinding Padding}">
-                <TextBlock Foreground="{DynamicResource PrimaryTextBrush}" Margin="1,0,0,0" Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <TextBlock Margin="1,0,0,0" Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
             </StackPanel>
             <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
@@ -217,7 +217,7 @@
             </Grid.ColumnDefinitions>
             <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1"/>
             <StackPanel Grid.Column="0" Visibility="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" Orientation="Horizontal" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="0,7,6,7">
-                <TextBlock Foreground="{DynamicResource PrimaryTextBrush}" Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <TextBlock Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
             </StackPanel>
             <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">

From e109f73ac312c981358fdbe03f9c3ccc5b778fee Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 5 Jan 2020 20:45:57 +0800
Subject: [PATCH 10/17] Update NumericUpDown.cs

---
 .../Controls/Input/NumericUpDown.cs           | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
index dbce3b48..eac6fd1a 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
@@ -31,8 +31,7 @@ namespace HandyControl.Controls
         {
             CommandBindings.Add(new CommandBinding(ControlCommands.Prev, (s, e) =>
             {
-                if (IsReadOnly)
-                    return;
+                if (IsReadOnly) return;
 
                 Value += Increment;
                 _textBox.Text = CurrentText;
@@ -40,9 +39,7 @@ namespace HandyControl.Controls
             }));
             CommandBindings.Add(new CommandBinding(ControlCommands.Next, (s, e) =>
             {
-                if (IsReadOnly)
-                    return;
-
+                if (IsReadOnly) return;
 
                 Value -= Increment;
                 _textBox.Text = CurrentText;
@@ -50,8 +47,7 @@ namespace HandyControl.Controls
             }));
             CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
             {
-                if (IsReadOnly)
-                    return;
+                if (IsReadOnly) return;
 
                 SetCurrentValue(ValueProperty, ValueBoxes.Double0Box);
                 _textBox.Text = string.Empty;
@@ -116,8 +112,7 @@ namespace HandyControl.Controls
 
         private void TextBox_PreviewKeyDown(object sender, KeyEventArgs e)
         {
-            if (IsReadOnly)
-                return;
+            if (IsReadOnly) return;
 
             if (e.Key == Key.Up)
             {
@@ -135,7 +130,7 @@ namespace HandyControl.Controls
         {
             base.OnMouseWheel(e);
 
-            if (_textBox.IsFocused&&IsReadOnly==false)
+            if (_textBox.IsFocused && !IsReadOnly)
             {
                 Value += e.Delta > 0 ? Increment : -Increment;
                 _textBox.Text = CurrentText;
@@ -375,22 +370,21 @@ namespace HandyControl.Controls
             set => SetValue(ShowClearButtonProperty, value); 
         }
 
+        /// <summary>
+        ///     标识 IsReadOnly 依赖属性。
+        /// </summary>
+        public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register(
+            "IsReadOnly", typeof(bool), typeof(NumericUpDown), new PropertyMetadata(ValueBoxes.FalseBox));
+
         /// <summary>
         ///     获取或设置一个值，该值指示NumericUpDown是否只读。
         /// </summary>
         public bool IsReadOnly
         {
-            get => (bool)GetValue(IsReadOnlyProperty);
+            get => (bool) GetValue(IsReadOnlyProperty);
             set => SetValue(IsReadOnlyProperty, value);
         }
 
-        /// <summary>
-        ///     标识 IsReadOnly 依赖属性。
-        /// </summary>
-        public static readonly DependencyProperty IsReadOnlyProperty =
-            DependencyProperty.Register(nameof(IsReadOnly), typeof(bool), typeof(NumericUpDown), new PropertyMetadata(default(bool)));
-
-
         public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
 
         public virtual bool VerifyData()

From 56eba2fed98b42550a625229fdaa8e2acb43458a Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 5 Jan 2020 21:45:50 +0800
Subject: [PATCH 11/17] modified doc

uniform doc structure
---
 .../native_controls/image/index.md            | 22 ++---
 .../native_controls/label/index.md            | 97 +++++++++----------
 .../native_controls/listBox/index.md          | 81 +++++++++-------
 3 files changed, 97 insertions(+), 103 deletions(-)

diff --git a/doc/source/handycontrol/native_controls/image/index.md b/doc/source/handycontrol/native_controls/image/index.md
index d11560c0..85764b53 100644
--- a/doc/source/handycontrol/native_controls/image/index.md
+++ b/doc/source/handycontrol/native_controls/image/index.md
@@ -2,27 +2,17 @@
 title: Image图片
 ---
 
-在`HandyControl`中，对应原生的`Image`控件，仅仅提供了一个默认的控件样式，并未提供特殊样式，对于个性化定制，需要使用者自行定制
+在`HandyControl`中，对应原生的`Image`控件，仅仅提供了一个默认的控件样式，并未提供特殊样式，对于个性化定制，需要使用者自行定制。
 
-默认样式定义：
-
-```
-    <Style TargetType="Image">
-    	<!--设定图片的长宽分布为均匀分布-->
-        <Setter Property="Stretch" Value="Uniform" />
-        <!--设置图片缩放模式为高质量位图缩放-->
-        <Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality" />
-    </Style>
-```
-
-案例：
-
-```
+{% note info no-icon %}
+用例：
+{% code %}
     <StackPanel Background="LightGray">
         <Image Source="Resources/Images/Image_basestyle.png" Margin="0,10"></Image>
         <Image Source="Resources/Images/Image_basestyle.png" RenderOptions.BitmapScalingMode="HighQuality" Stretch="Uniform"></Image>
     </StackPanel>
-```
+{% endcode %}
 
 ![image.baseStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/image.baseStyle.png)
 
+{% endnote %}
\ No newline at end of file
diff --git a/doc/source/handycontrol/native_controls/label/index.md b/doc/source/handycontrol/native_controls/label/index.md
index 7d37086a..25b65927 100644
--- a/doc/source/handycontrol/native_controls/label/index.md
+++ b/doc/source/handycontrol/native_controls/label/index.md
@@ -4,87 +4,84 @@ title: Lable标签
 
 # LabelBaseStyle
 
-Label标签 默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用，
+Label标签 默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
 
-具体源码见：[LabelBaseStyle.xaml]( https://github.com/HandyOrg/HandyControl/blob/master/src/Shared/HandyControl_Shared/Themes/Styles/Base/LabelBaseStyle.xaml )
-
-使用如下：
-
-```
-    <Style BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="BorderThickness" Value="1"/>
-    </Style>
-```
-
-案例：
-
-```
+{% note info no-icon %}
+用例：
+{% code %}
     <Label Content="Label默认样式" Margin="10"></Label>
-```
+{% endcode %}
 
 ![Label.BaseStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/Label.BaseStyle.png)
 
-# LabelPrimary
+{% endnote %}
 
-Label标签 主样式
+# LabelPrimary : LabelBaseStyle
 
-案例：
+主样式
 
-```
-    <Label Content="LabelPrimary样式" Margin="10" 
-    Style="{DynamicResource LabelPrimary}"></Label>
-```
+{% note info no-icon %}
+用例：
+{% code %}
+    <Label Content="LabelPrimary样式" Margin="10" Style="{DynamicResource LabelPrimary}"></Label>
+{% endcode %}
 
 ![Label.PrimaryStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/Label.PrimaryStyle.png)
 
-# LabelSuccess
+{% endnote %}
 
-Label标签 成功类型样式
+# LabelSuccess : LabelBaseStyle
 
-案例：
+成功类型样式
 
-```
-    <Label Content="LabelSuccess样式" Margin="10" 
-    Style="{DynamicResource LabelSuccess}"></Label>
-```
+{% note info no-icon %}
+用例：
+{% code %}
+    <Label Content="LabelSuccess样式" Margin="10" Style="{DynamicResource LabelSuccess}"></Label>
+{% endcode %}
 
 ![Label.SuccessStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/Label.SuccessStyle.png)
 
-# LabelInfo
+{% endnote %}
 
-Label标签 信息类型样式
+# LabelInfo : LabelBaseStyle
 
-案例：
+信息类型样式
 
-```
-    <Label Content="LabelInfo样式" Margin="10" 
-    Style="{DynamicResource LabelInfo}"></Label>
-```
+{% note info no-icon %}
+用例：
+{% code %}
+    <Label Content="LabelInfo样式" Margin="10" Style="{DynamicResource LabelInfo}"></Label>
+{% endcode %}
 
 ![Label.InfoStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/Label.InfoStyle.png)
 
-# LabelWarning
+{% endnote %}
 
-Label标签 警告类型样式
+# LabelWarning : LabelBaseStyle
 
-案例：
+警告类型样式
 
-```
-    <Label Content="LabelWarning样式" Margin="10" 
-    Style="{DynamicResource LabelWarning}"></Label>
-```
+{% note info no-icon %}
+用例：
+{% code %}
+    <Label Content="LabelWarning样式" Margin="10" Style="{DynamicResource LabelWarning}"></Label>
+{% endcode %}
 
 ![Label.WarningStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/Label.WarningStyle.png)
 
-# LabelDanger
+{% endnote %}
 
-Label标签 危险类型样式
+# LabelDanger : LabelBaseStyle
 
-```
-    <Label Content="LabelDanger样式" Margin="10" 
-    Style="{DynamicResource LabelDanger}"></Label>
-```
+危险类型样式
+
+{% note info no-icon %}
+用例：
+{% code %}
+    <Label Content="LabelDanger样式" Margin="10" Style="{DynamicResource LabelDanger}"></Label>
+{% endcode %}
 
 ![Label.DangerStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/Label.DangerStyle.png)
 
+{% endnote %}
\ No newline at end of file
diff --git a/doc/source/handycontrol/native_controls/listBox/index.md b/doc/source/handycontrol/native_controls/listBox/index.md
index 7c897e06..29de370d 100644
--- a/doc/source/handycontrol/native_controls/listBox/index.md
+++ b/doc/source/handycontrol/native_controls/listBox/index.md
@@ -4,26 +4,25 @@ title: ListBox 列表框
 
 #  ListBoxBaseStyle
 
- ListBox默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用，
+ ListBox默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
 
-样式源码见[ListBoxBaseStyle.xaml](https://github.com/HandyOrg/HandyControl/blob/master/src/Shared/HandyControl_Shared/Themes/Styles/Base/ListBoxBaseStyle.xaml )。
-
-案例：
-
-```
-    <!--默认样式-->
+{% note info no-icon %}
+用例：
+{% code %}
     <Style BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox"/>
-```
+{% endcode %}
 
 ![ListBox.BaseStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ListBox.BaseStyle.png)
 
-#  ListBoxCustom
+{% endnote %}
 
-ListBox列表Custom样式，该样式保留了Listbox的基本属性样式，而数据显示样式由当前用户自定义，实现个性化定制
+#  ListBoxCustom : ListBoxBaseStyle
 
-案例：
+ListBox列表Custom样式，该样式保留了Listbox的基本属性样式，而数据显示样式由当前用户自定义，实现个性化定制。
 
-```
+{% note info no-icon %}
+用例：
+{% code %}
     <ListBox Margin="10" ItemsSource="{Binding Datas}"  
              Style="{DynamicResource ListBoxCustom}">
         <ListBox.ItemTemplate>
@@ -37,20 +36,20 @@ ListBox列表Custom样式，该样式保留了Listbox的基本属性样式，而
             </DataTemplate>
         </ListBox.ItemTemplate>
     </ListBox>
-```
-
-
+{% endcode %}
 
 ![ListBox.CustomStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ListBox.CustomStyle.png)
 
-#  WrapPanelHorizontalListBox
+{% endnote %}
 
-ListBox列表显示布局容器为WrapPanel，水平方向显示样式
+#  WrapPanelHorizontalListBox : ListBoxCustom
 
-案例：
+布局容器为WrapPanel，水平方向显示样式。
 
-```
-<ListBox Margin="10" ItemsSource="{Binding Datas}"  
+{% note info no-icon %}
+用例：
+{% code %}
+    <ListBox Margin="10" ItemsSource="{Binding Datas}"  
              Style="{DynamicResource WrapPanelHorizontalListBox}">
         <ListBox.ItemTemplate>
             <DataTemplate>
@@ -63,17 +62,19 @@ ListBox列表显示布局容器为WrapPanel，水平方向显示样式
             </DataTemplate>
         </ListBox.ItemTemplate>
     </ListBox>
-```
+{% endcode %}
 
 ![ListBox.WrapPanelHorizontalStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ListBox.WrapPanelHorizontalStyle.png)
 
-#  WrapPanelVerticalListBox
+{% endnote %}
 
-ListBox列表显示布局容器为WrapPanel，垂直方向显示样式
+#  WrapPanelVerticalListBox : ListBoxCustom
 
-案例：
+布局容器为WrapPanel，垂直方向显示样式。
 
-```
+{% note info no-icon %}
+用例：
+{% code %}
     <ListBox Margin="10" ItemsSource="{Binding Datas}"  
              Style="{DynamicResource WrapPanelVerticalListBox}">
         <ListBox.ItemTemplate>
@@ -87,17 +88,19 @@ ListBox列表显示布局容器为WrapPanel，垂直方向显示样式
             </DataTemplate>
         </ListBox.ItemTemplate>
     </ListBox>
-```
+{% endcode %}
 
 ![ListBox.WrapPanelVerticalStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ListBox.WrapPanelVerticalStyle.png)
 
-#  StackPanelHorizontalListBox
+{% endnote %}
 
-ListBox列表显示布局容器为StackPanel，水平方向显示样式
+#  StackPanelHorizontalListBox : ListBoxCustom
 
-案例：
+布局容器为StackPanel，水平方向显示样式。
 
-```
+{% note info no-icon %}
+用例：
+{% code %}
     <ListBox Margin="10" ItemsSource="{Binding Datas}"  
              Style="{DynamicResource StackPanelHorizontalListBox}">
         <ListBox.ItemTemplate>
@@ -111,17 +114,19 @@ ListBox列表显示布局容器为StackPanel，水平方向显示样式
             </DataTemplate>
         </ListBox.ItemTemplate>
     </ListBox>
-```
+{% endcode %}
 
 ![ListBox.StackPanelHorizontalStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ListBox.StackPanelHorizontalStyle.png)
 
-#  StackPanelVerticalListBox
+{% endnote %}
 
-ListBox列表显示布局容器为StackPanel，垂直方向显示样式
+#  StackPanelVerticalListBox : ListBoxCustom
 
-案例：
+布局容器为StackPanel，垂直方向显示样式。
 
-```
+{% note info no-icon %}
+用例：
+{% code %}
     <ListBox Margin="10" ItemsSource="{Binding Datas}"  
              Style="{DynamicResource StackPanelVerticalListBox}">
         <ListBox.ItemTemplate>
@@ -135,6 +140,8 @@ ListBox列表显示布局容器为StackPanel，垂直方向显示样式
             </DataTemplate>
         </ListBox.ItemTemplate>
     </ListBox>
-```
+{% endcode %}
 
-![ListBox.StackPanelVerticalStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ListBox.StackPanelVerticalStyle.png)
\ No newline at end of file
+![ListBox.StackPanelVerticalStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ListBox.StackPanelVerticalStyle.png)
+
+{% endnote %}
\ No newline at end of file

From cef6fd433ef5a258ba70bb501fa9b203638b53c8 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 5 Jan 2020 22:31:29 +0800
Subject: [PATCH 12/17] modified doc

uniform doc structure
---
 .../native_controls/label/index.md            |  2 +-
 .../native_controls/listView/index.md         | 14 ++--
 .../native_controls/menu/index.md             | 73 ++-----------------
 .../native_controls/passwordBox/index.md      | 39 +++++-----
 .../native_controls/progressBar/index.md      | 36 ++++-----
 5 files changed, 49 insertions(+), 115 deletions(-)

diff --git a/doc/source/handycontrol/native_controls/label/index.md b/doc/source/handycontrol/native_controls/label/index.md
index 25b65927..cbd200ed 100644
--- a/doc/source/handycontrol/native_controls/label/index.md
+++ b/doc/source/handycontrol/native_controls/label/index.md
@@ -4,7 +4,7 @@ title: Lable标签
 
 # LabelBaseStyle
 
-Label标签 默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+Label标签默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
 
 {% note info no-icon %}
 用例：
diff --git a/doc/source/handycontrol/native_controls/listView/index.md b/doc/source/handycontrol/native_controls/listView/index.md
index 308ecd17..10c9d1cb 100644
--- a/doc/source/handycontrol/native_controls/listView/index.md
+++ b/doc/source/handycontrol/native_controls/listView/index.md
@@ -2,11 +2,11 @@
 title: ListView 列表视图
 ---
 
-`HandyControl`中仅仅提供了一个默认的`ListView`的资源样式，可根据个人需求，自行定义
+`HandyControl`中仅提供了一个默认的`ListView`样式，可根据个人需求，自行定义。
 
-# 案例
-
-```
+{% note info no-icon %}
+用例：
+{% code %}
     <ListView ItemsSource="{Binding DataList}" Margin="20">
         <ListView.View>
             <GridView>
@@ -16,8 +16,8 @@ title: ListView 列表视图
             </GridView>
         </ListView.View>
     </ListView>
-```
+{% endcode %}
 
+![ListView.DefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ListView.DefaultStyle.png)
 
-
-![ListView.DefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ListView.DefaultStyle.png)
\ No newline at end of file
+{% endnote %}
\ No newline at end of file
diff --git a/doc/source/handycontrol/native_controls/menu/index.md b/doc/source/handycontrol/native_controls/menu/index.md
index 33edb44e..28d0237f 100644
--- a/doc/source/handycontrol/native_controls/menu/index.md
+++ b/doc/source/handycontrol/native_controls/menu/index.md
@@ -4,79 +4,20 @@ title: Menu 菜单
 
 # MenuBaseStyle
 
-`HandyControl`中的菜单默认样式，一般不建议直接使用，而是选择继承，便于个人自定义风格
+菜单默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
 
-样式
-
-```xml
-    <Style BasedOn="{StaticResource MenuItemBaseStyle}" TargetType="MenuItem"/>
-    <Style BasedOn="{StaticResource MenuBaseStyle}" TargetType="Menu"/>
-```
-
-使用
-
-```
-<Menu ItemsSource="{Binding Menus}">
+{% note info no-icon %}
+用例：
+{% code %}
+    <Menu ItemsSource="{Binding Menus}">
         <Menu.ItemTemplate>
             <HierarchicalDataTemplate ItemsSource="{Binding Children}">
                 <TextBlock Text="{Binding Name}"></TextBlock>
             </HierarchicalDataTemplate>
         </Menu.ItemTemplate>
 </Menu>
-```
-
-数据视图
-
-```c#
-    //菜单子项视图类
-    public class MenuItemViewModel
-    {
-        public List<MenuItemViewModel> Children { get; set; }
-        public MenuItemViewModel Parent { get; set; }
-        public string Name { get; set; }
-        public string Remark { get; set; }
-    }
-    //菜单数据视图类
-    public class MenuViewModel
-    {
-        public MenuViewModel()
-        {
-            Menus = new List<MenuItemViewModel>
-            {
-               new MenuItemViewModel
-               {
-                 Name="一级菜单",
-                 Children =  new List<MenuItemViewModel>{
-                  new MenuItemViewModel{
-                    Name="二级菜单"
-                  }
-                 }
-               },
-               new MenuItemViewModel
-               {
-                 Name="一级菜单",
-                 Children =  new List<MenuItemViewModel>{
-                  new MenuItemViewModel{
-                    Name="二级菜单"
-                  }
-                 }
-               },
-               new MenuItemViewModel
-               {
-                 Name="一级菜单",
-                 Children =  new List<MenuItemViewModel>{
-                  new MenuItemViewModel{
-                    Name="二级菜单"
-                  }
-                 }
-               }
-            };
-        }
-        public List<MenuItemViewModel> Menus { get; set; }
-    }
-```
-
-效果
+{% endcode %}
 
 ![Menu.BaseStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/Menu.BaseStyle.png)
 
+{% endnote %}
\ No newline at end of file
diff --git a/doc/source/handycontrol/native_controls/passwordBox/index.md b/doc/source/handycontrol/native_controls/passwordBox/index.md
index 19bbda94..0b72a68d 100644
--- a/doc/source/handycontrol/native_controls/passwordBox/index.md
+++ b/doc/source/handycontrol/native_controls/passwordBox/index.md
@@ -4,29 +4,29 @@ title: PasswordBox 密码框
 
 # PasswordBoxBaseStyle
 
-控件默认样式，该样式不建议直接使用，而是选择继承的方式进行个人控件样式的处理，参考在线资源[PasswordBoxBaseStyle](https://github.com/HandyOrg/HandyControl/blob/master/src/Shared/HandyControl_Shared/Themes/Styles/Base/PasswordBoxBaseStyle.xaml)
+原生密码框默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
 
-```
-<Style BasedOn="{StaticResource PasswordBoxBaseStyle}" TargetType="PasswordBox"/>
-```
-
-使用
-
-```
-    <PasswordBox PasswordChar="*"
-                 VerticalAlignment="Center"
-                 Width="120"></PasswordBox>
-```
-
-效果
+{% note info no-icon %}
+用例：
+{% code %}
+    <PasswordBox PasswordChar="*" VerticalAlignment="Center" Width="120"></PasswordBox>
+{% endcode %}
 
 ![PasswordBox.BaseStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/PasswordBox.BaseStyle.png)
 
-# PasswordBoxExtendBaseStyle
+{% endnote %}
 
-控件拓展基础样式，是样式`PasswordBoxExtend`的基本样式，不建议直接使用，而是选择使用`PasswordBoxExtend`，该样式支持添加`PasswordBox`专用附加属性`PasswordBoxAttach`、额外信息元素`InfoElement`和标题元素`TitleElement`
+# PasswordBoxExtendBaseStyle : PasswordBoxBaseStyle
 
-```
+原生密码框扩展默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+# PasswordBoxExtend : PasswordBoxExtendBaseStyle
+
+相对于原生密码框默认样式，它借助于附加属性可以实现标题、水印的功能。
+
+{% note info no-icon %}
+用例：
+{% code %}
     <!--为使普通密码输入文本框显示水印,需要设定PasswordBoxAttach.PasswordLength="0"-->
     <PasswordBox Style="{DynamicResource PasswordBoxExtend}" PasswordChar="*" 
                  hc:PasswordBoxAttach.PasswordLength="0"
@@ -38,9 +38,8 @@ title: PasswordBox 密码框
                  hc:TitleElement.TitleAlignment="Top"
                  VerticalAlignment="Center"
                  Width="120"></PasswordBox>
-```
-
-效果
+{% endcode %}
 
 ![PasswordBox.ExtendStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/PasswordBox.ExtendStyle.png)
 
+{% endnote %}
\ No newline at end of file
diff --git a/doc/source/handycontrol/native_controls/progressBar/index.md b/doc/source/handycontrol/native_controls/progressBar/index.md
index 4e37ca4c..8f5ca2a7 100644
--- a/doc/source/handycontrol/native_controls/progressBar/index.md
+++ b/doc/source/handycontrol/native_controls/progressBar/index.md
@@ -4,30 +4,25 @@ title: ProgressBar 进度条
 
 # ProgressBarBaseStyle
 
-`HandyControl`中自带的默认样式，不建议直接使用而是选择继承的方式，案例如下：
-
-```
-<Style BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}"/>
-</Style>
-```
+进度条默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
 
 # 其他样式
 
 `HandyControl`中自带的其他样式和效果，其中包含如下样式：
 
-| 样式Key            | 用途 |
-| ------------------ | ---- |
-| ProgressBarSuccess | 成功色进度条 |
-| ProgressBarInfo | 提示色进度条 |
-| ProgressBarWarning | 警告色进度条 |
-| ProgressBarDanger | 危险色进度条 |
-| ProgressBarPrimaryStripe | 主题色条纹进度条 |
-| ProgressBarSuccessStripe | 成功色条纹进度条 |
-| ProgressBarInfoStripe | 信息色条纹进度条 |
-| ProgressBarWarningStripe | 警告色条纹进度条 |
-| ProgressBarDangerStripe | 危险色条纹进度条 |
-| ProgressBarFlat | 扁平风格 |
+| 样式Key            | 用途 |父样式|
+| ------------------ | ---- ||
+| ProgressBarSuccess | 成功色进度条 |ProgressBarBaseStyle|
+| ProgressBarInfo | 提示色进度条 |ProgressBarBaseStyle|
+| ProgressBarWarning | 警告色进度条 |ProgressBarBaseStyle|
+| ProgressBarDanger | 危险色进度条 |ProgressBarBaseStyle|
+| ProgressBarStripeBaseStyle | 条纹进度条默认样式（不推荐直接使用） |-|
+| ProgressBarPrimaryStripe | 主题色条纹进度条 |ProgressBarStripeBaseStyle|
+| ProgressBarSuccessStripe | 成功色条纹进度条 |ProgressBarStripeBaseStyle|
+| ProgressBarInfoStripe | 信息色条纹进度条 |ProgressBarStripeBaseStyle|
+| ProgressBarWarningStripe | 警告色条纹进度条 |ProgressBarStripeBaseStyle|
+| ProgressBarDangerStripe | 危险色条纹进度条 |ProgressBarStripeBaseStyle|
+| ProgressBarFlat | 扁平风格 |-|
 
 案例：
 ```xml
@@ -81,5 +76,4 @@ title: ProgressBar 进度条
 
 # 温馨提示
 
-对于进度条进度颜色、圆角以及其他样式的个人使用需求，可查看`HandyControl`开源目中的[源码样式部分](https://github.com/HandyOrg/HandyControl/blob/master/src/Shared/HandyControl_Shared/Themes/Styles/ProgressBar.xaml)自行定义
-
+对于颜色、圆角或其它自定义需求，可参考[进度条样式源码](https://github.com/HandyOrg/HandyControl/blob/master/src/Shared/HandyControl_Shared/Themes/Styles/ProgressBar.xaml)自行定义。
\ No newline at end of file

From 39ff90952fb63d2c15e335c229c124f2cddef187 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 5 Jan 2020 23:15:21 +0800
Subject: [PATCH 13/17] update style of TabItem

---
 .../Controls/TabControlDemoCtl.xaml           |  8 ++---
 .../Themes/Styles/TabControl.xaml             | 36 ++++++++-----------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
index 0c0aa790..6492bb1e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
@@ -46,16 +46,16 @@
                     <Label Style="{StaticResource LabelPrimary}" Margin="16,0,0,0" Content="IsEnableAnimation = True"/>
                 </StackPanel>
                 <hc:TabControl x:Name="TabControlDemo" IsEnableAnimation="True" ShowCloseButton="True" IsDraggable="True" IsEnableTabFill="True" Margin="32,0,32,32" Width="800" Height="300">
-                    <hc:TabItem Header="TabItem1" hc:IconElement.Height="16" hc:IconElement.Width="16" hc:IconElement.Geometry="{DynamicResource ConfigGeometry}">
+                    <hc:TabItem Header="TabItem1" hc:IconElement.Height="16" hc:IconElement.Width="16" hc:IconElement.Geometry="{StaticResource ConfigGeometry}">
                         <hc:SimplePanel Background="{DynamicResource RegionBrush}"/>
                     </hc:TabItem>
-                    <hc:TabItem IsSelected="True" Header="TabItem2" hc:IconElement.Height="16" hc:IconElement.Width="16" hc:IconElement.Geometry="{DynamicResource CalendarGeometry}">
+                    <hc:TabItem IsSelected="True" Header="TabItem2" hc:IconElement.Height="16" hc:IconElement.Width="16" hc:IconElement.Geometry="{StaticResource CalendarGeometry}">
                         <hc:SimplePanel Tag="123" Background="#FFE8563F"/>
                     </hc:TabItem>
-                    <hc:TabItem Header="TabItem3" hc:IconElement.Height="16" hc:IconElement.Width="16" hc:IconElement.Geometry="{DynamicResource WindowsGeometry}">
+                    <hc:TabItem Header="TabItem3" hc:IconElement.Height="16" hc:IconElement.Width="16" hc:IconElement.Geometry="{StaticResource WindowsGeometry}">
                         <hc:SimplePanel Background="#FF3F4EE8"/>
                     </hc:TabItem>
-                    <hc:TabItem Header="TabItem4" hc:IconElement.Height="16" hc:IconElement.Width="16" hc:IconElement.Geometry="{DynamicResource ClockGeometry}">
+                    <hc:TabItem Header="TabItem4" hc:IconElement.Height="16" hc:IconElement.Width="16" hc:IconElement.Geometry="{StaticResource ClockGeometry}">
                         <hc:SimplePanel Background="#FFE83F6D"/>
                     </hc:TabItem>
                     <hc:TabItem Header="TabItem5">
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
index 1f6cc8c0..e79e7cb3 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
@@ -27,7 +27,7 @@
         <Setter Property="BorderThickness" Value="1,0,1,1"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="Margin" Value="0"/>
-        <Setter Property="Padding" Value="16,0"/>
+        <Setter Property="Padding" Value="10,0,0,0"/>
         <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
         <Setter Property="VerticalContentAlignment" Value="Stretch"/>
         <Setter Property="Menu" Value="{StaticResource TabItemMenu}"/>
@@ -48,28 +48,18 @@
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="3" BorderThickness="{TemplateBinding BorderThickness}" x:Name="mainBorder" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" Margin="0">
-                            <Border Margin="0,0,0,-1" x:Name="innerBorder" Background="{DynamicResource RegionBrush}" Opacity="0"/>
+                            <Border Margin="0,0,0,-1" x:Name="innerBorder" Background="{DynamicResource RegionBrush}" Visibility="Collapsed"/>
                         </Border>
-                        <Path Grid.Column="0" Margin="10,0,0,0" x:Name="PathMain" Width="{TemplateBinding controls:IconElement.Width}" Height="{TemplateBinding controls:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding controls:IconElement.Geometry}">
-                            <Path.Style>
-                                <Style TargetType="Path">
-                                    <Setter Property="Visibility" Value="Visible"/>
-                                    <Style.Triggers>
-                                        <Trigger Property="Data" Value="{x:Null}">
-                                            <Setter Property="Visibility" Value="Collapsed"/>
-                                        </Trigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </Path.Style>
-                        </Path>
-                        <ContentPresenter Grid.Column="1" x:Name="contentPresenter" ContentSource="Header" Focusable="False" HorizontalAlignment="Stretch" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center">
-                            <ContentPresenter.OpacityMask>
+                        <Path x:Name="PathMain" Margin="10,0,0,0" Grid.Column="0" Width="{TemplateBinding controls:IconElement.Width}" Height="{TemplateBinding controls:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding controls:IconElement.Geometry}"/>
+                        <ContentPresenter Grid.Column="1" x:Name="contentPresenter" ContentSource="Header" Focusable="False" HorizontalAlignment="Stretch" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center"/>
+                        <Border Name="BorderMask" Grid.Column="1" HorizontalAlignment="Right" Width="20" Background="{TemplateBinding Background}">
+                            <Border.OpacityMask>
                                 <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                                    <GradientStop Offset="1"/>
-                                    <GradientStop Color="White" Offset="0.8"/>
+                                    <GradientStop Color="White" Offset="1"/>
+                                    <GradientStop Offset="0"/>
                                 </LinearGradientBrush>
-                            </ContentPresenter.OpacityMask>
-                        </ContentPresenter>
+                            </Border.OpacityMask>
+                        </Border>
                         <Button Grid.Column="2" Focusable="False" Command="interactivity:ControlCommands.Close" Visibility="{TemplateBinding ShowCloseButton,Converter={StaticResource Boolean2VisibilityConverter}}" Background="Transparent" Style="{StaticResource ButtonCustom}" Width="28">
                             <Path Fill="{DynamicResource PrimaryTextBrush}" Width="8" Height="8" Style="{StaticResource ClosePathStyle}"/>
                         </Button>
@@ -77,7 +67,11 @@
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsSelected" Value="true">
                             <Setter Property="Panel.ZIndex" Value="1"/>
-                            <Setter Property="Opacity" TargetName="innerBorder" Value="1"/>
+                            <Setter Property="Visibility" TargetName="innerBorder" Value="Visible"/>
+                            <Setter Property="Background" TargetName="BorderMask" Value="{DynamicResource RegionBrush}"/>
+                        </Trigger>
+                        <Trigger Property="controls:IconElement.Geometry" Value="{x:Null}">
+                            <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>

From 1285286e0ec89764e2568aa365c8030ff5d419d2 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 5 Jan 2020 23:34:39 +0800
Subject: [PATCH 14/17] fixed #284

---
 .../Themes/Styles/Base/TreeViewBaseStyle.xaml |  4 +--
 .../Themes/Styles/Base/TreeViewBaseStyle.xaml |  4 +--
 .../Themes/Styles/Base/TreeViewBaseStyle.xaml |  4 +--
 .../HandyControlDemo_Shared/MainWindow.xaml   |  2 +-
 .../UserControl/Controls/GotoTopDemoCtl.xaml  |  2 +-
 .../Controls/ScrollViewerDemoCtl.xaml         |  4 +--
 .../Controls/TabControlDemoCtl.xaml           |  8 +++---
 .../UserControl/Main/LeftMainContent.xaml     |  2 +-
 .../UserControl/Styles/ButtonDemoCtl.xaml     |  2 +-
 .../Styles/RepeatButtonDemoCtl.xaml           |  2 +-
 .../Styles/ToggleButtonDemoCtl.xaml           |  2 +-
 .../Window/GrowlDemoWindow.xaml               |  2 +-
 .../Controls/Growl/GrowlWindow.cs             |  2 +-
 .../Controls/Other/GotoTop.cs                 |  2 +-
 .../Controls/Other/ScrollViewer.cs            | 20 ++++++-------
 .../Controls/TabControl/TabControl.cs         | 28 +++++++++----------
 .../Controls/TabControl/TabItem.cs            |  4 +--
 .../Controls/TabControl/TabPanel.cs           | 14 +++++-----
 .../Themes/Styles/TabControl.xaml             |  8 +++---
 19 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/src/Core_30/HandyControl_Core_30/Themes/Styles/Base/TreeViewBaseStyle.xaml b/src/Core_30/HandyControl_Core_30/Themes/Styles/Base/TreeViewBaseStyle.xaml
index 8050e2b6..b556d943 100644
--- a/src/Core_30/HandyControl_Core_30/Themes/Styles/Base/TreeViewBaseStyle.xaml
+++ b/src/Core_30/HandyControl_Core_30/Themes/Styles/Base/TreeViewBaseStyle.xaml
@@ -103,7 +103,7 @@
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
         <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
-        <Setter Property="controls:ScrollViewer.IsEnableInertia" Value="False"/>
+        <Setter Property="controls:ScrollViewer.IsInertiaEnabled" Value="False"/>
         <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True"/>
@@ -111,7 +111,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="TreeView">
                     <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
-                        <controls:ScrollViewer x:Name="_tv_scrollviewer_" IsEnableInertia="{Binding Path=(controls:ScrollViewer.IsEnableInertia),RelativeSource={RelativeSource TemplatedParent}}" Template="{StaticResource ScrollViewerBaseControlTemplate}" Background="{TemplateBinding Background}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                        <controls:ScrollViewer x:Name="_tv_scrollviewer_" IsInertiaEnabled="{Binding Path=(controls:ScrollViewer.IsInertiaEnabled),RelativeSource={RelativeSource TemplatedParent}}" Template="{StaticResource ScrollViewerBaseControlTemplate}" Background="{TemplateBinding Background}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
                             <ItemsPresenter/>
                         </controls:ScrollViewer>
                     </Border>
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml
index af4a3db6..6c9f43c3 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml
@@ -103,14 +103,14 @@
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
         <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
-        <Setter Property="controls:ScrollViewer.IsEnableInertia" Value="False"/>
+        <Setter Property="controls:ScrollViewer.IsInertiaEnabled" Value="False"/>
         <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="TreeView">
                     <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
-                        <controls:ScrollViewer x:Name="_tv_scrollviewer_" IsEnableInertia="{Binding Path=(controls:ScrollViewer.IsEnableInertia),RelativeSource={RelativeSource TemplatedParent}}" Template="{StaticResource ScrollViewerBaseControlTemplate}" Background="{TemplateBinding Background}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                        <controls:ScrollViewer x:Name="_tv_scrollviewer_" IsInertiaEnabled="{Binding Path=(controls:ScrollViewer.IsInertiaEnabled),RelativeSource={RelativeSource TemplatedParent}}" Template="{StaticResource ScrollViewerBaseControlTemplate}" Background="{TemplateBinding Background}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
                             <ItemsPresenter/>
                         </controls:ScrollViewer>
                     </Border>
diff --git a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Base/TreeViewBaseStyle.xaml b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Base/TreeViewBaseStyle.xaml
index 8050e2b6..b556d943 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Base/TreeViewBaseStyle.xaml
+++ b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Base/TreeViewBaseStyle.xaml
@@ -103,7 +103,7 @@
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
         <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
-        <Setter Property="controls:ScrollViewer.IsEnableInertia" Value="False"/>
+        <Setter Property="controls:ScrollViewer.IsInertiaEnabled" Value="False"/>
         <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True"/>
@@ -111,7 +111,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="TreeView">
                     <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
-                        <controls:ScrollViewer x:Name="_tv_scrollviewer_" IsEnableInertia="{Binding Path=(controls:ScrollViewer.IsEnableInertia),RelativeSource={RelativeSource TemplatedParent}}" Template="{StaticResource ScrollViewerBaseControlTemplate}" Background="{TemplateBinding Background}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                        <controls:ScrollViewer x:Name="_tv_scrollviewer_" IsInertiaEnabled="{Binding Path=(controls:ScrollViewer.IsInertiaEnabled),RelativeSource={RelativeSource TemplatedParent}}" Template="{StaticResource ScrollViewerBaseControlTemplate}" Background="{TemplateBinding Background}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
                             <ItemsPresenter/>
                         </controls:ScrollViewer>
                     </Border>
diff --git a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
index 867219d7..36c4906d 100644
--- a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
@@ -35,7 +35,7 @@
             <userControl:LeftMainContent/>
             <userControl:MainContent Grid.Column="1"/>
             <GridSplitter Grid.Column="1" HorizontalAlignment="Left" Width="4" Background="Transparent" BorderThickness="1,0,0,0" BorderBrush="{DynamicResource BorderBrush}"/>
-            <hc:ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Hidden" HorizontalAlignment="Right" IsEnableInertia="True" IsPenetrating="True">
+            <hc:ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Hidden" HorizontalAlignment="Right" IsInertiaEnabled="True" IsPenetrating="True">
                 <StackPanel hc:Growl.GrowlParent="True" VerticalAlignment="Top" Margin="0,10,10,10"/>
             </hc:ScrollViewer>
         </Grid>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml
index 6ccca191..6ab499a8 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml
@@ -5,7 +5,7 @@
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
         <hc:SimplePanel Width="500" Height="400">
-            <hc:ScrollViewer Name="ScrollViewerDemo" IsEnableInertia="True" Margin="0,10,0,0">
+            <hc:ScrollViewer Name="ScrollViewerDemo" IsInertiaEnabled="True" Margin="0,10,0,0">
                 <Border Height="2000" Margin="8,0">
                     <Border.Background>
                         <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml
index f3838904..b65a090a 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml
@@ -13,7 +13,7 @@
                 <RowDefinition/>
             </Grid.RowDefinitions>
             <Border BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
-                <hc:ScrollViewer Orientation="Horizontal" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Hidden" IsEnableInertia="True">
+                <hc:ScrollViewer Orientation="Horizontal" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Hidden" IsInertiaEnabled="True">
                     <StackPanel Orientation="Horizontal">
                         <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
@@ -44,7 +44,7 @@
                 </hc:ScrollViewer>
             </Border>
             <Border Grid.Row="1" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Margin="0,16,0,0">
-                <hc:ScrollViewer IsEnableInertia="True">
+                <hc:ScrollViewer IsInertiaEnabled="True">
                     <WrapPanel Orientation="Horizontal">
                         <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
index 6492bb1e..98f7378d 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
@@ -40,12 +40,12 @@
                     </hc:TabItem>
                 </hc:TabControl>
                 <StackPanel Orientation="Horizontal" Margin="32,32,32,16">
-                    <Label Style="{StaticResource LabelPrimary}" Margin="0" Content="IsEnableTabFill = True"/>
+                    <Label Style="{StaticResource LabelPrimary}" Margin="0" Content="IsTabFillEnabled = True"/>
                     <Label Style="{StaticResource LabelPrimary}" Margin="16,0,0,0" Content="ShowCloseButton = True"/>
                     <Label Style="{StaticResource LabelPrimary}" Margin="16,0,0,0" Content="IsDraggable = True"/>
-                    <Label Style="{StaticResource LabelPrimary}" Margin="16,0,0,0" Content="IsEnableAnimation = True"/>
+                    <Label Style="{StaticResource LabelPrimary}" Margin="16,0,0,0" Content="IsAnimationEnabled = True"/>
                 </StackPanel>
-                <hc:TabControl x:Name="TabControlDemo" IsEnableAnimation="True" ShowCloseButton="True" IsDraggable="True" IsEnableTabFill="True" Margin="32,0,32,32" Width="800" Height="300">
+                <hc:TabControl x:Name="TabControlDemo" IsAnimationEnabled="True" ShowCloseButton="True" IsDraggable="True" IsTabFillEnabled="True" Margin="32,0,32,32" Width="800" Height="300">
                     <hc:TabItem Header="TabItem1" hc:IconElement.Height="16" hc:IconElement.Width="16" hc:IconElement.Geometry="{StaticResource ConfigGeometry}">
                         <hc:SimplePanel Background="{DynamicResource RegionBrush}"/>
                     </hc:TabItem>
@@ -68,7 +68,7 @@
                         <hc:SimplePanel Background="#FFE8E03F"/>
                     </hc:TabItem>
                 </hc:TabControl>
-                <hc:TabControl IsEnableAnimation="True" ShowCloseButton="True" IsDraggable="True" ItemsSource="{Binding DataList}" Width="800" Height="300">
+                <hc:TabControl IsAnimationEnabled="True" ShowCloseButton="True" IsDraggable="True" ItemsSource="{Binding DataList}" Width="800" Height="300">
                     <TabControl.ItemTemplate>
                         <DataTemplate>
                             <TextBlock Text="{Binding Header}"/>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
index 36596d31..efed5131 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
@@ -1,4 +1,4 @@
-<Border hc:ScrollViewer.IsEnableInertia="True"
+<Border hc:ScrollViewer.IsInertiaEnabled="True"
         xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
         xmlns:command="http://www.galasoft.ch/mvvmlight"
         x:Class="HandyControlDemo.UserControl.LeftMainContent"
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml
index c2faa4c7..05e4328f 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml
@@ -5,7 +5,7 @@
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <hc:ScrollViewer IsEnableInertia="True">
+        <hc:ScrollViewer IsInertiaEnabled="True">
             <StackPanel Margin="32">
                 <WrapPanel ItemWidth="160" ItemHeight="130">
                     <StackPanel>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml
index 9ee471ed..f15c75d2 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml
@@ -5,7 +5,7 @@
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <hc:ScrollViewer IsEnableInertia="True">
+        <hc:ScrollViewer IsInertiaEnabled="True">
             <StackPanel Margin="32">
                 <WrapPanel ItemWidth="160" ItemHeight="130">
                     <StackPanel>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml
index 34ec4516..a184c7ae 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml
@@ -5,7 +5,7 @@
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              xmlns:hc="https://handyorg.github.io/handycontrol">
     <hc:TransitioningContentControl>
-        <hc:ScrollViewer IsEnableInertia="True">
+        <hc:ScrollViewer IsInertiaEnabled="True">
             <StackPanel Margin="32">
                 <WrapPanel ItemWidth="160" ItemHeight="130">
                     <StackPanel>
diff --git a/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml
index 99f46bf7..498734aa 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml
@@ -19,7 +19,7 @@
                 <Button Command="{Binding FatalCmd}" Content="{x:Static langs:Lang.Fatal}" Margin="5,0"/>
                 <Button Command="{Binding ClearCmd}" Content="{x:Static langs:Lang.Clear}" Margin="5,0,0,0" Style="{StaticResource ButtonPrimary}"/>
             </WrapPanel>
-            <hc:ScrollViewer VerticalScrollBarVisibility="Hidden" HorizontalAlignment="Right" IsEnableInertia="True" IsPenetrating="True">
+            <hc:ScrollViewer VerticalScrollBarVisibility="Hidden" HorizontalAlignment="Right" IsInertiaEnabled="True" IsPenetrating="True">
                 <StackPanel hc:Growl.Token="{x:Static data:MessageToken.GrowlDemoPanel}" VerticalAlignment="Top" Margin="0,10,10,10"/>
             </hc:ScrollViewer>
         </hc:SimplePanel>
diff --git a/src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs b/src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs
index ff968638..59e1214d 100644
--- a/src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs
@@ -21,7 +21,7 @@ namespace HandyControl.Controls
             Content = new ScrollViewer
             {
                 VerticalScrollBarVisibility = ScrollBarVisibility.Hidden,
-                IsEnableInertia = true,
+                IsInertiaEnabled = true,
                 Content = GrowlPanel
             };
         }
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/GotoTop.cs b/src/Shared/HandyControl_Shared/Controls/Other/GotoTop.cs
index 63df976c..0d5ea363 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/GotoTop.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/GotoTop.cs
@@ -35,7 +35,7 @@ namespace HandyControl.Controls
             {
                 _scrollViewer.ScrollChanged += ScrollViewer_ScrollChanged;
 
-                if (_scrollViewer is ScrollViewer scrollViewerHandy && Animated && scrollViewerHandy.IsEnableInertia)
+                if (_scrollViewer is ScrollViewer scrollViewerHandy && Animated && scrollViewerHandy.IsInertiaEnabled)
                 {
                     _gotoTopAction = () => scrollViewerHandy.ScrollToTopInternal(AnimationTime);
                 }
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs b/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs
index 764f4c3e..bf504810 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs
@@ -51,7 +51,7 @@ namespace HandyControl.Controls
         {
             if (!CanMouseWheel) return;
 
-            if (!IsEnableInertia)
+            if (!IsInertiaEnabled)
             {
                 if (Orientation == Orientation.Vertical)
                 {
@@ -142,26 +142,26 @@ namespace HandyControl.Controls
         /// <summary>
         ///     是否支持惯性
         /// </summary>
-        public static readonly DependencyProperty IsEnableInertiaProperty = DependencyProperty.RegisterAttached(
-            "IsEnableInertia", typeof(bool), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.FalseBox));
+        public static readonly DependencyProperty IsInertiaEnabledProperty = DependencyProperty.RegisterAttached(
+            "IsInertiaEnabled", typeof(bool), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.FalseBox));
 
-        public static void SetIsEnableInertia(DependencyObject element, bool value)
+        public static void SetIsInertiaEnabled(DependencyObject element, bool value)
         {
-            element.SetValue(IsEnableInertiaProperty, value);
+            element.SetValue(IsInertiaEnabledProperty, value);
         }
 
-        public static bool GetIsEnableInertia(DependencyObject element)
+        public static bool GetIsInertiaEnabled(DependencyObject element)
         {
-            return (bool)element.GetValue(IsEnableInertiaProperty);
+            return (bool)element.GetValue(IsInertiaEnabledProperty);
         }
 
         /// <summary>
         ///     是否支持惯性
         /// </summary>
-        public bool IsEnableInertia
+        public bool IsInertiaEnabled
         {
-            get => (bool) GetValue(IsEnableInertiaProperty);
-            set => SetValue(IsEnableInertiaProperty, value);
+            get => (bool) GetValue(IsInertiaEnabledProperty);
+            set => SetValue(IsInertiaEnabledProperty, value);
         }
 
         /// <summary>
diff --git a/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs b/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs
index fb717a52..bcef77e1 100644
--- a/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs
@@ -50,16 +50,16 @@ namespace HandyControl.Controls
         /// <summary>
         ///     是否启用动画
         /// </summary>
-        public static readonly DependencyProperty IsEnableAnimationProperty = DependencyProperty.Register(
-            "IsEnableAnimation", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
+        public static readonly DependencyProperty IsAnimationEnabledProperty = DependencyProperty.Register(
+            "IsAnimationEnabled", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
 
         /// <summary>
         ///     是否启用动画
         /// </summary>
-        public bool IsEnableAnimation
+        public bool IsAnimationEnabled
         {
-            get => (bool)GetValue(IsEnableAnimationProperty);
-            set => SetValue(IsEnableAnimationProperty, value);
+            get => (bool)GetValue(IsAnimationEnabledProperty);
+            set => SetValue(IsAnimationEnabledProperty, value);
         }
 
         /// <summary>
@@ -122,16 +122,16 @@ namespace HandyControl.Controls
         /// <summary>
         ///     是否将标签填充
         /// </summary>
-        public static readonly DependencyProperty IsEnableTabFillProperty = DependencyProperty.Register(
-            "IsEnableTabFill", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
+        public static readonly DependencyProperty IsTabFillEnabledProperty = DependencyProperty.Register(
+            "IsTabFillEnabled", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
 
         /// <summary>
         ///     是否将标签填充
         /// </summary>
-        public bool IsEnableTabFill
+        public bool IsTabFillEnabled
         {
-            get => (bool)GetValue(IsEnableTabFillProperty);
-            set => SetValue(IsEnableTabFillProperty, value);
+            get => (bool)GetValue(IsTabFillEnabledProperty);
+            set => SetValue(IsTabFillEnabledProperty, value);
         }
 
         /// <summary>
@@ -224,7 +224,7 @@ namespace HandyControl.Controls
                 return;
             }
 
-            if (!IsEnableTabFill)
+            if (!IsTabFillEnabled)
             {
                 _itemShowCount = (int)(ActualWidth / TabItemWidth);
                 _buttonOverflow?.Show(ShowOverflowButton && Items.Count > 0 && Items.Count >= _itemShowCount);
@@ -236,7 +236,7 @@ namespace HandyControl.Controls
                 return;
             }
 
-            if (IsEnableAnimation)
+            if (IsAnimationEnabled)
             {
                 HeaderPanel.SetCurrentValue(TabPanel.FluidMoveDurationProperty, new Duration(TimeSpan.FromMilliseconds(200)));
             }
@@ -279,7 +279,7 @@ namespace HandyControl.Controls
             base.OnApplyTemplate();
             HeaderPanel = GetTemplateChild(HeaderPanelKey) as TabPanel;
 
-            if (IsEnableTabFill) return;
+            if (IsTabFillEnabled) return;
 
             _buttonOverflow = GetTemplateChild(OverflowButtonKey) as ContextMenuToggleButton;
             _scrollViewerOverflow = GetTemplateChild(OverflowScrollviewer) as ScrollViewer;
@@ -357,7 +357,7 @@ namespace HandyControl.Controls
                         {
                             list.Remove(actualItem);
                             list.Insert(0, actualItem);
-                            if (IsEnableAnimation)
+                            if (IsAnimationEnabled)
                             {
                                 HeaderPanel.SetCurrentValue(TabPanel.FluidMoveDurationProperty, new Duration(TimeSpan.FromMilliseconds(200)));
                             }
diff --git a/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs b/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs
index 2df33a1b..ceddf142 100644
--- a/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs
@@ -278,7 +278,7 @@ namespace HandyControl.Controls
             RaiseEvent(argsClosing);
             if (argsClosing.Cancel) return;
 
-            TabPanel.SetCurrentValue(TabPanel.FluidMoveDurationProperty, parent.IsEnableAnimation
+            TabPanel.SetCurrentValue(TabPanel.FluidMoveDurationProperty, parent.IsAnimationEnabled
                     ? new Duration(TimeSpan.FromMilliseconds(200))
                     : new Duration(TimeSpan.FromMilliseconds(1)));
             
@@ -419,7 +419,7 @@ namespace HandyControl.Controls
             }
 
             TargetOffsetX = resultX;
-            if (!parent.IsEnableAnimation)
+            if (!parent.IsAnimationEnabled)
             {
                 AnimationCompleted();
                 return;
diff --git a/src/Shared/HandyControl_Shared/Controls/TabControl/TabPanel.cs b/src/Shared/HandyControl_Shared/Controls/TabControl/TabPanel.cs
index 24583074..ec7c5bd5 100644
--- a/src/Shared/HandyControl_Shared/Controls/TabControl/TabPanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/TabControl/TabPanel.cs
@@ -40,16 +40,16 @@ namespace HandyControl.Controls
         /// <summary>
         ///     是否将标签填充
         /// </summary>
-        public static readonly DependencyProperty IsEnableTabFillProperty = DependencyProperty.Register(
-            "IsEnableTabFill", typeof(bool), typeof(TabPanel), new PropertyMetadata(ValueBoxes.FalseBox));
+        public static readonly DependencyProperty IsTabFillEnabledProperty = DependencyProperty.Register(
+            "IsTabFillEnabled", typeof(bool), typeof(TabPanel), new PropertyMetadata(ValueBoxes.FalseBox));
 
         /// <summary>
         ///     是否将标签填充
         /// </summary>
-        public bool IsEnableTabFill
+        public bool IsTabFillEnabled
         {
-            get => (bool)GetValue(IsEnableTabFillProperty);
-            set => SetValue(IsEnableTabFillProperty, value);
+            get => (bool)GetValue(IsTabFillEnabledProperty);
+            set => SetValue(IsTabFillEnabledProperty, value);
         }
 
         /// <summary>
@@ -115,7 +115,7 @@ namespace HandyControl.Controls
             var itemWidth = .0;
             var arr = new int[count];
 
-            if (!IsEnableTabFill)
+            if (!IsTabFillEnabled)
             {
                 itemWidth = TabItemWidth;
             }
@@ -129,7 +129,7 @@ namespace HandyControl.Controls
 
             for (var index = 0; index < count; index++)
             {
-                if (IsEnableTabFill)
+                if (IsTabFillEnabled)
                 {
                     itemWidth = arr[index];
                 }
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
index e79e7cb3..73da8568 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
@@ -91,7 +91,7 @@
                     <RowDefinition Height="*"/>
                 </Grid.RowDefinitions>
                 <Border Background="{TemplateBinding Background}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}">
-                    <controls:TabPanel MinHeight="{TemplateBinding TabItemHeight}" TabItemHeight="{TemplateBinding TabItemHeight}" TabItemWidth="{TemplateBinding TabItemWidth}" IsEnableTabFill="{TemplateBinding IsEnableTabFill}" Margin="0,0,-1,-1" x:Name="PART_HeaderPanel" HorizontalAlignment="Left" Background="{DynamicResource SecondaryTextBrush}" IsItemsHost="true" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1">
+                    <controls:TabPanel MinHeight="{TemplateBinding TabItemHeight}" TabItemHeight="{TemplateBinding TabItemHeight}" TabItemWidth="{TemplateBinding TabItemWidth}" IsTabFillEnabled="{TemplateBinding IsTabFillEnabled}" Margin="0,0,-1,-1" x:Name="PART_HeaderPanel" HorizontalAlignment="Left" Background="{DynamicResource SecondaryTextBrush}" IsItemsHost="true" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1">
                         <interactivity:Interaction.Behaviors>
                             <interactivity:FluidMoveBehavior AppliesTo="Children" Duration="{Binding FluidMoveDuration,ElementName=PART_HeaderPanel}">
                                 <interactivity:FluidMoveBehavior.EaseX>
@@ -129,9 +129,9 @@
                     </Border.CacheMode>
                     <RepeatButton Focusable="False" Style="{StaticResource RepeatButtonIcon}" Padding="8" controls:IconElement.Geometry="{StaticResource LeftGeometry}" Foreground="{DynamicResource PrimaryTextBrush}" Background="{DynamicResource SecondaryRegionBrush}" x:Name="PART_ScrollButtonLeft"/>
                 </Border>
-                <controls:ScrollViewer HorizontalScrollBarVisibility="Hidden" CanMouseWheel="True" Orientation="Horizontal" IsEnableInertia="True" Grid.Row="0" Grid.Column="1" IsDeferredScrollingEnabled="True" x:Name="PART_OverflowScrollviewer">
+                <controls:ScrollViewer HorizontalScrollBarVisibility="Hidden" CanMouseWheel="True" Orientation="Horizontal" IsInertiaEnabled="True" Grid.Row="0" Grid.Column="1" IsDeferredScrollingEnabled="True" x:Name="PART_OverflowScrollviewer">
                     <Border Background="{TemplateBinding Background}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Name="PART_HeaderBorder">
-                        <controls:TabPanel MinHeight="{TemplateBinding TabItemHeight}" TabItemHeight="{TemplateBinding TabItemHeight}" TabItemWidth="{TemplateBinding TabItemWidth}" IsEnableTabFill="{TemplateBinding IsEnableTabFill}" Margin="0,0,-1,-1" x:Name="PART_HeaderPanel" HorizontalAlignment="Left" Background="{DynamicResource SecondaryTextBrush}" IsItemsHost="true" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1">
+                        <controls:TabPanel MinHeight="{TemplateBinding TabItemHeight}" TabItemHeight="{TemplateBinding TabItemHeight}" TabItemWidth="{TemplateBinding TabItemWidth}" IsTabFillEnabled="{TemplateBinding IsTabFillEnabled}" Margin="0,0,-1,-1" x:Name="PART_HeaderPanel" HorizontalAlignment="Left" Background="{DynamicResource SecondaryTextBrush}" IsItemsHost="true" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1">
                             <interactivity:Interaction.Behaviors>
                                 <interactivity:FluidMoveBehavior AppliesTo="Children" Duration="{Binding FluidMoveDuration,ElementName=PART_HeaderPanel}">
                                     <interactivity:FluidMoveBehavior.EaseX>
@@ -171,7 +171,7 @@
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition Property="IsScrollable" Value="True"/>
-                    <Condition Property="IsEnableTabFill" Value="False"/>
+                    <Condition Property="IsTabFillEnabled" Value="False"/>
                 </MultiTrigger.Conditions>
                 <Setter Property="Template" Value="{StaticResource TabControlPlusScrollableTemplate}"/>
             </MultiTrigger>

From 40b09cc9c50626488e5eea4a293e678406b3c26e Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Mon, 6 Jan 2020 00:01:47 +0800
Subject: [PATCH 15/17] fixed #278

---
 .../Controls/OutlineTextDemoCtl.xaml          |  2 +
 .../Controls/Text/OutlineText.cs              | 50 ++++++++++++++++++-
 .../Data/Enum/StrokePosition.cs               |  9 ++++
 .../HandyControl_Shared.projitems             |  1 +
 4 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 src/Shared/HandyControl_Shared/Data/Enum/StrokePosition.cs

diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/OutlineTextDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/OutlineTextDemoCtl.xaml
index a8ccd7e0..21762990 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/OutlineTextDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/OutlineTextDemoCtl.xaml
@@ -11,6 +11,8 @@
             <hc:OutlineText Margin="0,10,0,0" FontSize="30" FontStyle="Italic" Text="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=8}"/>
             <hc:OutlineText Margin="0,10,0,0" TextWrapping="Wrap" TextTrimming="CharacterEllipsis" FontSize="50" StrokeThickness="2" Fill="{DynamicResource DangerBrush}" Stroke="{DynamicResource PrimaryBrush}" Text="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}"/>
             <hc:OutlineText Margin="0,10,0,0" FontSize="80" FontWeight="Bold" StrokeThickness="4" Fill="{DynamicResource PrimaryBrush}" Stroke="{DynamicResource DangerBrush}" Text="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=2}"/>
+            <hc:OutlineText Margin="0,10,0,0" StrokePosition="Outside" FontSize="80" FontWeight="Bold" StrokeThickness="4" Fill="{DynamicResource PrimaryBrush}" Stroke="{DynamicResource DangerBrush}" Text="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=2}"/>
+            <hc:OutlineText Margin="0,10,0,0" StrokePosition="InSide" FontSize="80" FontWeight="Bold" StrokeThickness="4" Fill="{DynamicResource PrimaryBrush}" Stroke="{DynamicResource DangerBrush}" Text="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=2}"/>
         </StackPanel>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControl_Shared/Controls/Text/OutlineText.cs b/src/Shared/HandyControl_Shared/Controls/Text/OutlineText.cs
index be9022c9..038480de 100644
--- a/src/Shared/HandyControl_Shared/Controls/Text/OutlineText.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Text/OutlineText.cs
@@ -10,16 +10,29 @@ namespace HandyControl.Controls
 {
     public class OutlineText : FrameworkElement
     {
+        private Pen _pen;
+
         private FormattedText _formattedText;
 
         private Geometry _textGeometry;
 
+        private PathGeometry _clipGeometry;
+
         static OutlineText()
         {
             SnapsToDevicePixelsProperty.OverrideMetadata(typeof(OutlineText), new FrameworkPropertyMetadata(ValueBoxes.TrueBox));
             UseLayoutRoundingProperty.OverrideMetadata(typeof(OutlineText), new FrameworkPropertyMetadata(ValueBoxes.TrueBox));
         }
 
+        public static readonly DependencyProperty StrokePositionProperty = DependencyProperty.Register(
+            "StrokePosition", typeof(StrokePosition), typeof(OutlineText), new PropertyMetadata(default(StrokePosition)));
+
+        public StrokePosition StrokePosition
+        {
+            get => (StrokePosition) GetValue(StrokePositionProperty);
+            set => SetValue(StrokePositionProperty, value);
+        }
+
         public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
             "Text", typeof(string), typeof(OutlineText), new FrameworkPropertyMetadata(
                 string.Empty,
@@ -143,7 +156,34 @@ namespace HandyControl.Controls
         protected override void OnRender(DrawingContext drawingContext)
         {
             EnsureGeometry();
-            drawingContext.DrawGeometry(Fill, new Pen(Stroke, StrokeThickness), _textGeometry);
+
+            drawingContext.DrawGeometry(Fill, null, _textGeometry);
+
+            if (StrokePosition == StrokePosition.Outside)
+            {
+                drawingContext.PushClip(_clipGeometry);
+            }
+            else if (StrokePosition == StrokePosition.Inside)
+            {
+                drawingContext.PushClip(_textGeometry);
+            }
+
+            drawingContext.DrawGeometry(null, _pen, _textGeometry);
+
+            if (StrokePosition == StrokePosition.Outside || StrokePosition == StrokePosition.Inside)
+            {
+                drawingContext.Pop();
+            }
+        }
+
+        private void UpdatePen()
+        {
+            _pen = new Pen(Stroke, StrokeThickness);
+
+            if (StrokePosition == StrokePosition.Outside || StrokePosition == StrokePosition.Inside)
+            {
+                _pen.Thickness = StrokeThickness * 2;
+            }
         }
 
         private void EnsureFormattedText()
@@ -187,6 +227,12 @@ namespace HandyControl.Controls
 
             EnsureFormattedText();
             _textGeometry = _formattedText.BuildGeometry(new Point(0, 0));
+
+            if (StrokePosition == StrokePosition.Outside)
+            {
+                var geometry = new RectangleGeometry(new Rect(0, 0, ActualWidth, ActualHeight));
+                _clipGeometry = Geometry.Combine(geometry, _textGeometry, GeometryCombineMode.Exclude, null);
+            }
         }
 
         private void UpdateFormattedText()
@@ -237,6 +283,8 @@ namespace HandyControl.Controls
             _formattedText.MaxTextWidth = Math.Min(3579139, availableSize.Width);
             _formattedText.MaxTextHeight = Math.Max(0.0001d, availableSize.Height);
 
+            UpdatePen();
+
             // return the desired size
             return new Size(_formattedText.Width, _formattedText.Height);
         }
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/StrokePosition.cs b/src/Shared/HandyControl_Shared/Data/Enum/StrokePosition.cs
new file mode 100644
index 00000000..96711a7d
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Data/Enum/StrokePosition.cs
@@ -0,0 +1,9 @@
+namespace HandyControl.Data
+{
+    public enum StrokePosition
+    {
+        Center,
+        Outside,
+        Inside
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index b6842277..4af77f44 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -45,6 +45,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\HitMode.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\ShowAnimation.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\NotifyIconInfoType.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\StrokePosition.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\TransitionMode.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Commands\CloseWindowCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Commands\OpenLinkCommand.cs" />

From 1bc5a84959db1dfbba6d04a43df2a2a525ce5d69 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 7 Jan 2020 00:41:17 +0800
Subject: [PATCH 16/17] fixed #276

---
 .../Controls/Input/NumericUpDown.cs            | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
index eac6fd1a..c18bbb0a 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
@@ -25,6 +25,8 @@ namespace HandyControl.Controls
 
         private TextBox _textBox;
 
+        private bool _updateText;
+
         #endregion Data
 
         public NumericUpDown()
@@ -34,23 +36,18 @@ namespace HandyControl.Controls
                 if (IsReadOnly) return;
 
                 Value += Increment;
-                _textBox.Text = CurrentText;
-                _textBox.Select(_textBox.Text.Length, 0);
             }));
             CommandBindings.Add(new CommandBinding(ControlCommands.Next, (s, e) =>
             {
                 if (IsReadOnly) return;
 
                 Value -= Increment;
-                _textBox.Text = CurrentText;
-                _textBox.Select(_textBox.Text.Length, 0);
             }));
             CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
             {
                 if (IsReadOnly) return;
 
                 SetCurrentValue(ValueProperty, ValueBoxes.Double0Box);
-                _textBox.Text = string.Empty;
             }));
 
             Loaded += (s, e) => OnApplyTemplate();
@@ -98,7 +95,9 @@ namespace HandyControl.Controls
             if (!VerifyData()) return;
             if (double.TryParse(_textBox.Text, out var value))
             {
+                _updateText = false;
                 Value = value;
+                _updateText = true;
             }
         }
 
@@ -117,12 +116,10 @@ namespace HandyControl.Controls
             if (e.Key == Key.Up)
             {
                 Value += Increment;
-                _textBox.Text = CurrentText;
             }
             else if (e.Key == Key.Down)
             {
                 Value -= Increment;
-                _textBox.Text = CurrentText;
             }
         }
 
@@ -133,8 +130,6 @@ namespace HandyControl.Controls
             if (_textBox.IsFocused && !IsReadOnly)
             {
                 Value += e.Delta > 0 ? Increment : -Increment;
-                _textBox.Text = CurrentText;
-                _textBox.Select(_textBox.Text.Length, 0);
                 e.Handled = true;
             }
         }
@@ -173,9 +168,10 @@ namespace HandyControl.Controls
         {
             var ctl = (NumericUpDown) d;
             var v = (double) e.NewValue;
-            if (ctl._textBox != null)
+            if (ctl._updateText && ctl._textBox != null)
             {
-                ctl._textBox.Text = v.ToString();
+                ctl._textBox.Text = ctl.CurrentText;
+                ctl._textBox.Select(ctl._textBox.Text.Length, 0);
             }
 
             ctl.OnValueChanged(new FunctionEventArgs<double>(ValueChangedEvent, ctl)

From 8bb9e7a02c0314b24b783e9d2f57a568cc314db8 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 7 Jan 2020 01:25:25 +0800
Subject: [PATCH 17/17] Update Growl.cs

---
 .../Controls/Growl/Growl.cs                   | 223 +++++++++---------
 1 file changed, 111 insertions(+), 112 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs b/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs
index c62a0a39..6267a340 100644
--- a/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs
@@ -278,7 +278,7 @@ namespace HandyControl.Controls
                 }
 
                 _tickCount++;
-                if (_tickCount >= _waitTime) Close();
+                if (_tickCount >= _waitTime) Close(true);
             };
             _timerClose.Start();
         }
@@ -462,6 +462,96 @@ namespace HandyControl.Controls
 #endif           
         }
 
+        private static void InitGrowlInfo(ref GrowlInfo growlInfo, InfoType infoType)
+        {
+            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
+            growlInfo.Type = infoType;
+
+            switch (infoType)
+            {
+                case InfoType.Success:
+                    if (!growlInfo.IsCustom)
+                    {
+                        growlInfo.IconKey = ResourceToken.SuccessGeometry;
+                        growlInfo.IconBrushKey = ResourceToken.SuccessBrush;
+                    }
+                    else
+                    {
+                        growlInfo.IconKey ??= ResourceToken.SuccessGeometry;
+                        growlInfo.IconBrushKey ??= ResourceToken.SuccessBrush;
+                    }
+                    break;
+                case InfoType.Info:
+                    if (!growlInfo.IsCustom)
+                    {
+                        growlInfo.IconKey = ResourceToken.InfoGeometry;
+                        growlInfo.IconBrushKey = ResourceToken.InfoBrush;
+                    }
+                    else
+                    {
+                        growlInfo.IconKey ??= ResourceToken.InfoGeometry;
+                        growlInfo.IconBrushKey ??= ResourceToken.InfoBrush;
+                    }
+                    break;
+                case InfoType.Warning:
+                    if (!growlInfo.IsCustom)
+                    {
+                        growlInfo.IconKey = ResourceToken.WarningGeometry;
+                        growlInfo.IconBrushKey = ResourceToken.WarningBrush;
+                    }
+                    else
+                    {
+                        growlInfo.IconKey ??= ResourceToken.WarningGeometry;
+                        growlInfo.IconBrushKey ??= ResourceToken.WarningBrush;
+                    }
+                    break;
+                case InfoType.Error:
+                    if (!growlInfo.IsCustom)
+                    {
+                        growlInfo.IconKey = ResourceToken.ErrorGeometry;
+                        growlInfo.IconBrushKey = ResourceToken.DangerBrush;
+                        growlInfo.StaysOpen = true;
+                    }
+                    else
+                    {
+                        growlInfo.IconKey ??= ResourceToken.ErrorGeometry;
+                        growlInfo.IconBrushKey ??= ResourceToken.DangerBrush;
+                    }
+                    break;
+                case InfoType.Fatal:
+                    if (!growlInfo.IsCustom)
+                    {
+                        growlInfo.IconKey = ResourceToken.FatalGeometry;
+                        growlInfo.IconBrushKey = ResourceToken.PrimaryTextBrush;
+                        growlInfo.StaysOpen = true;
+                        growlInfo.ShowCloseButton = false;
+                        if (GrowlPanel.ContextMenu != null) GrowlPanel.ContextMenu.Opacity = 0;
+                    }
+                    else
+                    {
+                        growlInfo.IconKey ??= ResourceToken.FatalGeometry;
+                        growlInfo.IconBrushKey ??= ResourceToken.PrimaryTextBrush;
+                    }
+                    break;
+                case InfoType.Ask:
+                    if (!growlInfo.IsCustom)
+                    {
+                        growlInfo.IconKey = ResourceToken.AskGeometry;
+                        growlInfo.IconBrushKey = ResourceToken.AccentBrush;
+                        growlInfo.StaysOpen = true;
+                        growlInfo.ShowCloseButton = false;
+                    }
+                    else
+                    {
+                        growlInfo.IconKey ??= ResourceToken.AskGeometry;
+                        growlInfo.IconBrushKey ??= ResourceToken.AccentBrush;
+                    }
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(infoType), infoType, null);
+            }
+        }
+
         /// <summary>
         ///     成功
         /// </summary>
@@ -479,13 +569,7 @@ namespace HandyControl.Controls
         /// <param name="growlInfo"></param>
         public static void Success(GrowlInfo growlInfo)
         {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.SuccessGeometry;
-                growlInfo.IconBrushKey = ResourceToken.SuccessBrush;
-                growlInfo.Type = InfoType.Success;
-            }
+            InitGrowlInfo(ref growlInfo, InfoType.Success);
             Show(growlInfo);
         }
 
@@ -504,13 +588,7 @@ namespace HandyControl.Controls
         /// <param name="growlInfo"></param>
         public static void SuccessGlobal(GrowlInfo growlInfo)
         {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.SuccessGeometry;
-                growlInfo.IconBrushKey = ResourceToken.SuccessBrush;
-                growlInfo.Type = InfoType.Success;
-            }
+            InitGrowlInfo(ref growlInfo, InfoType.Success);
             ShowGlobal(growlInfo);
         }
 
@@ -531,13 +609,7 @@ namespace HandyControl.Controls
         /// <param name="growlInfo"></param>
         public static void Info(GrowlInfo growlInfo)
         {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.InfoGeometry;
-                growlInfo.IconBrushKey = ResourceToken.InfoBrush;
-                growlInfo.Type = InfoType.Info;
-            }
+            InitGrowlInfo(ref growlInfo, InfoType.Info);
             Show(growlInfo);
         }
 
@@ -556,13 +628,7 @@ namespace HandyControl.Controls
         /// <param name="growlInfo"></param>
         public static void InfoGlobal(GrowlInfo growlInfo)
         {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.InfoGeometry;
-                growlInfo.IconBrushKey = ResourceToken.InfoBrush;
-                growlInfo.Type = InfoType.Info;
-            }
+            InitGrowlInfo(ref growlInfo, InfoType.Info);
             ShowGlobal(growlInfo);
         }
 
@@ -583,13 +649,7 @@ namespace HandyControl.Controls
         /// <param name="growlInfo"></param>
         public static void Warning(GrowlInfo growlInfo)
         {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.WarningGeometry;
-                growlInfo.IconBrushKey = ResourceToken.WarningBrush;
-                growlInfo.Type = InfoType.Warning;
-            }
+            InitGrowlInfo(ref growlInfo, InfoType.Warning);
             Show(growlInfo);
         }
 
@@ -608,13 +668,7 @@ namespace HandyControl.Controls
         /// <param name="growlInfo"></param>
         public static void WarningGlobal(GrowlInfo growlInfo)
         {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.WarningGeometry;
-                growlInfo.IconBrushKey = ResourceToken.WarningBrush;
-                growlInfo.Type = InfoType.Warning;
-            }
+            InitGrowlInfo(ref growlInfo, InfoType.Warning);
             ShowGlobal(growlInfo);
         }
 
@@ -635,14 +689,7 @@ namespace HandyControl.Controls
         /// <param name="growlInfo"></param>
         public static void Error(GrowlInfo growlInfo)
         {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.ErrorGeometry;
-                growlInfo.IconBrushKey = ResourceToken.DangerBrush;
-                growlInfo.StaysOpen = true;
-                growlInfo.Type = InfoType.Error;
-            }
+            InitGrowlInfo(ref growlInfo, InfoType.Error);
             Show(growlInfo);
         }
 
@@ -661,14 +708,7 @@ namespace HandyControl.Controls
         /// <param name="growlInfo"></param>
         public static void ErrorGlobal(GrowlInfo growlInfo)
         {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.ErrorGeometry;
-                growlInfo.IconBrushKey = ResourceToken.DangerBrush;
-                growlInfo.StaysOpen = true;
-                growlInfo.Type = InfoType.Error;
-            }
+            InitGrowlInfo(ref growlInfo, InfoType.Error);
             ShowGlobal(growlInfo);
         }
 
@@ -689,16 +729,7 @@ namespace HandyControl.Controls
         /// <param name="growlInfo"></param>
         public static void Fatal(GrowlInfo growlInfo)
         {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.FatalGeometry;
-                growlInfo.IconBrushKey = ResourceToken.PrimaryTextBrush;
-                growlInfo.StaysOpen = true;
-                growlInfo.ShowCloseButton = false;
-                growlInfo.Type = InfoType.Fatal;
-                if (GrowlPanel.ContextMenu != null) GrowlPanel.ContextMenu.Opacity = 0;
-            }
+            InitGrowlInfo(ref growlInfo, InfoType.Fatal);
             Show(growlInfo);
         }
 
@@ -717,16 +748,7 @@ namespace HandyControl.Controls
         /// <param name="growlInfo"></param>
         public static void FatalGlobal(GrowlInfo growlInfo)
         {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.FatalGeometry;
-                growlInfo.IconBrushKey = ResourceToken.PrimaryTextBrush;
-                growlInfo.StaysOpen = true;
-                growlInfo.ShowCloseButton = false;
-                growlInfo.Type = InfoType.Fatal;
-                if (GrowlPanel.ContextMenu != null) GrowlPanel.ContextMenu.Opacity = 0;
-            }
+            InitGrowlInfo(ref growlInfo, InfoType.Fatal);
             ShowGlobal(growlInfo);
         }
 
@@ -749,15 +771,7 @@ namespace HandyControl.Controls
         /// <param name="growlInfo"></param>
         public static void Ask(GrowlInfo growlInfo)
         {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.AskGeometry;
-                growlInfo.IconBrushKey = ResourceToken.AccentBrush;
-                growlInfo.StaysOpen = true;
-                growlInfo.ShowCloseButton = false;
-                growlInfo.Type = InfoType.Ask;
-            }
+            InitGrowlInfo(ref growlInfo, InfoType.Ask);
             Show(growlInfo);
         }
 
@@ -778,15 +792,7 @@ namespace HandyControl.Controls
         /// <param name="growlInfo"></param>
         public static void AskGlobal(GrowlInfo growlInfo)
         {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.AskGeometry;
-                growlInfo.IconBrushKey = ResourceToken.AccentBrush;
-                growlInfo.StaysOpen = true;
-                growlInfo.ShowCloseButton = false;
-                growlInfo.Type = InfoType.Ask;
-            }
+            InitGrowlInfo(ref growlInfo, InfoType.Ask);
             ShowGlobal(growlInfo);
         }
 
@@ -795,8 +801,13 @@ namespace HandyControl.Controls
         /// <summary>
         ///     关闭
         /// </summary>
-        private void Close()
+        private void Close(bool invokeActionBeforeClose = false, bool invokeParam = true)
         {
+            if (invokeActionBeforeClose)
+            {
+                ActionBeforeClose?.Invoke(invokeParam);
+            }
+
             _timerClose?.Stop();
             var transform = new TranslateTransform();
             _gridMain.RenderTransform = transform;
@@ -862,20 +873,8 @@ namespace HandyControl.Controls
             GrowlWindow = null;
         }
 
-        private void ButtonCancel_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (ActionBeforeClose?.Invoke(false) == true)
-            {
-                Close();
-            }
-        }
+        private void ButtonCancel_OnClick(object sender, RoutedEventArgs e) => Close(true, false);
 
-        private void ButtonOk_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (ActionBeforeClose?.Invoke(true) == true)
-            {
-                Close();
-            }
-        }
+        private void ButtonOk_OnClick(object sender, RoutedEventArgs e) => Close(true);
     }
 }
\ No newline at end of file