Merge pull request #4 from HandyOrg/master

merge

Installers/VS2019/HandyControl_VS2019/License.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2019 HandyOrg
+Copyright (c) 2018-2020 HandyOrg
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Installers/VS2019/HandyControl_VS2019/Properties/AssemblyInfo.cs

@@ -6,7 +6,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HandyControl_VS2019")]
-[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2019")]
+[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]

Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="5949c79d-eb43-4033-8b7b-9349d34512c6" Version="2.3.0" Language="en-US" Publisher="HandyOrg" />
+        <Identity Id="5949c79d-eb43-4033-8b7b-9349d34512c6" Version="2.4.0" Language="en-US" Publisher="HandyOrg" />
         <DisplayName>HandyControl for VS2019</DisplayName>
         <Description xml:space="preserve">This VSIX Project will help people initialize a HandyControl project.</Description>
         <MoreInfo>https://handyorg.github.io/handycontrol</MoreInfo>

Installers/VS2019/WpfApp/ProjectTemplate.csproj

@@ -34,8 +34,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HandyControl, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HandyControl.2.3.0\lib\net47\HandyControl.dll</HintPath>
+    <Reference Include="HandyControl, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\HandyControl.2.4.0\lib\net47\HandyControl.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xaml">

Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs

@@ -6,9 +6,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HandyControl_VS2019_WpfApp")]
-[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2019")]
+[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("2.3.0")]
-[assembly: AssemblyFileVersion("2.3.0")]
+[assembly: AssemblyVersion("2.4.0")]
+[assembly: AssemblyFileVersion("2.4.0")]

Installers/VS2019/WpfApp/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HandyControl" version="2.3.0" targetFramework="net47" />
+  <package id="HandyControl" version="2.4.0" targetFramework="net47" />
 </packages>

Installers/VS2019/WpfCoreApp/ProjectTemplate.csproj

@@ -7,7 +7,7 @@
     <RootNamespace>$safeprojectname$</RootNamespace>
     <Version>1.0.0.0</Version>
     <Configurations>Debug;Release</Configurations>
-    <Copyright>Copyright © $username$ 2018-2019</Copyright>
+    <Copyright>Copyright © $username$ 2018-2020</Copyright>
     <FileVersion>1.0.0.0</FileVersion>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
     <LangVersion>latest</LangVersion>
@@ -19,6 +19,6 @@
     <DefineConstants>TRACE;Core</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="HandyControl" Version="2.3.0" />
+    <PackageReference Include="HandyControl" Version="2.4.0" />
   </ItemGroup>
 </Project>

Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs

@@ -6,9 +6,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HandyControl_VS2019_WpfCoreApp")]
-[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2019")]
+[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("2.3.0")]
-[assembly: AssemblyFileVersion("2.3.0")]
+[assembly: AssemblyVersion("2.4.0")]
+[assembly: AssemblyFileVersion("2.4.0")]

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2019 HandyOrg
+Copyright (c) 2018-2020 HandyOrg
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -98,6 +98,14 @@ Step 4：enjoy coding
 
 ## Latest examples
 
+### Screenshot
+
+![Screenshot](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Screenshot.png)
+
+### GooeyEffect
+
+![GooeyEffect](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/GooeyEffect.gif)
+
 ### GlowWindow
 
 ![GlowWindow](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/GlowWindow.png)
@@ -110,6 +118,8 @@ Step 4：enjoy coding
 
 ![PinBox](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/PinBox.png)
 
+## History publication
+
 ### Effects
 
 ![Effects](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Effects.png)
@@ -118,8 +128,6 @@ Step 4：enjoy coding
 
 ![RelativePanel](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/RelativePanel.png)
 
-## History publication
-
 ### Drawer
 
 ![Drawer](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Drawer.gif)

build/build.cake

@@ -47,16 +47,24 @@ Task("Build")
     var settingsCore30 = new DotNetCoreBuildSettings
     {
         Framework = "netcoreapp3.0",
-        Configuration = "Release",
+        Configuration = "Release-Core30",
         OutputDirectory = "lib/netcoreapp3.0"
     };
 
+    var settingsCore31 = new DotNetCoreBuildSettings
+    {
+        Framework = "netcoreapp3.1",
+        Configuration = "Release-Core31",
+        OutputDirectory = "lib/netcoreapp3.1"
+    };
+
     MSBuild("../src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj", settingsNet40);
     MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet45);
     MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet462);
     MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet47);
     MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet48);
-    DotNetCoreBuild("../src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj", settingsCore30);
+    DotNetCoreBuild("../src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj", settingsCore30);
+    DotNetCoreBuild("../src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj", settingsCore31);
 });
 
 RunTarget(target);

build/build.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>HandyControl</id>
-    <version>2.3.0</version>
+    <version>2.4.0</version>
     <title>HandyOrg</title>
     <authors>HandyOrg</authors>
     <owners>HandyOrg</owners>
@@ -11,7 +11,7 @@
     <iconUrl>https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/icon.png</iconUrl>
     <description>Contains some commonly used simple WPF controls</description>
     <releaseNotes>Changes are detailed at https://github.com/HandyOrg/HandyControl/releases</releaseNotes>
-    <copyright>Copyright © HandyOrg 2018-2019</copyright>
+    <copyright>Copyright © HandyOrg 2018-2020</copyright>
     <language></language>
     <tags>WPF C# Control</tags>
     <repository type="git" url="https://github.com/HandyOrg/HandyControl" commit="1af8ac90f497e6c65e4d596604f89f54e21cbcc6" />

doc/source/handycontrol/attach/panelElement/index.md

@@ -1,5 +1,19 @@
 ---
-title: 建设中
+title: PanelElement 面板元素
 ---
 
-建设中
+# 属性
+
+| 名称 | 用途 |
+|-|-|
+| FluidMoveBehavior | 设置面板的流体移动方式 |
+
+# 使用案例
+
+## FluidMoveBehavior 设置面板的流体移动方式
+
+```xml
+<hc:HoneycombPanel hc:PanelElement.FluidMoveBehavior="{StaticResource BehaviorXY200}"/>
+```
+
+当向面板容器中添加或移除元素时，就可以看到流体移动的动画效果。

doc/source/handycontrol/attach/rectangleAttach/index.md

@@ -0,0 +1,19 @@
+---
+title: RectangleAttach Rectangle专用
+---
+
+# 属性
+
+| 名称 | 用途 |
+|-|-|
+| CornerRadius | 设置Rectangle圆角值 |
+
+# 使用案例
+
+## CornerRadius 设置Rectangle圆角值
+
+```xml
+<Rectangle Fill="Red" Width="100" Height="60" hc:RectangleAttach.Circular="True"/>
+```
+
+![RectangleAttach.CornerRadius](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/attach/RectangleAttach.CornerRadius.png)

doc/source/handycontrol/attach/textBlockAttach/index.md

@@ -0,0 +1,21 @@
+---
+title: TextBlockAttach 文本块专用
+---
+
+# 属性
+
+| 名称 | 用途 |
+|-|-|
+| AutoTooltip | 设置是否自动显示工具提示 |
+
+# 使用案例
+
+## AutoTooltip 设置是否自动显示工具提示
+
+```xml
+<hc:SimplePanel Width="100" VerticalAlignment="Center" HorizontalAlignment="Center">
+    <TextBlock hc:TextBlockAttach.AutoTooltip="True" Text="EEEEEEEEEEEEEEEEEEEE"/>
+</hc:SimplePanel>
+```
+
+![TextBlockAttach.AutoTooltip](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/attach/TextBlockAttach.AutoTooltip.png)

doc/source/handycontrol/basic_xaml/converters/index.md

@@ -50,6 +50,14 @@ title: 转换器
 
 该转换器需要提供一个字符串作为参数，该字符串的一般形式为：`[0/1],[0/1],[0/1],[0/1]`，4个以逗号分隔的值分别对应`CornerRadius`的`Left`、`Top`，`Right`，`Bottom`属性，当值为1则返回对应属性的值，否则返回0。
 
+# Double2GridLengthConverter
+
+该转换器会将`double`值转换为`GridLength`。
+
+# DoubleMinConverter（内部使用）
+
+可以向该转换器提供一个字符串作为最小值（如果不提供，则最小值默认为0），当传入的值小于最小值时，返回最小值，否则返回传入的值。
+
 # Int2StrConverter
 
 该转换器需要提供一个字符串作为参数，该字符串的一般形式为：`[字符串0];[字符串1];...[字符串n]`，转换器会将一个整型的值作为索引，来获取指定位置的字符串并返回。

doc/source/handycontrol/basic_xaml/geometries/index.md

@@ -16,6 +16,7 @@ HandyControl中自带了一些几何形状定义，但要应用于生产中显
 | LeftGeometry | 左 |
 | RightGeometry | 右 |
 | RotateLeftGeometry | 向左旋转 |
+| RotateRightGeometry | 向左旋转 |
 | EnlargeGeometry | 放大 |
 | ReduceGeometry | 缩小 |
 | DownloadGeometry | 下载 |
@@ -28,6 +29,12 @@ HandyControl中自带了一些几何形状定义，但要应用于生产中显
 | WindowMinGeometry | 窗口最小化 |
 | WindowRestoreGeometry | 窗口还原 |
 | WindowMaxGeometry | 窗口最大化 |
+| CheckedGeometry | 选中 |
+| PageModeGeometry | 单页模式 |
+| TwoPageModeGeometry | 双页模式 |
+| ScrollModeGeometry | 滚动模式 |
+| EyeOpenGeometry | 睁眼 |
+| EyeCloseGeometry | 闭眼 |
 | AudioGeometry | 声音 |
 | BubbleTailGeometry | 气泡的尾巴 |
 | StarGeometry | 爱心 |

doc/source/handycontrol/basic_xaml/sizes/index.md

@@ -5,7 +5,7 @@ title: 尺寸
 | 名称 | 类型 | 值 | 描述 |
 |-|-|
 | DefaultControlHeight | System.Double | 30 | 默认控件高度 |
-| DefaultControlPadding | System.Windows.Thickness | 12,6 | 默认控件内边距 |
+| DefaultControlPadding | System.Windows.Thickness | 10,6 | 默认控件内边距 |
 | DefaultInputPadding | System.Windows.Thickness | 8,6 |默认输入控件内边距 |
 | DefaultCornerRadius | System.Windows.CornerRadius | 4 | 默认圆角 |
 

doc/source/handycontrol/extend_controls/buttonGroup/index.md

@@ -0,0 +1,77 @@
+---
+title: ButtonGroup 按钮组
+---
+
+# RadioGroupItemBaseStyle
+
+`ButtonGroup`控件中的子集`RadioButton`样式基类，不建议直接使用，常作为`ButtonGroup`中`Item`样式基类,同时与`ButtonGroup`控件配套使用
+
+案例：
+
+```xml
+<!--内部Item样式为ButtonGroup控件自动附加-默认为水平方向item样式-->
+<hc:ButtonGroup Margin="0,32,0,0">
+    <RadioButton Content="RadioButton" IsChecked="True"/>
+    <RadioButton Content="RadioButton"/>
+    <RadioButton IsEnabled="False" Content="RadioButton"/>
+    <RadioButton Content="RadioButton"/>
+</hc:ButtonGroup>
+<hc:ButtonGroup Margin="0,16,0,0" Style="{StaticResource ButtonGroupSolid}">
+    <RadioButton Content="RadioButton"/>
+    <RadioButton Content="RadioButton"/>
+    <RadioButton IsEnabled="False" Content="RadioButton"/>
+    <RadioButton Content="RadioButton" IsChecked="True"/>
+</hc:ButtonGroup>
+```
+
+效果：
+
+![RadioButton.RadioButtonItemDefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RadioButton.RadioButtonItemDefaultStyle.png)
+
+# RadioGroup关联样式
+
+| 样式Key                       | 用途                                 | 基类样式                |
+| ----------------------------- | ------------------------------------ | ----------------------- |
+| RadioGroupItemDefault         | RadioGroupItem默认样式               | RadioGroupItemBaseStyle |
+| RadioGroupItemHorizontalFirst | RadioGroupItem水平头样式（从左至右） | RadioGroupItemBaseStyle |
+| RadioGroupItemHorizontalLast  | RadioGroupItem水平尾样式（从左至右） | RadioGroupItemBaseStyle |
+| RadioGroupItemSingle          | RadioGroupItem单项样式               | RadioGroupItemBaseStyle |
+| RadioGroupItemVerticalFirst   | RadioGroupItem垂直头样式（从上至下） | RadioGroupItemBaseStyle |
+| RadioGroupItemVerticalLast    | RadioGroupItem垂直尾样式（从上至下） | RadioGroupItemBaseStyle |
+
+案例：
+
+单个`RadioButton`样式：
+
+```xml
+<RadioButton Style="{DynamicResource RadioGroupItemSingle}"
+                 Margin="0,16,8,0"
+                 Content="RadioGroupItemSingle"></RadioButton>
+```
+
+效果：
+
+![RadioButton.RadioButtonItemSingleStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RadioButton.RadioButtonItemSingleStyle.png)
+
+多个`RadioButton`垂直样式：
+
+```xml
+<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+    <hc:ButtonGroup Margin="0,16,8,0" Orientation="Vertical">
+        <RadioButton Content="RadioButton" IsChecked="True"/>
+        <RadioButton Content="RadioButton"/>
+        <RadioButton IsEnabled="False" Content="RadioButton"/>
+        <RadioButton Content="RadioButton"/>
+    </hc:ButtonGroup>
+    <hc:ButtonGroup Margin="8,16,0,0" Orientation="Vertical" Style="{StaticResource ButtonGroupSolid}">
+        <RadioButton Content="RadioButton"/>
+        <RadioButton Content="RadioButton"/>
+        <RadioButton IsEnabled="False" Content="RadioButton"/>
+        <RadioButton Content="RadioButton" IsChecked="True"/>
+    </hc:ButtonGroup>
+</StackPanel>
+```
+
+效果：
+
+![RadioButton.RadioButtonItemVerticalStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RadioButton.RadioButtonItemVerticalStyle.png)

doc/source/handycontrol/extend_controls/card/index.md

@@ -0,0 +1,3 @@
+---
+title: Card
+---

doc/source/handycontrol/extend_controls/divider/index.md

@@ -0,0 +1,3 @@
+---
+title: Divider
+---

doc/source/handycontrol/extend_controls/drawer/index.md

@@ -0,0 +1,3 @@
+---
+title: Drawer
+---

doc/source/handycontrol/extend_controls/floatingBlock/index.md

@@ -0,0 +1,3 @@
+---
+title: FloatingBlock
+---

doc/source/handycontrol/extend_controls/glowWindow/index.md

@@ -0,0 +1,3 @@
+---
+title: GlowWindow
+---

doc/source/handycontrol/extend_controls/grid/index.md

@@ -0,0 +1,3 @@
+---
+title: Grid
+---

doc/source/handycontrol/extend_controls/honeycombPanel/index.md

@@ -0,0 +1,3 @@
+---
+title: HoneycombPanel
+---

doc/source/handycontrol/extend_controls/imageBlock/index.md

@@ -0,0 +1,3 @@
+---
+title: ImageBlock
+---

doc/source/handycontrol/extend_controls/magnifier/index.md

@@ -0,0 +1,3 @@
+---
+title: Magnifier
+---

doc/source/handycontrol/extend_controls/notification/index.md

@@ -0,0 +1,3 @@
+---
+title: Notification
+---

doc/source/handycontrol/extend_controls/pinBox/index.md

@@ -0,0 +1,3 @@
+---
+title: PinBox
+---

doc/source/handycontrol/extend_controls/popTip/index.md

@@ -0,0 +1,3 @@
+---
+title: PopTip
+---

doc/source/handycontrol/extend_controls/rangeSlider/index.md

@@ -0,0 +1,3 @@
+---
+title: RangeSlider
+---

doc/source/handycontrol/extend_controls/relativePanel/index.md

@@ -0,0 +1,3 @@
+---
+title: RelativePanel
+---

doc/source/handycontrol/extend_controls/runningBlock/index.md

@@ -0,0 +1,3 @@
+---
+title: RunningBlock
+---

doc/source/handycontrol/extend_controls/sideMenu/index.md

@@ -0,0 +1,3 @@
+---
+title: SideMenu
+---

doc/source/handycontrol/extend_controls/splitButton/index.md

@@ -0,0 +1,3 @@
+---
+title: SplitButton
+---

doc/source/handycontrol/extend_controls/sprite/index.md

@@ -0,0 +1,3 @@
+---
+title: Sprite
+---

doc/source/handycontrol/index.md

@@ -2,7 +2,7 @@
 title: 欢迎使用HandyControl
 ---
 
-HandyControl是一套WPF控件库，它几乎重写了所有原生样式，同时包含60余款自定义控件（正逐步增加）。
+HandyControl是一套WPF控件库，它几乎重写了所有原生样式，同时包含70余款自定义控件（正逐步增加）。
 
 # 要求
 

doc/source/handycontrol/langs/index.md

@@ -21,9 +21,15 @@ title: 国际化
 
 # 扩展
 
-控件库自带的语言包包括简体中文（zh-cn）、英文（en）、波斯语（fa）、法语（fr），默认为简体中文（zh-cn）：
+控件库自带的语言包包括：
 
-![Langs](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/langs/Langs.png)
+* 简体中文（zh-cn）
+* 英文（en）
+* 波斯语（fa）
+* 法语（fr）
+* 韩文 （ko-kr）
+
+默认为简体中文（zh-cn）。
 
 如果需要可自行扩展，这里推荐使用开源插件：[ResXManager](https://marketplace.visualstudio.com/items?itemName=TomEnglert.ResXManager)，来维护所有的语言包。
 

doc/source/handycontrol/native_controls/flowDocument/index.md

@@ -1,10 +1,15 @@
-<UserControl x:Class="HandyControlDemo.UserControl.FlowDocumentScrollViewerDemoCtl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:hc="https://handyorg.github.io/handycontrol"
-             Background="{DynamicResource RegionBrush}">
-    <hc:TransitioningContentControl>
-        <FlowDocumentScrollViewer IsToolBarVisible="True" Width="502" Height="400" Margin="32">
+---
+title: FlowDocument 流文档
+---
+
+# FlowDocumentScrollViewerBaseStyle
+
+流文档滚动视图默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+案例：
+
+``` xml
+<FlowDocumentScrollViewer IsToolBarVisible="True" Width="502" Height="400" Margin="32">
             <FlowDocument ColumnWidth="400" IsOptimalParagraphEnabled="True" IsHyphenationEnabled="True">
                 <Section FontSize="12">
                     <Paragraph>
@@ -97,5 +102,16 @@
                 </Section>
             </FlowDocument>
         </FlowDocumentScrollViewer>
-    </hc:TransitioningContentControl>
-</UserControl>
+```
+
+效果：
+
+![FlowDocumentScrollViewer](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/FlowDocumentScrollViewer.png)
+
+# FlowDocumentPageViewerBaseStyle
+
+流文档单页视图默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+# FlowDocumentReaderBaseStyle
+
+流文档查看器默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。

doc/source/handycontrol/native_controls/frame/index.md

@@ -0,0 +1,17 @@
+---
+title: Frame 导航框架
+---
+
+# FrameBaseStyle
+
+导航框架默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+案例：
+
+``` xml
+<Frame Margin="32" Width="500" Height="360" Name="FrameDemo" NavigationUIVisibility="Visible"/>
+```
+
+效果：
+
+![FrameBaseStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/FrameBaseStyle.png)

doc/source/handycontrol/native_controls/radioButton/index.md

@@ -21,7 +21,7 @@ title: RadioButton 单选按钮
 
 ![RadioButton.DefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RadioButton.DefaultStyle.png)
 
-# RadioButtonIcon:RadioButtonBaseStyle
+# RadioButtonIcon : RadioButtonBaseStyle
 
 带图标样式，可只显示图标也可图文显示
 
@@ -38,78 +38,4 @@ title: RadioButton 单选按钮
 
 效果：
 
-![RadioButton.IconStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RadioButton.IconStyle.png)
-
-# RadioGroupItemBaseStyle
-
-`ButtonGroup`控件中的子集`RadioButton`样式基类，不建议直接使用，常作为`ButtonGroup`中`Item`样式基类,同时与`ButtonGroup`控件配套使用
-
-案例：
-
-```xml
-<!--内部Item样式为ButtonGroup控件自动附加-默认为水平方向item样式-->
-<hc:ButtonGroup Margin="0,32,0,0">
-    <RadioButton Content="RadioButton" IsChecked="True"/>
-    <RadioButton Content="RadioButton"/>
-    <RadioButton IsEnabled="False" Content="RadioButton"/>
-    <RadioButton Content="RadioButton"/>
-</hc:ButtonGroup>
-<hc:ButtonGroup Margin="0,16,0,0" Style="{StaticResource ButtonGroupSolid}">
-    <RadioButton Content="RadioButton"/>
-    <RadioButton Content="RadioButton"/>
-    <RadioButton IsEnabled="False" Content="RadioButton"/>
-    <RadioButton Content="RadioButton" IsChecked="True"/>
-</hc:ButtonGroup>
-```
-
-效果：
-
-![RadioButton.RadioButtonItemDefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RadioButton.RadioButtonItemDefaultStyle.png)
-
-# RadioGroup关联样式
-
-| 样式Key                       | 用途                                 | 基类样式                |
-| ----------------------------- | ------------------------------------ | ----------------------- |
-| RadioGroupItemDefault         | RadioGroupItem默认样式               | RadioGroupItemBaseStyle |
-| RadioGroupItemHorizontalFirst | RadioGroupItem水平头样式（从左至右） | RadioGroupItemBaseStyle |
-| RadioGroupItemHorizontalLast  | RadioGroupItem水平尾样式（从左至右） | RadioGroupItemBaseStyle |
-| RadioGroupItemSingle          | RadioGroupItem单项样式               | RadioGroupItemBaseStyle |
-| RadioGroupItemVerticalFirst   | RadioGroupItem垂直头样式（从上至下） | RadioGroupItemBaseStyle |
-| RadioGroupItemVerticalLast    | RadioGroupItem垂直尾样式（从上至下） | RadioGroupItemBaseStyle |
-
-案例：
-
-单个`RadioButton`样式：
-
-```xml
-<RadioButton Style="{DynamicResource RadioGroupItemSingle}"
-                 Margin="0,16,8,0"
-                 Content="RadioGroupItemSingle"></RadioButton>
-```
-
-效果：
-
-![RadioButton.RadioButtonItemSingleStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RadioButton.RadioButtonItemSingleStyle.png)
-
-多个`RadioButton`垂直样式：
-
-```xml
-<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-    <hc:ButtonGroup Margin="0,16,8,0" Orientation="Vertical">
-        <RadioButton Content="RadioButton" IsChecked="True"/>
-        <RadioButton Content="RadioButton"/>
-        <RadioButton IsEnabled="False" Content="RadioButton"/>
-        <RadioButton Content="RadioButton"/>
-    </hc:ButtonGroup>
-    <hc:ButtonGroup Margin="8,16,0,0" Orientation="Vertical" Style="{StaticResource ButtonGroupSolid}">
-        <RadioButton Content="RadioButton"/>
-        <RadioButton Content="RadioButton"/>
-        <RadioButton IsEnabled="False" Content="RadioButton"/>
-        <RadioButton Content="RadioButton" IsChecked="True"/>
-    </hc:ButtonGroup>
-</StackPanel>
-```
-
-效果：
-
-![RadioButton.RadioButtonItemVerticalStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RadioButton.RadioButtonItemVerticalStyle.png)
+![RadioButton.IconStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RadioButton.IconStyle.png)

doc/source/handycontrol/native_controls/richTextBox/index.md

@@ -1,5 +1,21 @@
 ---
-title: 建设中
+title: RichTextBox 富文本框
 ---
 
-建设中
+# TextBoxBaseBaseStyle
+
+基础文本控件默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+# RichTextBoxBaseStyle : TextBoxBaseBaseStyle
+
+富文本框默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+案例：
+
+```xml
+<RichTextBox Margin="10,10" VerticalAlignment="Center" HorizontalAlignment="Center"></RichTextBox>
+```
+
+效果：
+
+![RichTextbox.DefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RichTextbox.DefaultStyle.png)

doc/source/handycontrol/native_controls/scrollViewer/index.md

@@ -1,5 +1,42 @@
 ---
-title: 建设中
+title: ScrollViewer 滚动视图
 ---
 
-建设中
+# ScrollViewerNativeBaseStyle
+
+原生滚动视图默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+案例：
+
+```xml
+<ScrollViewer>
+   <Grid Height="500">
+      <TextBlock Text="内容区域"></TextBlock>
+   </Grid>
+</ScrollViewer>
+```
+
+效果：
+
+![ScrollViewer.DefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ScrollViewer.DefaultStyle.png)
+
+# ScrollViewerUpDown
+
+显示上下按钮的滚动视图样式
+
+案例：
+
+```xml
+<ScrollViewer Style="{StaticResource ScrollViewerUpDown}">
+    <StackPanel Height="500">
+        <TextBlock Text="内容区域" Height="250"></TextBlock>
+        <TextBlock Text="内容区域" Height="250"></TextBlock>
+        <TextBlock Text="内容区域"></TextBlock>
+        <TextBlock Text="内容区域"></TextBlock>
+    </StackPanel>
+</ScrollViewer>
+```
+
+效果：
+
+![ScrollViewer.UpDownStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ScrollViewer.UpDownStyle.png)

doc/source/handycontrol/native_controls/seperator/index.md

@@ -0,0 +1,7 @@
+---
+title: Seperator 分隔符
+---
+
+# SeparatorBaseStyle
+
+分隔符默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。

doc/source/handycontrol/native_controls/slider/index.md

@@ -1,5 +1,17 @@
 ---
-title: 建设中
+title: Slider 滑块
 ---
 
-建设中
+# SliderBaseStyle
+
+滑块默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+案例：
+
+```xml
+<Slider VerticalAlignment="Center" Width="400" Value="40" Maximum="100"/>
+```
+
+效果：
+
+![Slider.DefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/Slider.DefaultStyle.png)

doc/source/handycontrol/native_controls/statusBar/index.md

@@ -0,0 +1,7 @@
+---
+title: StatusBar 状态栏
+---
+
+# StatusBarBaseStyle
+
+状态栏默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。

doc/source/handycontrol/native_controls/tabControl/index.md

@@ -1,5 +1,93 @@
 ---
-title: 建设中
+title: TabControl 选项卡控件
 ---
 
-建设中
+# TabControlBaseStyle
+
+选项卡控件默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+案例：
+
+ ```xml
+<TabControl Margin="10">
+    <TabItem Header="选项卡1">
+    </TabItem>
+    <TabItem Header="选项卡2">
+    </TabItem>
+    <TabItem Header="选项卡3">
+    </TabItem>
+</TabControl>
+ ```
+
+效果：
+
+![TabControl.DefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TabControl.DefaultStyle.png)
+
+# TabControlInLine : TabControlBaseStyle
+
+单行填充选项卡样式
+
+案例：
+
+```xml
+<TabControl Margin="10" Style="{StaticResource TabControlInLine}">
+    <TabItem Header="选项卡1">
+    </TabItem>
+    <TabItem Header="选项卡2">
+    </TabItem>
+    <TabItem Header="选项卡3">
+    </TabItem>
+</TabControl>
+```
+
+效果：
+
+![TabControl.InLineStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TabControl.InLineStyle.png)
+
+# TabControlCapsule
+
+胶囊状选项卡样式
+
+案例：
+
+```xml
+<TabControl Margin="10" Style="{StaticResource TabControlCapsule}">
+    <TabItem Header="选项卡1">
+    </TabItem>
+    <TabItem Header="选项卡2">
+    </TabItem>
+    <TabItem Header="选项卡3">
+    </TabItem>
+</TabControl>
+```
+
+效果：
+
+![TabControl.CapsuleStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TabControl.CapsuleStyle.png)
+
+# TabControlCapsuleSolid : TabControlCapsule
+
+胶囊状（实心）选项卡样式
+
+案例：
+
+```xml
+<TabControl Margin="10" Style="{StaticResource TabControlCapsuleSolid}">
+    <TabItem Header="选项卡1">
+    </TabItem>
+    <TabItem Header="选项卡2">
+    </TabItem>
+    <TabItem Header="选项卡3">
+    </TabItem>
+</TabControl>
+```
+
+效果：
+
+![TabControl.CapsuleSolidStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TabControl.CapsuleSolidStyle.png)
+
+# 温馨提示
+
+可以使用属性`TabStripPlacement`设定头部标题的位置，效果如下：
+
+![TabControl.TabStripPlacement](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TabControl.TabStripPlacement.png)

doc/source/handycontrol/native_controls/textBlock/index.md

@@ -1,5 +1,37 @@
 ---
-title: 建设中
+title: TextBlock 文本块
 ---
 
-建设中
+# TextBlockBaseStyle
+
+文本块默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+# TextBlockBoldBaseStyle
+
+文本块粗体默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+# 案例
+
+```xml
+<StackPanel>
+    <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockLargeBold" Style="{StaticResource TextBlockLargeBold}"/>
+    <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockLarge" Style="{StaticResource TextBlockLarge}"/>
+    <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockHeaderBold" Style="{StaticResource TextBlockTitleBold}"/>
+    <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockHeader" Style="{StaticResource TextBlockTitle}"/>
+    <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockSubHeaderBold" Style="{StaticResource TextBlockSubTitleBold}"/>
+    <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockSubHeader" Style="{StaticResource TextBlockSubTitle}"/>
+
+    <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultBold" Style="{StaticResource TextBlockDefaultBold}"/>
+    <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefault" Style="{StaticResource TextBlockDefault}"/>
+    <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultAccent" Style="{StaticResource TextBlockDefaultAccent}"/>
+    <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultSecLight" Style="{StaticResource TextBlockDefaultSecLight}"/>
+    <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultThiLight" Style="{StaticResource TextBlockDefaultThiLight}"/>
+    <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultPrimary" Style="{StaticResource TextBlockDefaultPrimary}"/>
+    <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultDanger" Style="{StaticResource TextBlockDefaultDanger}"/>
+    <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultWarning" Style="{StaticResource TextBlockDefaultWarning}"/>
+    <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultInfo" Style="{StaticResource TextBlockDefaultInfo}"/>
+    <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultSuccess" Style="{StaticResource TextBlockDefaultSuccess}"/>
+</StackPanel>
+```
+
+![TextBlockStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/TextBlock.jpg)

doc/source/handycontrol/native_controls/textBox/index.md

@@ -1,5 +1,40 @@
 ---
-title: 建设中
+title: TextBox 文本框
 ---
 
-建设中
+# TextBoxBaseStyle
+
+原生文本框默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+- 默认样式
+`<TextBox Width="200" VerticalAlignment="Center"/>`
+![TextBoxBaseStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TextBoxBaseStyle.png)
+
+# TextBoxExtendBaseStyle : TextBoxBaseStyle
+
+原生文本框扩展默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+# TextBoxExtend : TextBoxExtendBaseStyle
+
+相对于原生文本框默认样式，它借助于附加属性可以实现标题、水印的功能。
+
+- 标题在上
+`<TextBox Style="{StaticResource TextBoxExtend}" hc:InfoElement.Title="这是标题" Width="200" VerticalAlignment="Center"/>`
+![TextBoxExtend_1](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TextBoxExtend_1.png)
+
+- 标题在左
+`<TextBox Style="{StaticResource TextBoxExtend}" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="这是标题" Width="300" VerticalAlignment="Center"/>`
+![TextBoxExtend_2](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TextBoxExtend_2.png)
+
+{% note warning %}
+标题在左时，为了多个输入框左侧对齐，需要设置标题宽度，标题宽度无需逐个设置，可在外部容器上统一设置。
+{% endnote %}
+
+- 标题在上，带有水印
+[参见Combobox](https://handyorg.github.io/handycontrol/native_controls/comboBox/)
+
+- 标题在上，带有水印，且为必填
+[参见Combobox](https://handyorg.github.io/handycontrol/native_controls/comboBox/)
+
+- 标题在上，带有水印，且为必填，同时自定义必填提示符
+[参见Combobox](https://handyorg.github.io/handycontrol/native_controls/comboBox/)

doc/source/handycontrol/native_controls/toggleButton/index.md

@@ -1,5 +1,177 @@
 ---
-title: 建设中
+title: ToggleButton 切换按钮
 ---
 
-建设中
+# ToggleButtonBaseStyle : ButtonBaseBaseStyle
+
+切换按钮默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+{% note info %}
+所有继承此样式的按钮都可以使用`IconElement`中定义的附加属性来控制按钮中几何图形的属性。
+{% endnote %}
+
+{% note info %}
+所有继承此样式的按钮都可以使用`BorderElement.CornerRadius`附加属性来控制按钮的圆角大小。
+{% endnote %}
+
+## 相关样式
+
+| 名称 | 继承自 | 用途描述 |
+| - | - | - |
+| ToggleButtonPrimary     | ToggleButtonBaseStyle   | 主要       |
+| ToggleButtonSuccess     | ToggleButtonBaseStyle   | 成功       |
+| ToggleButtonInfo     | ToggleButtonBaseStyle   | 信息       |
+| ToggleButtonWarning     | ToggleButtonBaseStyle   | 警告       |
+| ToggleButtonDanger     | ToggleButtonBaseStyle   | 危险       |
+
+案例：
+
+```xml
+<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"> 
+    <ToggleButton MinWidth="100" Content="Default"/>
+    <ToggleButton MinWidth="100" Content="Primary" Margin="0,6,0,0" Style="{StaticResource ToggleButtonPrimary}"/>
+    <ToggleButton MinWidth="100" Content="Success" Margin="0,6,0,0" Style="{StaticResource ToggleButtonSuccess}"/>
+    <ToggleButton MinWidth="100" Content="Info" Margin="0,6,0,0" Style="{StaticResource ToggleButtonInfo}"/>
+    <ToggleButton MinWidth="100" Content="Warning" Margin="0,6,0,0" Style="{StaticResource ToggleButtonWarning}"/>
+    <ToggleButton MinWidth="100" Content="Danger" Margin="0,6,0,0" Style="{StaticResource ToggleButtonDanger}"/>
+</StackPanel>
+```
+
+效果：
+
+![ToggleButtonBaseStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ToggleButtonBaseStyle.png)
+
+# ToggleButtonIconBaseStyle : BaseStyle
+
+只显示图标的切换按钮，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+{% note info %}
+所有继承此样式的按钮都可以使用`IconElement`中定义的附加属性来控制按钮中几何图形的属性。
+{% endnote %}
+
+{% note info %}
+所有继承此样式的按钮都可以使用`BorderElement.CornerRadius`附加属性来控制按钮的圆角大小。
+{% endnote %}
+
+## 相关样式
+
+| 名称 | 继承自 | 用途描述 |
+| - | - | - |
+| ToggleButtonIcon     | ToggleButtonIconBaseStyle   | 默认       |
+| ToggleButtonIconPrimary     | ToggleButtonIconBaseStyle   | 主要       |
+| ToggleButtonIconSuccess     | ToggleButtonIconBaseStyle   | 成功       |
+| ToggleButtonIconInfo     | ToggleButtonIconBaseStyle   | 信息       |
+| ToggleButtonIconWarning     | ToggleButtonIconBaseStyle   | 警告       |
+| ToggleButtonIconDanger     | ToggleButtonIconBaseStyle   | 危险       |
+| ToggleButtonIconTransparent     | ToggleButtonIconBaseStyle   | 透明       |
+
+案例：
+
+```xml
+<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+    <ToggleButton Padding="6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource ToggleButtonIcon}"/>
+    <ToggleButton Margin="6,0,0,0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource ToggleButtonIconPrimary}"/>
+    <ToggleButton Margin="6,0,0,0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource ToggleButtonIconSuccess}"/>
+    <ToggleButton Margin="6,0,0,0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource ToggleButtonIconInfo}"/>
+    <ToggleButton Margin="6,0,0,0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource ToggleButtonIconWarning}"/>
+    <ToggleButton Margin="6,0,0,0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource ToggleButtonIconDanger}"/>
+    <ToggleButton Margin="6,0,0,0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource ToggleButtonIconTransparent}"/>
+</StackPanel>
+```
+
+效果：
+
+![ToggleButtonIconBaseStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ToggleButtonIconBaseStyle.png)
+
+# ToggleButtonSwitchBaseStyle : BaseStyle
+
+开关式切换按钮，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+## 相关样式
+
+| 名称 | 继承自 |
+| - | - |
+| ToggleButtonSwitch     | ToggleButtonSwitchBaseStyle   |
+
+案例：
+
+```xml
+<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
+    <ToggleButton Style="{StaticResource ToggleButtonSwitch}"/>
+    <ToggleButton Margin="0,6,0,0" IsChecked="True" Style="{StaticResource ToggleButtonSwitch}"/>
+</StackPanel>
+```
+
+效果：
+
+![ToggleButtonSwitchBaseStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ToggleButtonSwitchBaseStyle.png)
+
+# ToggleButtonFlip : BaseStyle
+
+翻转式切换按钮。
+
+案例：
+
+```xml
+<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
+    <ToggleButton BorderThickness="0" IsChecked="True" Style="{StaticResource ToggleButtonFlip}">
+        <hc:StatusSwitchElement.CheckedElement>
+            <Border Background="{DynamicResource PrimaryBrush}">
+                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="关" Foreground="{DynamicResource TextIconBrush}"/>
+            </Border>
+        </hc:StatusSwitchElement.CheckedElement>
+        <Border Background="{DynamicResource DangerBrush}">
+            <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="开" Foreground="{DynamicResource TextIconBrush}"/>
+        </Border>
+    </ToggleButton>
+    <ToggleButton Margin="0,6,0,0" BorderThickness="0" IsChecked="False" Style="{StaticResource ToggleButtonFlip}">
+        <hc:StatusSwitchElement.CheckedElement>
+            <Border Background="{DynamicResource PrimaryBrush}">
+                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="关" Foreground="{DynamicResource TextIconBrush}"/>
+            </Border>
+        </hc:StatusSwitchElement.CheckedElement>
+        <Border Background="{DynamicResource DangerBrush}">
+            <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="开" Foreground="{DynamicResource TextIconBrush}"/>
+        </Border>
+    </ToggleButton>
+</StackPanel>
+```
+
+效果：
+
+![ToggleButtonFlip](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ToggleButtonFlip.png)
+
+# ToggleButtonCustom : BaseStyle
+
+如果想完全自定义按钮的内容，则推荐使用此样式。`ToggleButtonCustom`中的内容完全由你自己决定。
+
+案例：
+
+```xml
+<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
+    <ToggleButton IsChecked="True" Style="{StaticResource ToggleButtonCustom}" hc:StatusSwitchElement.HideUncheckedElement="True">
+        <hc:StatusSwitchElement.CheckedElement>
+            <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
+                <Ellipse Width="20" Height="20" Fill="{DynamicResource PrimaryBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
+            </Border>
+        </hc:StatusSwitchElement.CheckedElement>
+        <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
+            <Ellipse Width="20" Height="20" Fill="{DynamicResource BorderBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
+        </Border>
+    </ToggleButton>
+    <ToggleButton Margin="0,6,0,0" IsChecked="False" Style="{StaticResource ToggleButtonCustom}" hc:StatusSwitchElement.HideUncheckedElement="True">
+        <hc:StatusSwitchElement.CheckedElement>
+            <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
+                <Ellipse Width="20" Height="20" Fill="{DynamicResource PrimaryBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
+            </Border>
+        </hc:StatusSwitchElement.CheckedElement>
+        <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
+            <Ellipse Width="20" Height="20" Fill="{DynamicResource BorderBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
+        </Border>
+    </ToggleButton>
+</StackPanel>
+```
+
+效果：
+
+![ToggleButtonCustom](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ToggleButtonCustom.png)

doc/source/handycontrol/native_controls/toolBar/index.md

@@ -1,5 +1,21 @@
 ---
-title: 建设中
+title: ToolBar 工具条
 ---
 
-建设中
+# ToolBarBaseStyle
+
+工具条默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+案例：
+
+```xml
+<ToolBar Padding="10,6" Header="Demo" VerticalAlignment="Center" HorizontalAlignment="Center">
+    <Button Content="Demo" Margin="10,0,0,0"/>
+    <ToggleButton Content="Demo" Margin="10,0,0,0"/>
+    <CheckBox Content="Demo" Margin="10,0,0,0"/>
+</ToolBar>
+```
+
+效果：
+
+![ToolBarBaseStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ToolBarBaseStyle.png)

doc/source/handycontrol/native_controls/toolTip/index.md

@@ -1,5 +1,7 @@
 ---
-title: 建设中
+title: ToolTip 工具提示
 ---
 
-建设中
+# ToolTipBaseStyle
+
+工具提示默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。

doc/source/handycontrol/native_controls/treeView/index.md

@@ -1,5 +1,35 @@
 ---
-title: 建设中
+title: TreeView 树视图
 ---
 
-建设中
+# TreeViewBaseStyle : BaseStyle
+
+树视图默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+案例：
+
+ ```xml
+<TreeView Width="200" VerticalAlignment="Center">
+    <TreeViewItem Header="111">
+        <TreeViewItem Header="111"/>
+        <TreeViewItem Header="222"/>
+        <TreeViewItem Header="333"/>
+    </TreeViewItem>
+    <TreeViewItem Header="222">
+        <TreeViewItem Header="111"/>
+        <TreeViewItem Header="222"/>
+        <TreeViewItem Header="333"/>
+    </TreeViewItem>
+</TreeView>
+ ```
+
+效果：
+
+![TreeViewBaseStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TreeViewBaseStyle.png)
+
+# 相关样式
+
+| 名称 | 继承自 | 用途描述 |
+| - | - | - |
+| TreeViewItemBaseStyle     | BaseStyle   | 树视图项默认样式       |
+| ExpandCollapseToggleStyle     |    | 树视图折叠按钮样式       |

doc/source/handycontrol/native_controls/window/index.md

@@ -1,5 +1,13 @@
 ---
-title: 建设中
+title: Window 窗口
 ---
 
-建设中
+`wpf`中窗口不会自动应用隐式样式，`hc`中提供了相关方法用以解决这个问题。
+
+# Window 窗口
+
+可通过 `ConfigHelper.Instance.SetWindowDefaultStyle()` 来设置窗口的默认样式。
+
+# NavigationWindow 导航窗口
+
+可通过 `ConfigHelper.Instance.SetNavigationWindowDefaultStyle()` 来设置导航窗口的默认样式。

doc/source/handycontrol/tnx/index.md

@@ -4,7 +4,7 @@ title: 鸣谢
 
 # 感谢以下Coder提供代码贡献
 
-<p><a style="border:0" href="https://github.com/ghost1372" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars0.githubusercontent.com/u/9213496?s=400&amp;v=4" alt="ghost1372"></a><a style="border:0" href="https://github.com/DingpingZhang" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars0.githubusercontent.com/u/8541016?s=400&v=4" alt="Dingping Zhang"></a><a style="border:0" href="https://github.com/M0n7y5" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars0.githubusercontent.com/u/17201053?s=400&v=4" alt="M0n7y5"></a><a style="border:0" href="https://github.com/guanguanchuangyu" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars1.githubusercontent.com/u/25916858?s=400&v=4" alt="guanguanchuangyu"></a><a style="border:0" href="https://github.com/yanchao891012" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars0.githubusercontent.com/u/16846702?s=400&v=4" alt="yanchao891012"></a><a style="border:0" href="https://github.com/noctwolf" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars3.githubusercontent.com/u/21022467?s=400&v=4" alt="noctwolf"></a><a style="border:0" href="https://github.com/xianyun666" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars1.githubusercontent.com/u/22339210?s=400&v=4" alt="xianyun666"></a><a style="border:0" href="https://github.com/afunc233" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars1.githubusercontent.com/u/19919631?s=400&v=4" alt="afunc233"></a><a style="border:0" href="https://github.com/DinoChan" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars1.githubusercontent.com/u/6076257?s=400&v=4" alt="DinoChan"></a></p>
+<p><a style="border:0" href="https://github.com/ghost1372" target="_blank" rel="noopener"><img width="64" height="64" src="https://avatars0.githubusercontent.com/u/9213496?s=400&amp;v=4" alt="ghost1372"></a><a style="border:0" href="https://github.com/DingpingZhang" target="_blank" rel="noopener"><img width="64" height="64" src="https://avatars0.githubusercontent.com/u/8541016?s=400&v=4" alt="Dingping Zhang"></a><a style="border:0" href="https://github.com/M0n7y5" target="_blank" rel="noopener"><img width="64" height="64" src="https://avatars0.githubusercontent.com/u/17201053?s=400&v=4" alt="M0n7y5"></a><a style="border:0" href="https://github.com/guanguanchuangyu" target="_blank" rel="noopener"><img width="64" height="64" src="https://avatars1.githubusercontent.com/u/25916858?s=400&v=4" alt="guanguanchuangyu"></a><a style="border:0" href="https://github.com/yanchao891012" target="_blank" rel="noopener"><img width="64" height="64" src="https://avatars0.githubusercontent.com/u/16846702?s=400&v=4" alt="yanchao891012"></a><a style="border:0" href="https://github.com/noctwolf" target="_blank" rel="noopener"><img width="64" height="64" src="https://avatars3.githubusercontent.com/u/21022467?s=400&v=4" alt="noctwolf"></a><a style="border:0" href="https://github.com/xianyun666" target="_blank" rel="noopener"><img width="64" height="64" src="https://avatars1.githubusercontent.com/u/22339210?s=400&v=4" alt="xianyun666"></a><a style="border:0" href="https://github.com/afunc233" target="_blank" rel="noopener"><img width="64" height="64" src="https://avatars1.githubusercontent.com/u/19919631?s=400&v=4" alt="afunc233"></a><a style="border:0" href="https://github.com/DinoChan" target="_blank" rel="noopener"><img width="64" height="64" src="https://avatars1.githubusercontent.com/u/6076257?s=400&v=4" alt="DinoChan"></a><a style="border:0" href="https://github.com/MrZhangYuan" target="_blank" rel="noopener"><img width="64" height="64" src="https://avatars2.githubusercontent.com/u/16384123?s=400&v=4" alt="MrZhangYuan"></a></p>
 
 # 感谢以下组织机构提供开源许可
 
@@ -12,4 +12,4 @@ title: 鸣谢
 
 # 感谢以下捐赠者
 
-<p><a style="border:0" href="https://github.com/bigorange1900" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars1.githubusercontent.com/u/49062011?s=400&v=4" alt="bigorange1900"></a><a style="border:0" href="https://github.com/14632791" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars3.githubusercontent.com/u/27358331?s=400&v=4" alt="14632791"></a><a style="border:0" href="https://github.com/IUpdatable" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars2.githubusercontent.com/u/51181716?s=400&v=4" alt="IUpdatable"></a><a style="border:0" href="https://github.com/maplewei" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars1.githubusercontent.com/u/13778095?s=400&v=4" alt="maplewei"></a><a style="border:0" href="https://github.com/sunshang-hl" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars1.githubusercontent.com/u/34593206?s=400&v=4" alt="sunshang-hl"></a><a style="border:0" href="https://github.com/yangkang326" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars1.githubusercontent.com/u/51224259?s=400&v=4" alt="yangkang326"></a><a style="border:0" href="https://github.com/zmrbak" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars3.githubusercontent.com/u/7257543?s=400&v=4" alt="zmrbak"></a><a style="border:0" href="https://github.com/AFei19911012" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars0.githubusercontent.com/u/31465314?s=400&v=4" alt="AFei19911012"></a><a style="border:0" href="https://github.com/wayne2006" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars0.githubusercontent.com/u/21210915?s=400&v=4" alt="wayne2006"></a><a style="border:0" href="https://github.com/towerDLH" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars1.githubusercontent.com/u/53053537?s=400&v=4" alt="towerDLH"></a><a style="border:0" href="https://github.com/BluceBosen" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars3.githubusercontent.com/u/24750822?s=400&v=4" alt="BluceBosen"></a><a style="border:0" href="https://github.com/MrZhangYuan" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars2.githubusercontent.com/u/16384123?s=400&v=4" alt="MrZhangYuan"></a><a style="border:0" href="https://github.com/YC946586" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars2.githubusercontent.com/u/49895722?s=400&v=4" alt="YC946586"></a></p>
+<p><a style="border:0" href="https://github.com/bigorange1900" target="_blank" rel="noopener"><img width="64" height="64" src="https://avatars1.githubusercontent.com/u/49062011?s=400&v=4" alt="bigorange1900"></a><a style="border:0" href="https://github.com/14632791" target="_blank" rel="noopener"><img width="64" height="64" src="https://avatars3.githubusercontent.com/u/27358331?s=400&v=4" alt="14632791"></a><a style="border:0" href="https://github.com/IUpdatable" target="_blank" rel="noopener"><img width="64" height="64" src="https://avatars2.githubusercontent.com/u/51181716?s=400&v=4" alt="IUpdatable"></a><a style="border:0" href="https://github.com/maplewei" target="_blank" rel="noopener"><img width="64" height="64" src="https://avatars1.githubusercontent.com/u/13778095?s=400&v=4" alt="maplewei"></a><a style="border:0" href="https://github.com/sunshang-hl" target="_blank" rel="noopener"><img width="64" height="64" src="https://avatars1.githubusercontent.com/u/34593206?s=400&v=4" alt="sunshang-hl"></a><a style="border:0" href="https://github.com/yangkang326" target="_blank" rel="noopener"><img width="64" height="64" src="https://avatars1.githubusercontent.com/u/51224259?s=400&v=4" alt="yangkang326"></a><a style="border:0" href="https://github.com/zmrbak" target="_blank" rel="noopener"><img width="64" height="64" src="https://avatars3.githubusercontent.com/u/7257543?s=400&v=4" alt="zmrbak"></a><a style="border:0" href="https://github.com/AFei19911012" target="_blank" rel="noopener"><img width="64" height="64" src="https://avatars0.githubusercontent.com/u/31465314?s=400&v=4" alt="AFei19911012"></a><a style="border:0" href="https://github.com/wayne2006" target="_blank" rel="noopener"><img width="64" height="64" src="https://avatars0.githubusercontent.com/u/21210915?s=400&v=4" alt="wayne2006"></a><a style="border:0" href="https://github.com/towerDLH" target="_blank" rel="noopener"><img width="64" height="64" src="https://avatars1.githubusercontent.com/u/53053537?s=400&v=4" alt="towerDLH"></a><a style="border:0" href="https://github.com/BluceBosen" target="_blank" rel="noopener"><img width="64" height="64" src="https://avatars3.githubusercontent.com/u/24750822?s=400&v=4" alt="BluceBosen"></a><a style="border:0" href="https://github.com/MrZhangYuan" target="_blank" rel="noopener"><img width="64" height="64" src="https://avatars2.githubusercontent.com/u/16384123?s=400&v=4" alt="MrZhangYuan"></a><a style="border:0" href="https://github.com/YC946586" target="_blank" rel="noopener"><img width="64" height="64" src="https://avatars2.githubusercontent.com/u/49895722?s=400&v=4" alt="YC946586"></a></p>

doc/source/handycontrol/tools/effect/index.md

@@ -0,0 +1,3 @@
+---
+title: Effect
+---

doc/source/handycontrol/tools/hatchBrushGenerator/index.md

@@ -0,0 +1,3 @@
+---
+title: HatchBrushGenerator
+---

doc/source/handycontrol/tools/morphingAnimation/index.md

@@ -0,0 +1,3 @@
+---
+title: MorphingAnimation
+---

doc/source/handykeras/index.md

@@ -1,4 +0,0 @@
----
-title: handykeras
-date: 2019-04-02 00:03:48
----

doc/themes/next/_config.yml

@@ -158,7 +158,7 @@ baidu_push: false
 # External url should start with http:// or https://
 menu:
   主页: / || 
-  HandyControl:
+  HandyControl - 2.4.0:
     default: /handycontrol/ ||
     鸣谢: /tnx/ ||
     快速开始: /quick_start/ ||
@@ -184,7 +184,9 @@ menu:
       InfoElement 信息元素: /infoElement/ ||
       PanelElement 面板元素: /panelElement/ ||
       PasswordBoxAttach 密码框专用: /passwordBoxAttach/ ||
+      RectangleAttach Rectangle专用: /rectangleAttach/ ||
       StatusSwitchElement 可切换状态的元素: /statusSwitchElement/ ||
+      TextBlockAttach 文本块专用: /textBlockAttach/ ||
       TipElement 提示元素: /tipElement/ ||
       TitleElement 标题元素: /titleElement/ ||
       VisualElement 可视化元素: /visualElement/ ||
@@ -201,6 +203,8 @@ menu:
       DataGrid 数据表格: /dataGrid/ ||
       DatePicker 日期选择器: /datePicker/ ||
       Expander 展开框: /expander/ ||
+      FlowDocument 流文档: /flowDocument/ ||
+      Frame 导航框架: /frame/ ||
       GroupBox 分组框: /groupBox/ ||
       Image 图片: /image/ ||
       Label 标签: /label/ ||
@@ -212,7 +216,9 @@ menu:
       RadioButton 单选按钮: /radioButton/ ||
       RichTextBox 富文本框: /richTextBox/ ||
       ScrollViewer 滚动视图: /scrollViewer/ ||
+      Seperator 分隔符: /seperator/ ||
       Slider 滑块: /slider/ ||
+      StatusBar 状态栏: /statusBar/ ||
       TabControl 选项卡控件: /tabControl/ ||
       TextBlock 文本块: /textBlock/ ||
       TextBox 文本框: /textBox/ ||
@@ -225,8 +231,10 @@ menu:
       default: /extend_controls/ ||
       AnimationPath 动画路径: /animationPath/ ||
       Badge 标记: /badge/ ||
+      ButtonGroup : /buttonGroup/ ||
       BlurWindow 背景模糊窗口: /blurWindow/ ||
       CalendarWithClock 带有时钟的日历: /calendarWithClock/ ||
+      Card 卡片: /card/ ||
       Carousel 轮播: /carousel/ ||
       ChatBubble 对话气泡: /chatBubble/ ||
       CirclePanel 圆形布局: /circlePanel/ ||
@@ -240,30 +248,46 @@ menu:
       DatePicker 日期选择器: /datePicker/ ||
       DateTimePicker 日期时间选择器: /dateTimePicker/ ||
       Dialog 对话框: /dialog/ ||
+      Divider 分割线: /divider/ ||
+      Drawer 抽屉: /drawer/ ||
       FlipClock 翻页时钟: /flipClock/ ||
+      FloatingBlock 漂浮块: /floatingBlock/ ||
       GifImage Gif图片: /gifImage/ ||
       GotoTop 回到顶部: /gotoTop/ ||
       Gravatar 头像: /gravatar/ ||
+      Grid 栅格: /grid/ ||
       Growl 信息通知: /growl/ ||
+      HoneycombPanel 蜂窝布局: /honeycombPanel/ ||
+      ImageBlock 图片块: /imageBlock/ ||
       ImageBrowser 图片浏览器: /imageBrowser/ ||
       ImageViewer 图片视图: /imageViewer/ ||
       Loading 加载条: /loading/ ||
+      Magnifier 放大镜: /magnifier/ ||
       MessageBox 消息对话框: /messageBox/ ||
+      Notification 桌面通知: /notification/ ||
       NotifyIcon 托盘图标: /notifyIcon/ ||
       NumericUpDown 数值选择控件: /numericUpDown/ ||
       OutlineText 轮廓文本: /outlineText/ ||
       Pagination 页码条: /pagination/ ||
       PasswordBox 密码框: /passwordBox/ ||
+      PinBox PIN码框: /pinBox/ ||
+      PopTip 气泡提示: /popTip/ ||
       PopupWindow 弹出窗口: /popupWindow/ ||
       PreviewSlider 预览滑块: /previewSlider/ ||
       ProgressButton 进度按钮: /progressButton/ ||
+      RangeSlider 范围滑块: /rangeSlider/ ||
       RadioGroup 单选按钮组: /radioGroup/ ||
       Rate 评分: /rate/ ||
+      RelativePanel 相对布局: /relativePanel/ ||
+      RunningBlock 滚动块: /runningBlock/ ||
       ScrollViewer 滚动视图: /scrollViewer/ ||
       SearchBar 搜索栏: /searchBar/ ||
       Shield 徽章: /shield/ ||
+      SideMenu 侧边菜单: /sideMenu/ ||
       SimpleItemsControl 简单项目控件: /simpleItemsControl/ ||
       SimplePanel 简单面板: /simplePanel/ ||
+      SplitButton 分割按钮: /splitButton/ ||
+      Sprite 精灵: /sprite/ ||
       StepBar 步骤条: /stepBar/ ||
       TabControl 选项卡控件: /tabControl/ ||
       Tag 标签: /tag/ ||
@@ -281,6 +305,9 @@ menu:
       InfoType: /InfoType/ ||
     工具和扩展:
       default: /tools/ ||
+      Effect 效果: /effect/ ||
+      HatchBrushGenerator 阴影画笔生成器: /hatchBrushGenerator/ ||
+      MorphingAnimation 变形动画: /morphingAnimation/ ||
     国际化:
       default: /langs/ ||
 
@@ -872,7 +899,7 @@ needmoreshare2:
 #  localhost_ignored: true
 
 # CNZZ count
-#cnzz_siteid:
+cnzz_siteid: 1278600916
 
 # Application Insights
 # See: https://azure.microsoft.com/en-us/services/application-insights

doc/themes/next/layout/_third-party/analytics/cnzz-analytics.swig

@@ -1,5 +1,3 @@
 {% if theme.cnzz_siteid %}
-  <div style="display: none;">
-    <script src="//s95.cnzz.com/z_stat.php?id={{ theme.cnzz_siteid }}&web_id={{ theme.cnzz_siteid }}"></script>
-  </div>
+  <script type="text/javascript">var cnzz_protocol = (("https:" == document.location.protocol) ? "https://" : "http://");document.write(unescape("%3Cspan id='cnzz_stat_icon_{{ theme.cnzz_siteid }}'%3E%3C/span%3E%3Cscript src='" + cnzz_protocol + "s4.cnzz.com/z_stat.php%3Fid%3D{{ theme.cnzz_siteid }}%26online%3D1%26show%3Dline' type='text/javascript'%3E%3C/script%3E"));</script>
 {% endif %}

doc/themes/next/source/css/_custom/custom.styl

@@ -3,6 +3,7 @@
   margin: 3px;
   display: inline;
   padding: 3px !important;
+  border: 0;
 }
 
 .post-body h2 {

src/Core_GE30/HandyControlDemo_Core_GE30/HandyControlDemo_Core_GE30.csproj

@@ -1,26 +1,36 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
     <UseWPF>true</UseWPF>
     <AssemblyName>HandyControlDemo</AssemblyName>
     <RootNamespace>HandyControlDemo</RootNamespace>
-    <Version>2.4.0</Version>
+    <Version>2.5.0</Version>
     <ApplicationIcon>..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico</ApplicationIcon>
-    <Configurations>Debug;Release</Configurations>
+    <Configurations>Debug-Core30;Debug-Core31;Release-Core30;Release-Core31</Configurations>
     <Copyright>Copyright © HandyOrg 2018-2020</Copyright>
-    <FileVersion>2.4.0.0</FileVersion>
-    <AssemblyVersion>2.4.0.0</AssemblyVersion>
+    <FileVersion>2.5.0</FileVersion>
+    <AssemblyVersion>2.5.0</AssemblyVersion>
     <LangVersion>8.0</LangVersion>
     <Authors>HandyOrg</Authors>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Core30|AnyCPU'">
     <DefineConstants>TRACE;Core</DefineConstants>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Core31|AnyCPU'">
     <DefineConstants>TRACE;Core</DefineConstants>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Core30|AnyCPU'">
+    <DefineConstants>TRACE;Core</DefineConstants>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Core31|AnyCPU'">
+    <DefineConstants>TRACE;Core</DefineConstants>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="AvalonEdit" Version="6.0.1" />
     <PackageReference Include="CommonServiceLocator" Version="2.0.2" />
     <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
@@ -46,7 +56,8 @@
     <Compile Remove="Tools\Helper\CommonHelper.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\HandyControl_Core_30\HandyControl_Core_30.csproj" />
+    <ProjectReference Include="..\..\Shared\HandyControlDemo_Code\HandyControlDemo_Code.csproj" />
+    <ProjectReference Include="..\HandyControl_Core_GE30\HandyControl_Core_GE30.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Data\DemoInfo.json">
@@ -463,6 +474,15 @@
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png">
       <Link>Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png</Link>
     </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\frame_16xLG.png">
+      <Link>Resources\Img\LeftMainContent\frame_16xLG.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\cloud.png">
+      <Link>Resources\Img\cloud.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\WindowScreenshot_16x.png">
+      <Link>Resources\Img\LeftMainContent\WindowScreenshot_16x.png</Link>
+    </Resource>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\..\Shared\HandyControlDemo_Shared\Properties\Langs\Lang.en.resx">
@@ -483,6 +503,11 @@
       <LastGenOutput>Lang.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\Shared\HandyControlDemo_Shared\Properties\App.config">
+      <Link>Properties\App.config</Link>
+    </None>
+  </ItemGroup>
   <ItemGroup>
     <Content Include="..\..\Shared\HandyControlDemo_Shared\Data\MessageToken.tt">
       <Link>Data\MessageToken.tt</Link>

src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj

@@ -1,25 +1,35 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
     <UseWPF>true</UseWPF>
     <AssemblyName>HandyControl</AssemblyName>
     <RootNamespace>HandyControl</RootNamespace>
-    <Version>2.4.0</Version>
-    <AssemblyVersion>2.4.0.0</AssemblyVersion>
+    <Version>2.5.0</Version>
+    <AssemblyVersion>2.5.0</AssemblyVersion>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <Copyright>Copyright © HandyOrg 2018-2020</Copyright>
     <Description>Contains some commonly used simple WPF controls</Description>
-    <Configurations>Debug;Release</Configurations>
+    <Configurations>Debug-Core30;Debug-Core31;Release-Core30;Release-Core31</Configurations>
     <LangVersion>8.0</LangVersion>
     <Authors>HandyOrg</Authors>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Core30|AnyCPU'">
     <DefineConstants>TRACE;Core</DefineConstants>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Core31|AnyCPU'">
     <DefineConstants>TRACE;Core</DefineConstants>
-    <DocumentationFile>C:\Code\GitHub\HandyControl\src\Core_30\HandyControl_Core_30\HandyControl.xml</DocumentationFile>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Core30|AnyCPU'">
+    <DefineConstants>TRACE;Core</DefineConstants>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <DocumentationFile>C:\Code\GitHub\HandyControl\src\Core_GE30\HandyControl_Core_GE30\HandyControl.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Core31|AnyCPU'">
+    <DefineConstants>TRACE;Core</DefineConstants>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <DocumentationFile>C:\Code\GitHub\HandyControl\src\Core_GE30\HandyControl_Core_GE30\HandyControl.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\..\Shared\HandyControl_Shared\Properties\Langs\Lang.Designer.cs">
@@ -47,8 +57,8 @@
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Lang.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <Compile Include="..\..\Shared\HandyControl_Shared\Properties\AssemblyInfo.cs">
-      <Link>Properties\AssemblyInfo.cs</Link>
+    <Compile Include="..\..\Shared\HandyControl_Shared\Properties\CoreAssemblyInfo.cs">
+      <Link>Properties\CoreAssemblyInfo.cs</Link>
     </Compile>
   </ItemGroup>
   <Import Project="..\..\Shared\HandyControl_Shared\HandyControl_Shared.projitems" Label="Shared" />
@@ -61,9 +71,18 @@
     </Resource>
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Effects\BrightnessEffect.ps">
+      <Link>Resources\Effects\BrightnessEffect.ps</Link>
+    </Resource>
     <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Effects\ColorComplementEffect.ps">
       <Link>Resources\Effects\ColorComplementEffect.ps</Link>
     </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Effects\ColorMatrixEffect.ps">
+      <Link>Resources\Effects\ColorMatrixEffect.ps</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Effects\ContrastEffect.ps">
+      <Link>Resources\Effects\ContrastEffect.ps</Link>
+    </Resource>
     <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Effects\GrayScaleEffect.ps">
       <Link>Resources\Effects\GrayScaleEffect.ps</Link>
     </Resource>

src/Core_GE30/HandyControl_Core_GE30/Themes/Styles/Base/TreeViewBaseStyle.xaml

@@ -51,7 +51,7 @@
                             <RowDefinition MinHeight="{StaticResource DefaultControlHeight}"/>
                             <RowDefinition/>
                         </Grid.RowDefinitions>
-                        <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                        <Border x:Name="Bd" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
                             <StackPanel Orientation="Horizontal" Margin="{Binding Converter={StaticResource TreeViewItemMarginConverter}, RelativeSource={RelativeSource TemplatedParent}}">
                                 <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ExpandCollapseToggleStyle}"/>
                                 <ContentPresenter VerticalAlignment="Center" x:Name="PART_Header" ContentSource="Header" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>

src/Core_GE30/HandyControl_Core_GE30/Themes/Styles/Window.xaml

@@ -117,7 +117,7 @@
                                 </Grid>
                             </Grid>
                             <AdornerDecorator Grid.Row="1">
-                                <ContentPresenter/>
+                                <ContentPresenter ClipToBounds="True"/>
                             </AdornerDecorator>
                             <ResizeGrip Width="10" Height="10" x:Name="ResizeGrip" HorizontalAlignment="Right" VerticalAlignment="Bottom" Grid.Row="1" IsTabStop="False" Visibility="Collapsed" WindowChrome.ResizeGripDirection="BottomRight" />
                         </Grid>

src/HandyControl.sln

@@ -17,16 +17,18 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControlDemo_Shared", "
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net_40", "Net_40", "{35E3F9C0-8924-4536-BE09-F3761FDBF066}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core_30", "Core_30", "{B838C973-06F0-48A1-B259-A357AAF2D8D4}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core_GE30", "Core_GE30", "{B838C973-06F0-48A1-B259-A357AAF2D8D4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControl_Core_30", "Core_30\HandyControl_Core_30\HandyControl_Core_30.csproj", "{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControl_Core_GE30", "Core_GE30\HandyControl_Core_GE30\HandyControl_Core_GE30.csproj", "{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControlDemo_Core30", "Core_30\HandyControlDemo_Core_30\HandyControlDemo_Core30.csproj", "{D7107690-8592-4F9F-9379-9B82C1C15D2A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControlDemo_Core_GE30", "Core_GE30\HandyControlDemo_Core_GE30\HandyControlDemo_Core_GE30.csproj", "{D7107690-8592-4F9F-9379-9B82C1C15D2A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControl_Net_40", "Net_40\HandyControl_Net_40\HandyControl_Net_40.csproj", "{32204503-2EF0-4681-AE13-AA1FEB6C658A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Net_40", "Net_40\HandyControlDemo_Net_40\HandyControlDemo_Net_40.csproj", "{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Code", "Shared\HandyControlDemo_Code\HandyControlDemo_Code.csproj", "{D8A4748C-0500-4F63-BC47-3506658C68F7}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		Shared\HandyControl_Shared\HandyControl_Shared.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 4
@@ -38,12 +40,14 @@ Global
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug-Core30|Any CPU = Debug-Core30|Any CPU
+		Debug-Core31|Any CPU = Debug-Core31|Any CPU
 		Debug-Net40|Any CPU = Debug-Net40|Any CPU
 		Debug-Net45|Any CPU = Debug-Net45|Any CPU
 		Debug-Net462|Any CPU = Debug-Net462|Any CPU
 		Debug-Net47|Any CPU = Debug-Net47|Any CPU
 		Debug-Net48|Any CPU = Debug-Net48|Any CPU
 		Release-Core30|Any CPU = Release-Core30|Any CPU
+		Release-Core31|Any CPU = Release-Core31|Any CPU
 		Release-Net40|Any CPU = Release-Net40|Any CPU
 		Release-Net45|Any CPU = Release-Net45|Any CPU
 		Release-Net462|Any CPU = Release-Net462|Any CPU
@@ -52,6 +56,7 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Core30|Any CPU.ActiveCfg = Debug-Net45|Any CPU
+		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Core31|Any CPU.ActiveCfg = Debug-Net45|Any CPU
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net40|Any CPU.ActiveCfg = Debug-Net45|Any CPU
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU
@@ -62,6 +67,7 @@ Global
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Core30|Any CPU.ActiveCfg = Release-Net45|Any CPU
+		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Core31|Any CPU.ActiveCfg = Release-Net45|Any CPU
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net40|Any CPU.ActiveCfg = Release-Net45|Any CPU
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net45|Any CPU.ActiveCfg = Release-Net45|Any CPU
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net45|Any CPU.Build.0 = Release-Net45|Any CPU
@@ -72,6 +78,7 @@ Global
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU
 		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Core30|Any CPU.ActiveCfg = Debug-Net45|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Core31|Any CPU.ActiveCfg = Debug-Net45|Any CPU
 		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net40|Any CPU.ActiveCfg = Debug-Net45|Any CPU
 		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU
 		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU
@@ -82,6 +89,7 @@ Global
 		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU
 		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU
 		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Core30|Any CPU.ActiveCfg = Release-Net45|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Core31|Any CPU.ActiveCfg = Release-Net45|Any CPU
 		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net40|Any CPU.ActiveCfg = Release-Net47|Any CPU
 		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.ActiveCfg = Release-Net45|Any CPU
 		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.Build.0 = Release-Net45|Any CPU
@@ -91,43 +99,64 @@ Global
 		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU
 		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU
 		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU
-		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Core30|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Core30|Any CPU.Build.0 = Debug|Any CPU
-		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net40|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net45|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net462|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net47|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net48|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Core30|Any CPU.ActiveCfg = Release|Any CPU
-		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Core30|Any CPU.Build.0 = Release|Any CPU
-		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net40|Any CPU.ActiveCfg = Release|Any CPU
-		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net45|Any CPU.ActiveCfg = Release|Any CPU
-		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net45|Any CPU.Build.0 = Release|Any CPU
-		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net462|Any CPU.ActiveCfg = Release|Any CPU
-		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net462|Any CPU.Build.0 = Release|Any CPU
-		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net47|Any CPU.ActiveCfg = Release|Any CPU
-		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net47|Any CPU.Build.0 = Release|Any CPU
-		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net48|Any CPU.ActiveCfg = Release|Any CPU
-		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net48|Any CPU.Build.0 = Release|Any CPU
-		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Core30|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Core30|Any CPU.Build.0 = Debug|Any CPU
-		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net40|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net45|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net462|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net47|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net48|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Core30|Any CPU.ActiveCfg = Release|Any CPU
-		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Core30|Any CPU.Build.0 = Release|Any CPU
-		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net40|Any CPU.ActiveCfg = Release|Any CPU
-		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net45|Any CPU.ActiveCfg = Release|Any CPU
-		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net45|Any CPU.Build.0 = Release|Any CPU
-		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net462|Any CPU.ActiveCfg = Release|Any CPU
-		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net462|Any CPU.Build.0 = Release|Any CPU
-		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net47|Any CPU.ActiveCfg = Release|Any CPU
-		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net47|Any CPU.Build.0 = Release|Any CPU
-		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net48|Any CPU.ActiveCfg = Release|Any CPU
-		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net48|Any CPU.Build.0 = Release|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Core30|Any CPU.ActiveCfg = Debug-Core30|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Core30|Any CPU.Build.0 = Debug-Core30|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Core31|Any CPU.ActiveCfg = Debug-Core31|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Core31|Any CPU.Build.0 = Debug-Core31|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net40|Any CPU.ActiveCfg = Debug-Core31|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net40|Any CPU.Build.0 = Debug-Core31|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net45|Any CPU.ActiveCfg = Debug-Core31|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net45|Any CPU.Build.0 = Debug-Core31|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net462|Any CPU.ActiveCfg = Debug-Core31|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net462|Any CPU.Build.0 = Debug-Core31|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net47|Any CPU.ActiveCfg = Debug-Core31|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net47|Any CPU.Build.0 = Debug-Core31|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net48|Any CPU.ActiveCfg = Debug-Core31|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net48|Any CPU.Build.0 = Debug-Core31|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Core30|Any CPU.ActiveCfg = Release-Core30|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Core30|Any CPU.Build.0 = Release-Core30|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Core31|Any CPU.ActiveCfg = Release-Core31|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Core31|Any CPU.Build.0 = Release-Core31|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net40|Any CPU.ActiveCfg = Release-Core31|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net40|Any CPU.Build.0 = Release-Core31|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net45|Any CPU.ActiveCfg = Release-Core31|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net45|Any CPU.Build.0 = Release-Core31|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net462|Any CPU.ActiveCfg = Release-Core31|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net462|Any CPU.Build.0 = Release-Core31|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net47|Any CPU.ActiveCfg = Release-Core31|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net47|Any CPU.Build.0 = Release-Core31|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net48|Any CPU.ActiveCfg = Release-Core31|Any CPU
+		{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net48|Any CPU.Build.0 = Release-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Core30|Any CPU.ActiveCfg = Debug-Core30|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Core30|Any CPU.Build.0 = Debug-Core30|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Core31|Any CPU.ActiveCfg = Debug-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Core31|Any CPU.Build.0 = Debug-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net40|Any CPU.ActiveCfg = Debug-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net40|Any CPU.Build.0 = Debug-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net45|Any CPU.ActiveCfg = Debug-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net45|Any CPU.Build.0 = Debug-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net462|Any CPU.ActiveCfg = Debug-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net462|Any CPU.Build.0 = Debug-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net47|Any CPU.ActiveCfg = Debug-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net47|Any CPU.Build.0 = Debug-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net48|Any CPU.ActiveCfg = Debug-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net48|Any CPU.Build.0 = Debug-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Core30|Any CPU.ActiveCfg = Release-Core30|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Core30|Any CPU.Build.0 = Release-Core30|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Core31|Any CPU.ActiveCfg = Release-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Core31|Any CPU.Build.0 = Release-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net40|Any CPU.ActiveCfg = Release-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net40|Any CPU.Build.0 = Release-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net45|Any CPU.ActiveCfg = Release-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net45|Any CPU.Build.0 = Release-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net462|Any CPU.ActiveCfg = Release-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net462|Any CPU.Build.0 = Release-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net47|Any CPU.ActiveCfg = Release-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net47|Any CPU.Build.0 = Release-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net48|Any CPU.ActiveCfg = Release-Core31|Any CPU
+		{D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net48|Any CPU.Build.0 = Release-Core31|Any CPU
 		{32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Core30|Any CPU.ActiveCfg = Debug|Any CPU
+		{32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Core31|Any CPU.ActiveCfg = Debug|Any CPU
 		{32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Net40|Any CPU.ActiveCfg = Debug|Any CPU
 		{32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Net40|Any CPU.Build.0 = Debug|Any CPU
 		{32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Net45|Any CPU.ActiveCfg = Debug|Any CPU
@@ -135,17 +164,15 @@ Global
 		{32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Net47|Any CPU.ActiveCfg = Debug|Any CPU
 		{32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Net48|Any CPU.ActiveCfg = Debug|Any CPU
 		{32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Core30|Any CPU.ActiveCfg = Release|Any CPU
+		{32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Core31|Any CPU.ActiveCfg = Release|Any CPU
 		{32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net40|Any CPU.ActiveCfg = Release|Any CPU
 		{32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net40|Any CPU.Build.0 = Release|Any CPU
 		{32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net45|Any CPU.ActiveCfg = Release|Any CPU
-		{32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net45|Any CPU.Build.0 = Release|Any CPU
 		{32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net462|Any CPU.ActiveCfg = Release|Any CPU
-		{32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net462|Any CPU.Build.0 = Release|Any CPU
 		{32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net47|Any CPU.ActiveCfg = Release|Any CPU
-		{32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net47|Any CPU.Build.0 = Release|Any CPU
 		{32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net48|Any CPU.ActiveCfg = Release|Any CPU
-		{32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net48|Any CPU.Build.0 = Release|Any CPU
 		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Core30|Any CPU.ActiveCfg = Debug|Any CPU
+		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Core31|Any CPU.ActiveCfg = Debug|Any CPU
 		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Net40|Any CPU.ActiveCfg = Debug|Any CPU
 		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Net40|Any CPU.Build.0 = Debug|Any CPU
 		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Net45|Any CPU.ActiveCfg = Debug|Any CPU
@@ -153,16 +180,41 @@ Global
 		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Net47|Any CPU.ActiveCfg = Debug|Any CPU
 		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Net48|Any CPU.ActiveCfg = Debug|Any CPU
 		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Core30|Any CPU.ActiveCfg = Release|Any CPU
+		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Core31|Any CPU.ActiveCfg = Release|Any CPU
 		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net40|Any CPU.ActiveCfg = Release|Any CPU
 		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net40|Any CPU.Build.0 = Release|Any CPU
 		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net45|Any CPU.ActiveCfg = Release|Any CPU
-		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net45|Any CPU.Build.0 = Release|Any CPU
 		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net462|Any CPU.ActiveCfg = Release|Any CPU
-		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net462|Any CPU.Build.0 = Release|Any CPU
 		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net47|Any CPU.ActiveCfg = Release|Any CPU
-		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net47|Any CPU.Build.0 = Release|Any CPU
 		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net48|Any CPU.ActiveCfg = Release|Any CPU
-		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net48|Any CPU.Build.0 = Release|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Core30|Any CPU.ActiveCfg = Debug-Net48|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Core30|Any CPU.Build.0 = Debug-Net48|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Core31|Any CPU.ActiveCfg = Debug-Net48|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Core31|Any CPU.Build.0 = Debug-Net48|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net40|Any CPU.ActiveCfg = Debug-Net40|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net40|Any CPU.Build.0 = Debug-Net40|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net462|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net47|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net47|Any CPU.Build.0 = Debug-Net47|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Core30|Any CPU.ActiveCfg = Release-Net48|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Core30|Any CPU.Build.0 = Release-Net48|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Core31|Any CPU.ActiveCfg = Release-Net48|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Core31|Any CPU.Build.0 = Release-Net48|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net40|Any CPU.ActiveCfg = Release-Net40|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net40|Any CPU.Build.0 = Release-Net40|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net45|Any CPU.ActiveCfg = Release-Net45|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net45|Any CPU.Build.0 = Release-Net45|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net462|Any CPU.ActiveCfg = Release-Net462|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net462|Any CPU.Build.0 = Release-Net462|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net47|Any CPU.ActiveCfg = Release-Net47|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -176,6 +228,7 @@ Global
 		{D7107690-8592-4F9F-9379-9B82C1C15D2A} = {B838C973-06F0-48A1-B259-A357AAF2D8D4}
 		{32204503-2EF0-4681-AE13-AA1FEB6C658A} = {35E3F9C0-8924-4536-BE09-F3761FDBF066}
 		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231} = {35E3F9C0-8924-4536-BE09-F3761FDBF066}
+		{D8A4748C-0500-4F63-BC47-3506658C68F7} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D4636382-1A18-4079-A3E7-054DD970F179}

src/HandyControl_Core_GE30.sln

@@ -9,11 +9,13 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControl_Shared", "Shar
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControlDemo_Shared", "Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.shproj", "{C4694269-C9B8-45D5-87F8-D0088C532510}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core_30", "Core_30", "{7BB7D82E-48B1-4673-91B6-37D563A0A624}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core_GE30", "Core_GE30", "{7BB7D82E-48B1-4673-91B6-37D563A0A624}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControl_Core_30", "Core_30\HandyControl_Core_30\HandyControl_Core_30.csproj", "{A85722CF-CDF4-4164-94E4-EB71E543361A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControl_Core_GE30", "Core_GE30\HandyControl_Core_GE30\HandyControl_Core_GE30.csproj", "{A85722CF-CDF4-4164-94E4-EB71E543361A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControlDemo_Core30", "Core_30\HandyControlDemo_Core_30\HandyControlDemo_Core30.csproj", "{BF712555-531A-4C8D-9AB5-3109DC178A8E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControlDemo_Core_GE30", "Core_GE30\HandyControlDemo_Core_GE30\HandyControlDemo_Core_GE30.csproj", "{BF712555-531A-4C8D-9AB5-3109DC178A8E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Code", "Shared\HandyControlDemo_Code\HandyControlDemo_Code.csproj", "{D8A4748C-0500-4F63-BC47-3506658C68F7}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
@@ -33,6 +35,10 @@ Global
 		{BF712555-531A-4C8D-9AB5-3109DC178A8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BF712555-531A-4C8D-9AB5-3109DC178A8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF712555-531A-4C8D-9AB5-3109DC178A8E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug|Any CPU.ActiveCfg = Debug-Net48|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug|Any CPU.Build.0 = Debug-Net48|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release|Any CPU.ActiveCfg = Release-Net48|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release|Any CPU.Build.0 = Release-Net48|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -42,6 +48,7 @@ Global
 		{C4694269-C9B8-45D5-87F8-D0088C532510} = {60DCDCCA-3902-49EB-BC24-488143BE832E}
 		{A85722CF-CDF4-4164-94E4-EB71E543361A} = {7BB7D82E-48B1-4673-91B6-37D563A0A624}
 		{BF712555-531A-4C8D-9AB5-3109DC178A8E} = {7BB7D82E-48B1-4673-91B6-37D563A0A624}
+		{D8A4748C-0500-4F63-BC47-3506658C68F7} = {60DCDCCA-3902-49EB-BC24-488143BE832E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6C8B9B9F-B396-4C31-BA28-11BCB1ED94C5}

src/HandyControl_Net_40.sln

@@ -15,6 +15,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControl_Net_40", "Net_
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Net_40", "Net_40\HandyControlDemo_Net_40\HandyControlDemo_Net_40.csproj", "{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Code", "Shared\HandyControlDemo_Code\HandyControlDemo_Code.csproj", "{D8A4748C-0500-4F63-BC47-3506658C68F7}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		Shared\HandyControl_Shared\HandyControl_Shared.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 4
@@ -35,6 +37,10 @@ Global
 		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug|Any CPU.ActiveCfg = Debug-Net40|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug|Any CPU.Build.0 = Debug-Net40|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release|Any CPU.ActiveCfg = Release-Net40|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release|Any CPU.Build.0 = Release-Net40|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -44,6 +50,7 @@ Global
 		{C4694269-C9B8-45D5-87F8-D0088C532510} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897}
 		{32204503-2EF0-4681-AE13-AA1FEB6C658A} = {763DABFC-950A-4965-97CB-15C59A928401}
 		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231} = {763DABFC-950A-4965-97CB-15C59A928401}
+		{D8A4748C-0500-4F63-BC47-3506658C68F7} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D4636382-1A18-4079-A3E7-054DD970F179}

src/HandyControl_Net_GE45.sln

@@ -15,6 +15,8 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControl_Shared", "Shar
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControlDemo_Shared", "Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.shproj", "{C4694269-C9B8-45D5-87F8-D0088C532510}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Code", "Shared\HandyControlDemo_Code\HandyControlDemo_Code.csproj", "{D8A4748C-0500-4F63-BC47-3506658C68F7}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{9a7b52e6-94bb-4e7e-bb6a-7cf6761b79a7}*SharedItemsImports = 4
@@ -49,22 +51,38 @@ Global
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net47|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.Build.0 = Debug-Net47|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net48|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.Build.0 = Debug-Net48|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net48|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.Build.0 = Debug-Net48|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net462|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net47|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.Build.0 = Debug-Net47|Any CPU
 		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU
 		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.ActiveCfg = Release-Net48|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.Build.0 = Release-Net48|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.ActiveCfg = Release-Net48|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.Build.0 = Release-Net48|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.ActiveCfg = Release-Net48|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.Build.0 = Release-Net48|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.ActiveCfg = Debug-Net462|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.ActiveCfg = Release-Net47|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU
 		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU
 		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net462|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net47|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net47|Any CPU.Build.0 = Debug-Net47|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net45|Any CPU.ActiveCfg = Release-Net45|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net45|Any CPU.Build.0 = Release-Net45|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net462|Any CPU.ActiveCfg = Release-Net462|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net462|Any CPU.Build.0 = Release-Net462|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net47|Any CPU.ActiveCfg = Release-Net47|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU
+		{D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -74,6 +92,7 @@ Global
 		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7} = {2F551C62-77F7-4FA5-8AD7-FCF53E92AE08}
 		{AAC11083-FACA-405D-9197-5C1212D65656} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897}
 		{C4694269-C9B8-45D5-87F8-D0088C532510} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897}
+		{D8A4748C-0500-4F63-BC47-3506658C68F7} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D4636382-1A18-4079-A3E7-054DD970F179}

src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj

@@ -57,6 +57,9 @@
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="AvalonEdit">
+      <Version>6.0.1</Version>
+    </PackageReference>
     <PackageReference Include="MvvmLightLibs">
       <Version>5.4.1.1</Version>
     </PackageReference>
@@ -395,6 +398,10 @@
     </Resource>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\Shared\HandyControlDemo_Code\HandyControlDemo_Code.csproj">
+      <Project>{d8a4748c-0500-4f63-bc47-3506658c68f7}</Project>
+      <Name>HandyControlDemo_Code</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HandyControl_Net_40\HandyControl_Net_40.csproj">
       <Project>{32204503-2ef0-4681-ae13-aa1feb6c658a}</Project>
       <Name>HandyControl_Net_40</Name>
@@ -419,6 +426,11 @@
       <LastGenOutput>Lang.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\Shared\HandyControlDemo_Shared\Properties\App.config">
+      <Link>Properties\App.config</Link>
+    </None>
+  </ItemGroup>
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\fabric-icons.ttf">
       <Link>Resources\fabric-icons.ttf</Link>
@@ -529,6 +541,15 @@
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png">
       <Link>Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png</Link>
     </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\frame_16xLG.png">
+      <Link>Resources\Img\LeftMainContent\frame_16xLG.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\cloud.png">
+      <Link>Resources\Img\cloud.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\WindowScreenshot_16x.png">
+      <Link>Resources\Img\LeftMainContent\WindowScreenshot_16x.png</Link>
+    </Resource>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Data\DemoInfo.json">

src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj

@@ -37,8 +37,8 @@
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\..\Shared\HandyControl_Shared\Properties\AssemblyInfo.cs">
-      <Link>Properties\AssemblyInfo.cs</Link>
+    <Compile Include="..\..\Shared\HandyControl_Shared\Properties\NetAssemblyInfo.cs">
+      <Link>Properties\NetAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="..\..\Shared\HandyControl_Shared\Properties\Langs\Lang.Designer.cs">
       <Link>Properties\Langs\Lang.Designer.cs</Link>
@@ -113,9 +113,18 @@
     </Resource>
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Effects\BrightnessEffect.ps">
+      <Link>Resources\Effects\BrightnessEffect.ps</Link>
+    </Resource>
     <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Effects\ColorComplementEffect.ps">
       <Link>Resources\Effects\ColorComplementEffect.ps</Link>
     </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Effects\ColorMatrixEffect.ps">
+      <Link>Resources\Effects\ColorMatrixEffect.ps</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Effects\ContrastEffect.ps">
+      <Link>Resources\Effects\ContrastEffect.ps</Link>
+    </Resource>
     <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Effects\GrayScaleEffect.ps">
       <Link>Resources\Effects\GrayScaleEffect.ps</Link>
     </Resource>

src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml

@@ -51,7 +51,7 @@
                             <RowDefinition MinHeight="{StaticResource DefaultControlHeight}"/>
                             <RowDefinition/>
                         </Grid.RowDefinitions>
-                        <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                        <Border x:Name="Bd" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
                             <StackPanel Orientation="Horizontal" Margin="{Binding Converter={StaticResource TreeViewItemMarginConverter}, RelativeSource={RelativeSource TemplatedParent}}">
                                 <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ExpandCollapseToggleStyle}"/>
                                 <ContentPresenter VerticalAlignment="Center" x:Name="PART_Header" ContentSource="Header" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>

src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml

@@ -118,7 +118,7 @@
                                 </Grid>
                             </Grid>
                             <AdornerDecorator Grid.Row="1">
-                                <ContentPresenter/>
+                                <ContentPresenter ClipToBounds="True"/>
                             </AdornerDecorator>
                             <ResizeGrip Width="10" Height="10" x:Name="ResizeGrip" HorizontalAlignment="Right" VerticalAlignment="Bottom" Grid.Row="1" IsTabStop="False" Visibility="Collapsed"/>
                         </Grid>

src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj

@@ -127,12 +127,19 @@
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\Shared\HandyControlDemo_Code\HandyControlDemo_Code.csproj">
+      <Project>{d8a4748c-0500-4f63-bc47-3506658c68f7}</Project>
+      <Name>HandyControlDemo_Code</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HandyControl_Net_GE45\HandyControl_Net_GE45.csproj">
       <Project>{dc966e3d-bcff-4652-98cf-070e5494749a}</Project>
       <Name>HandyControl_Net_GE45</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="AvalonEdit">
+      <Version>6.0.1</Version>
+    </PackageReference>
     <PackageReference Include="MvvmLightLibs">
       <Version>5.4.1.1</Version>
     </PackageReference>
@@ -488,6 +495,11 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\Shared\HandyControlDemo_Shared\Properties\App.config">
+      <Link>Properties\App.config</Link>
+    </None>
+  </ItemGroup>
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\RepeatButton_16x.png">
       <Link>Resources\Img\LeftMainContent\RepeatButton_16x.png</Link>
@@ -592,6 +604,15 @@
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png">
       <Link>Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png</Link>
     </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\frame_16xLG.png">
+      <Link>Resources\Img\LeftMainContent\frame_16xLG.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\cloud.png">
+      <Link>Resources\Img\cloud.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\WindowScreenshot_16x.png">
+      <Link>Resources\Img\LeftMainContent\WindowScreenshot_16x.png</Link>
+    </Resource>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\fabric-icons.ttf">

src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj

@@ -112,8 +112,8 @@
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\..\Shared\HandyControl_Shared\Properties\AssemblyInfo.cs">
-      <Link>Properties\AssemblyInfo.cs</Link>
+    <Compile Include="..\..\Shared\HandyControl_Shared\Properties\NetAssemblyInfo.cs">
+      <Link>Properties\NetAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="..\..\Shared\HandyControl_Shared\Properties\Langs\Lang.Designer.cs">
       <Link>Properties\Langs\Lang.Designer.cs</Link>
@@ -184,9 +184,18 @@
     </Resource>
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Effects\BrightnessEffect.ps">
+      <Link>Resources\Effects\BrightnessEffect.ps</Link>
+    </Resource>
     <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Effects\ColorComplementEffect.ps">
       <Link>Resources\Effects\ColorComplementEffect.ps</Link>
     </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Effects\ColorMatrixEffect.ps">
+      <Link>Resources\Effects\ColorMatrixEffect.ps</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Effects\ContrastEffect.ps">
+      <Link>Resources\Effects\ContrastEffect.ps</Link>
+    </Resource>
     <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Effects\GrayScaleEffect.ps">
       <Link>Resources\Effects\GrayScaleEffect.ps</Link>
     </Resource>

src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Base/TreeViewBaseStyle.xaml

@@ -10,6 +10,7 @@
     </ResourceDictionary.MergedDictionaries>
 
     <PathGeometry x:Key="TreeArrow" Figures="M508.893248 762.931659a65.039498 65.039498 0 0 1-46.420659-19.485839L97.125746 371.004022c-25.143018-25.634319-24.752868-66.816849 0.881451-91.959868 25.648769-25.164693 66.809624-24.745643 91.959867 0.881451l318.933409 325.125238 318.933408-325.125238a65.025048 65.025048 0 0 1 92.841318 91.078417L555.313907 743.44582a65.025048 65.025048 0 0 1-46.420659 19.485839z"/>
+    
     <Style x:Key="ExpandCollapseToggleStyle" TargetType="ToggleButton">
         <Setter Property="Focusable" Value="False"/>
         <Setter Property="Width" Value="16"/>
@@ -51,7 +52,7 @@
                             <RowDefinition MinHeight="{StaticResource DefaultControlHeight}"/>
                             <RowDefinition/>
                         </Grid.RowDefinitions>
-                        <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                        <Border x:Name="Bd" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
                             <StackPanel Orientation="Horizontal" Margin="{Binding Converter={StaticResource TreeViewItemMarginConverter}, RelativeSource={RelativeSource TemplatedParent}}">
                                 <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ExpandCollapseToggleStyle}"/>
                                 <ContentPresenter VerticalAlignment="Center" x:Name="PART_Header" ContentSource="Header" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>

src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml

@@ -117,7 +117,7 @@
                                 </Grid>
                             </Grid>
                             <AdornerDecorator Grid.Row="1">
-                                <ContentPresenter/>
+                                <ContentPresenter ClipToBounds="True"/>
                             </AdornerDecorator>
                             <ResizeGrip Width="10" Height="10" x:Name="ResizeGrip" HorizontalAlignment="Right" VerticalAlignment="Bottom" Grid.Row="1" IsTabStop="False" Visibility="Collapsed" WindowChrome.ResizeGripDirection="BottomRight" />
                         </Grid>

src/Shared/HandyControlDemo_Code/DemoHelper.cs

@@ -0,0 +1,25 @@
+using System;
+using System.IO;
+using System.Windows;
+
+public class DemoHelper
+{
+    public static void Main()
+    {
+
+    }
+
+    public static string GetCode(string demoName)
+    {
+        var uri = new Uri($"/HandyControlDemoCode;component/{demoName}", UriKind.Relative);
+        var resourceStream = Application.GetResourceStream(uri);
+        if (resourceStream != null)
+        {
+            using var reader = new StreamReader(resourceStream.Stream);
+            var code = reader.ReadToEnd();
+            return code;
+        }
+
+        return "";
+    }
+}

src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj

@@ -0,0 +1,997 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{D8A4748C-0500-4F63-BC47-3506658C68F7}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>HandyControlDemoCode</RootNamespace>
+    <AssemblyName>HandyControlDemoCode</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-Net40|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;netle45;netle40</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <LangVersion>8.0</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-Net45|AnyCPU'">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <LangVersion>8.0</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-Net462|AnyCPU'">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <LangVersion>8.0</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-Net47|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
+    <LangVersion>8.0</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-Net48|AnyCPU'">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <LangVersion>8.0</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-Net40|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;netle45;netle40</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <LangVersion>8.0</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-Net45|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <LangVersion>8.0</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-Net462|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <LangVersion>8.0</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-Net47|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
+    <LangVersion>8.0</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-Net48|AnyCPU'">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <LangVersion>8.0</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject />
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="DemoHelper.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="..\HandyControlDemo_Shared\Window\AboutWindow.xaml">
+      <Link>Window\AboutWindow.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\Window\BlurWindow.xaml">
+      <Link>Window\BlurWindow.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\Window\CommonWindow.xaml">
+      <Link>Window\CommonWindow.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\Window\CustomNonClientAreaWindow.xaml">
+      <Link>Window\CustomNonClientAreaWindow.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\Window\DialogDemoWindow.xaml">
+      <Link>Window\DialogDemoWindow.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\Window\GlowWindow.xaml">
+      <Link>Window\GlowWindow.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\Window\GrowlDemoWindow.xaml">
+      <Link>Window\GrowlDemoWindow.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\Window\NativeCommonWindow.xaml">
+      <Link>Window\NativeCommonWindow.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\Window\NavigationWindow.xaml">
+      <Link>Window\NavigationWindow.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\Window\NoNonClientAreaDragableWindow.xaml">
+      <Link>Window\NoNonClientAreaDragableWindow.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Basic\Avatar.xaml">
+      <Link>UserControl\Basic\Avatar.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Basic\ChatBox.xaml">
+      <Link>UserControl\Basic\ChatBox.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Basic\InteractiveDialog.xaml">
+      <Link>UserControl\Basic\InteractiveDialog.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Basic\TextDialog.xaml">
+      <Link>UserControl\Basic\TextDialog.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Basic\TextDialogWithTimer.xaml">
+      <Link>UserControl\Basic\TextDialogWithTimer.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\AnimationPathDemoCtl.xaml">
+      <Link>UserControl\Controls\AnimationPathDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\BadgeDemoCtl.xaml">
+      <Link>UserControl\Controls\BadgeDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ButtonGroupDemoCtl.xaml">
+      <Link>UserControl\Controls\ButtonGroupDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\CalendarWithClockDemoCtl.xaml">
+      <Link>UserControl\Controls\CalendarWithClockDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\CardDemoCtl.xaml">
+      <Link>UserControl\Controls\CardDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\CarouselDemoCtl.xaml">
+      <Link>UserControl\Controls\CarouselDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ChatBubbleDemoCtl.xaml">
+      <Link>UserControl\Controls\ChatBubbleDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\CirclePanelDemoCtl.xaml">
+      <Link>UserControl\Controls\CirclePanelDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ClockDemoCtl.xaml">
+      <Link>UserControl\Controls\ClockDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ColorPickerDemoCtl.xaml">
+      <Link>UserControl\Controls\ColorPickerDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ComboBoxDemoCtl.xaml">
+      <Link>UserControl\Controls\ComboBoxDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\CompareSliderDemoCtl.xaml">
+      <Link>UserControl\Controls\CompareSliderDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\CoverFlowDemoCtl.xaml">
+      <Link>UserControl\Controls\CoverFlowDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\CoverViewDemoCtl.xaml">
+      <Link>UserControl\Controls\CoverViewDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\DatePickerDemoCtl.xaml">
+      <Link>UserControl\Controls\DatePickerDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\DateTimePickerDemoCtl.xaml">
+      <Link>UserControl\Controls\DateTimePickerDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\DialogDemoCtl.xaml">
+      <Link>UserControl\Controls\DialogDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\DividerDemoCtl.xaml">
+      <Link>UserControl\Controls\DividerDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\DrawerDemoCtl.xaml">
+      <Link>UserControl\Controls\DrawerDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\FlipClockDemoCtl.xaml">
+      <Link>UserControl\Controls\FlipClockDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\FloatingBlockDemoCtl.xaml">
+      <Link>UserControl\Controls\FloatingBlockDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\GifImageDemoCtl.xaml">
+      <Link>UserControl\Controls\GifImageDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\GotoTopDemoCtl.xaml">
+      <Link>UserControl\Controls\GotoTopDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\GravatarDemoCtl.xaml">
+      <Link>UserControl\Controls\GravatarDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\GridDemoCtl.xaml">
+      <Link>UserControl\Controls\GridDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\GrowlDemoCtl.xaml">
+      <Link>UserControl\Controls\GrowlDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\HoneycombPanelDemoCtl.xaml">
+      <Link>UserControl\Controls\HoneycombPanelDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ImageBlockDemoCtl.xaml">
+      <Link>UserControl\Controls\ImageBlockDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ImageBrowserDemoCtl.xaml">
+      <Link>UserControl\Controls\ImageBrowserDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\LoadingDemoCtl.xaml">
+      <Link>UserControl\Controls\LoadingDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\MagnifierDemoCtl.xaml">
+      <Link>UserControl\Controls\MagnifierDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\NotificationDemoCtl.xaml">
+      <Link>UserControl\Controls\NotificationDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\NotifyIconDemoCtl.xaml">
+      <Link>UserControl\Controls\NotifyIconDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\NumericUpDownDemoCtl.xaml">
+      <Link>UserControl\Controls\NumericUpDownDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\OutlineTextDemoCtl.xaml">
+      <Link>UserControl\Controls\OutlineTextDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\PaginationDemoCtl.xaml">
+      <Link>UserControl\Controls\PaginationDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\PasswordBoxDemoCtl.xaml">
+      <Link>UserControl\Controls\PasswordBoxDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\PinBoxDemoCtl.xaml">
+      <Link>UserControl\Controls\PinBoxDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\PoptipDemoCtl.xaml">
+      <Link>UserControl\Controls\PoptipDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\PreviewSliderDemoCtl.xaml">
+      <Link>UserControl\Controls\PreviewSliderDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ProgressBarDemoCtl.xaml">
+      <Link>UserControl\Controls\ProgressBarDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ProgressButtonDemoCtl.xaml">
+      <Link>UserControl\Controls\ProgressButtonDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\RangeSliderDemoCtl.xaml">
+      <Link>UserControl\Controls\RangeSliderDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\RateDemoCtl.xaml">
+      <Link>UserControl\Controls\RateDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\RelativePanelDemoCtl.xaml">
+      <Link>UserControl\Controls\RelativePanelDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\RunningBlockDemoCtl.xaml">
+      <Link>UserControl\Controls\RunningBlockDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ScreenshotDemoCtl.xaml">
+      <Link>UserControl\Controls\ScreenshotDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ScrollViewerDemoCtl.xaml">
+      <Link>UserControl\Controls\ScrollViewerDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\SearchBarDemoCtl.xaml">
+      <Link>UserControl\Controls\SearchBarDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ShieldDemoCtl.xaml">
+      <Link>UserControl\Controls\ShieldDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\SideMenuDemoCtl.xaml">
+      <Link>UserControl\Controls\SideMenuDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\SplitButtonDemoCtl.xaml">
+      <Link>UserControl\Controls\SplitButtonDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\SpriteDemoCtl.xaml">
+      <Link>UserControl\Controls\SpriteDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\StepBarDemoCtl.xaml">
+      <Link>UserControl\Controls\StepBarDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\TabControlDemoCtl.xaml">
+      <Link>UserControl\Controls\TabControlDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\TagDemoCtl.xaml">
+      <Link>UserControl\Controls\TagDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\TextBoxDemoCtl.xaml">
+      <Link>UserControl\Controls\TextBoxDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\TimeBarDemoCtl.xaml">
+      <Link>UserControl\Controls\TimeBarDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\TimePickerDemoCtl.xaml">
+      <Link>UserControl\Controls\TimePickerDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\TransferDemoCtl.xaml">
+      <Link>UserControl\Controls\TransferDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\TransitioningContentControlDemoCtl.xaml">
+      <Link>UserControl\Controls\TransitioningContentControlDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\WaterfallPanelDemoCtl.xaml">
+      <Link>UserControl\Controls\WaterfallPanelDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\WindowDemoCtl.xaml">
+      <Link>UserControl\Controls\WindowDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\BorderDemoCtl.xaml">
+      <Link>UserControl\Styles\BorderDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\BrushDemoCtl.xaml">
+      <Link>UserControl\Styles\BrushDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\ButtonDemoCtl.xaml">
+      <Link>UserControl\Styles\ButtonDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\CalendarDemoCtl.xaml">
+      <Link>UserControl\Styles\CalendarDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\CheckBoxDemoCtl.xaml">
+      <Link>UserControl\Styles\CheckBoxDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\DataGridDemoCtl.xaml">
+      <Link>UserControl\Styles\DataGridDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\ExpanderDemoCtl.xaml">
+      <Link>UserControl\Styles\ExpanderDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\FlowDocumentDemoCtl.xaml">
+      <Link>UserControl\Styles\FlowDocumentDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\FrameDemoCtl.xaml">
+      <Link>UserControl\Styles\FrameDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\GroupBoxDemoCtl.xaml">
+      <Link>UserControl\Styles\GroupBoxDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\LabelDemoCtl.xaml">
+      <Link>UserControl\Styles\LabelDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\ListBoxDemoCtl.xaml">
+      <Link>UserControl\Styles\ListBoxDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\ListViewDemoCtl.xaml">
+      <Link>UserControl\Styles\ListViewDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\MenuDemoCtl.xaml">
+      <Link>UserControl\Styles\MenuDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\NativeComboBoxDemoCtl.xaml">
+      <Link>UserControl\Styles\NativeComboBoxDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\NativeDatePickerDemoCtl.xaml">
+      <Link>UserControl\Styles\NativeDatePickerDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\NativePasswordBoxDemoCtl.xaml">
+      <Link>UserControl\Styles\NativePasswordBoxDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\NativeProgressBarDemoCtl.xaml">
+      <Link>UserControl\Styles\NativeProgressBarDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\NativeScrollViewerDemoCtl.xaml">
+      <Link>UserControl\Styles\NativeScrollViewerDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\NativeTabControlDemoCtl.xaml">
+      <Link>UserControl\Styles\NativeTabControlDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\NativeTextBoxDemoCtl.xaml">
+      <Link>UserControl\Styles\NativeTextBoxDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\NativeWindowDemoCtl.xaml">
+      <Link>UserControl\Styles\NativeWindowDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\RadioButtonDemoCtl.xaml">
+      <Link>UserControl\Styles\RadioButtonDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\RepeatButtonDemoCtl.xaml">
+      <Link>UserControl\Styles\RepeatButtonDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\RichTextBoxDemoCtl.xaml">
+      <Link>UserControl\Styles\RichTextBoxDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\SliderDemoCtl.xaml">
+      <Link>UserControl\Styles\SliderDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\TextBlockDemoCtl.xaml">
+      <Link>UserControl\Styles\TextBlockDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\ToggleButtonDemoCtl.xaml">
+      <Link>UserControl\Styles\ToggleButtonDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\ToolBarDemoCtl.xaml">
+      <Link>UserControl\Styles\ToolBarDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\TreeViewDemoCtl.xaml">
+      <Link>UserControl\Styles\TreeViewDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Tools\EffectsDemoCtl.xaml">
+      <Link>UserControl\Tools\EffectsDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Tools\GeometryAnimationDemoCtl.xaml">
+      <Link>UserControl\Tools\GeometryAnimationDemoCtl.xaml</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Tools\HatchBrushGeneratorDemoCtl.xaml">
+      <Link>UserControl\Tools\HatchBrushGeneratorDemoCtl.xaml</Link>
+    </Resource>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="..\HandyControlDemo_Shared\Window\AboutWindow.xaml.cs">
+      <Link>Window\AboutWindow.xaml.cs</Link>
+      <DependentUpon>AboutWindow.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\Window\BlurWindow.xaml.cs">
+      <Link>Window\BlurWindow.xaml.cs</Link>
+      <DependentUpon>BlurWindow.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\Window\CommonWindow.xaml.cs">
+      <Link>Window\CommonWindow.xaml.cs</Link>
+      <DependentUpon>CommonWindow.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\Window\CustomNonClientAreaWindow.xaml.cs">
+      <Link>Window\CustomNonClientAreaWindow.xaml.cs</Link>
+      <DependentUpon>CustomNonClientAreaWindow.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\Window\DialogDemoWindow.xaml.cs">
+      <Link>Window\DialogDemoWindow.xaml.cs</Link>
+      <DependentUpon>DialogDemoWindow.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\Window\GlowWindow.xaml.cs">
+      <Link>Window\GlowWindow.xaml.cs</Link>
+      <DependentUpon>GlowWindow.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\Window\GrowlDemoWindow.xaml.cs">
+      <Link>Window\GrowlDemoWindow.xaml.cs</Link>
+      <DependentUpon>GrowlDemoWindow.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\Window\NativeCommonWindow.xaml.cs">
+      <Link>Window\NativeCommonWindow.xaml.cs</Link>
+      <DependentUpon>NativeCommonWindow.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\Window\NavigationWindow.xaml.cs">
+      <Link>Window\NavigationWindow.xaml.cs</Link>
+      <DependentUpon>NavigationWindow.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\Window\NoNonClientAreaDragableWindow.xaml.cs">
+      <Link>Window\NoNonClientAreaDragableWindow.xaml.cs</Link>
+      <DependentUpon>NoNonClientAreaDragableWindow.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Basic\Avatar.xaml.cs">
+      <Link>UserControl\Basic\Avatar.xaml.cs</Link>
+      <DependentUpon>Avatar.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Basic\ChatBox.xaml.cs">
+      <Link>UserControl\Basic\ChatBox.xaml.cs</Link>
+      <DependentUpon>ChatBox.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Basic\IFull.cs">
+      <Link>UserControl\Basic\IFull.cs</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Basic\InteractiveDialog.xaml.cs">
+      <Link>UserControl\Basic\InteractiveDialog.xaml.cs</Link>
+      <DependentUpon>InteractiveDialog.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Basic\TextDialog.xaml.cs">
+      <Link>UserControl\Basic\TextDialog.xaml.cs</Link>
+      <DependentUpon>TextDialog.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Basic\TextDialogWithTimer.xaml.cs">
+      <Link>UserControl\Basic\TextDialogWithTimer.xaml.cs</Link>
+      <DependentUpon>TextDialogWithTimer.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\AnimationPathDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\AnimationPathDemoCtl.xaml.cs</Link>
+      <DependentUpon>AnimationPathDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\BadgeDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\BadgeDemoCtl.xaml.cs</Link>
+      <DependentUpon>BadgeDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ButtonGroupDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\ButtonGroupDemoCtl.xaml.cs</Link>
+      <DependentUpon>ButtonGroupDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\CalendarWithClockDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\CalendarWithClockDemoCtl.xaml.cs</Link>
+      <DependentUpon>CalendarWithClockDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\CardDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\CardDemoCtl.xaml.cs</Link>
+      <DependentUpon>CardDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\CarouselDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\CarouselDemoCtl.xaml.cs</Link>
+      <DependentUpon>CarouselDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ChatBubbleDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\ChatBubbleDemoCtl.xaml.cs</Link>
+      <DependentUpon>ChatBubbleDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\CirclePanelDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\CirclePanelDemoCtl.xaml.cs</Link>
+      <DependentUpon>CirclePanelDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ClockDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\ClockDemoCtl.xaml.cs</Link>
+      <DependentUpon>ClockDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ColorPickerDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\ColorPickerDemoCtl.xaml.cs</Link>
+      <DependentUpon>ColorPickerDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ComboBoxDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\ComboBoxDemoCtl.xaml.cs</Link>
+      <DependentUpon>ComboBoxDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\CompareSliderDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\CompareSliderDemoCtl.xaml.cs</Link>
+      <DependentUpon>CompareSliderDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\CoverFlowDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\CoverFlowDemoCtl.xaml.cs</Link>
+      <DependentUpon>CoverFlowDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\CoverViewDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\CoverViewDemoCtl.xaml.cs</Link>
+      <DependentUpon>CoverViewDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\DatePickerDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\DatePickerDemoCtl.xaml.cs</Link>
+      <DependentUpon>DatePickerDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\DateTimePickerDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\DateTimePickerDemoCtl.xaml.cs</Link>
+      <DependentUpon>DateTimePickerDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\DialogDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\DialogDemoCtl.xaml.cs</Link>
+      <DependentUpon>DialogDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\DividerDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\DividerDemoCtl.xaml.cs</Link>
+      <DependentUpon>DividerDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\DrawerDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\DrawerDemoCtl.xaml.cs</Link>
+      <DependentUpon>DrawerDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\FlipClockDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\FlipClockDemoCtl.xaml.cs</Link>
+      <DependentUpon>FlipClockDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\FloatingBlockDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\FloatingBlockDemoCtl.xaml.cs</Link>
+      <DependentUpon>FloatingBlockDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\GifImageDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\GifImageDemoCtl.xaml.cs</Link>
+      <DependentUpon>GifImageDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\GotoTopDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\GotoTopDemoCtl.xaml.cs</Link>
+      <DependentUpon>GotoTopDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\GravatarDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\GravatarDemoCtl.xaml.cs</Link>
+      <DependentUpon>GravatarDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\GridDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\GridDemoCtl.xaml.cs</Link>
+      <DependentUpon>GridDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\GrowlDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\GrowlDemoCtl.xaml.cs</Link>
+      <DependentUpon>GrowlDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\HoneycombPanelDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\HoneycombPanelDemoCtl.xaml.cs</Link>
+      <DependentUpon>HoneycombPanelDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ImageBlockDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\ImageBlockDemoCtl.xaml.cs</Link>
+      <DependentUpon>ImageBlockDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ImageBrowserDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\ImageBrowserDemoCtl.xaml.cs</Link>
+      <DependentUpon>ImageBrowserDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\LoadingDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\LoadingDemoCtl.xaml.cs</Link>
+      <DependentUpon>LoadingDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\MagnifierDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\MagnifierDemoCtl.xaml.cs</Link>
+      <DependentUpon>MagnifierDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\NotificationDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\NotificationDemoCtl.xaml.cs</Link>
+      <DependentUpon>NotificationDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\NotifyIconDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\NotifyIconDemoCtl.xaml.cs</Link>
+      <DependentUpon>NotifyIconDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\NumericUpDownDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\NumericUpDownDemoCtl.xaml.cs</Link>
+      <DependentUpon>NumericUpDownDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\OutlineTextDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\OutlineTextDemoCtl.xaml.cs</Link>
+      <DependentUpon>OutlineTextDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\PaginationDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\PaginationDemoCtl.xaml.cs</Link>
+      <DependentUpon>PaginationDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\PasswordBoxDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\PasswordBoxDemoCtl.xaml.cs</Link>
+      <DependentUpon>PasswordBoxDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\PinBoxDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\PinBoxDemoCtl.xaml.cs</Link>
+      <DependentUpon>PinBoxDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\PoptipDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\PoptipDemoCtl.xaml.cs</Link>
+      <DependentUpon>PoptipDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\PreviewSliderDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\PreviewSliderDemoCtl.xaml.cs</Link>
+      <DependentUpon>PreviewSliderDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ProgressBarDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\ProgressBarDemoCtl.xaml.cs</Link>
+      <DependentUpon>ProgressBarDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ProgressButtonDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\ProgressButtonDemoCtl.xaml.cs</Link>
+      <DependentUpon>ProgressButtonDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\RangeSliderDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\RangeSliderDemoCtl.xaml.cs</Link>
+      <DependentUpon>RangeSliderDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\RateDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\RateDemoCtl.xaml.cs</Link>
+      <DependentUpon>RateDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\RelativePanelDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\RelativePanelDemoCtl.xaml.cs</Link>
+      <DependentUpon>RelativePanelDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\RunningBlockDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\RunningBlockDemoCtl.xaml.cs</Link>
+      <DependentUpon>RunningBlockDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ScreenshotDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\ScreenshotDemoCtl.xaml.cs</Link>
+      <DependentUpon>ScreenshotDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ScrollViewerDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\ScrollViewerDemoCtl.xaml.cs</Link>
+      <DependentUpon>ScrollViewerDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\SearchBarDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\SearchBarDemoCtl.xaml.cs</Link>
+      <DependentUpon>SearchBarDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\ShieldDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\ShieldDemoCtl.xaml.cs</Link>
+      <DependentUpon>ShieldDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\SideMenuDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\SideMenuDemoCtl.xaml.cs</Link>
+      <DependentUpon>SideMenuDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\SplitButtonDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\SplitButtonDemoCtl.xaml.cs</Link>
+      <DependentUpon>SplitButtonDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\SpriteDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\SpriteDemoCtl.xaml.cs</Link>
+      <DependentUpon>SpriteDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\StepBarDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\StepBarDemoCtl.xaml.cs</Link>
+      <DependentUpon>StepBarDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\TabControlDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\TabControlDemoCtl.xaml.cs</Link>
+      <DependentUpon>TabControlDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\TagDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\TagDemoCtl.xaml.cs</Link>
+      <DependentUpon>TagDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\TextBoxDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\TextBoxDemoCtl.xaml.cs</Link>
+      <DependentUpon>TextBoxDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\TimeBarDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\TimeBarDemoCtl.xaml.cs</Link>
+      <DependentUpon>TimeBarDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\TimePickerDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\TimePickerDemoCtl.xaml.cs</Link>
+      <DependentUpon>TimePickerDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\TransferDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\TransferDemoCtl.xaml.cs</Link>
+      <DependentUpon>TransferDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\TransitioningContentControlDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\TransitioningContentControlDemoCtl.xaml.cs</Link>
+      <DependentUpon>TransitioningContentControlDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\WaterfallPanelDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\WaterfallPanelDemoCtl.xaml.cs</Link>
+      <DependentUpon>WaterfallPanelDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Controls\WindowDemoCtl.xaml.cs">
+      <Link>UserControl\Controls\WindowDemoCtl.xaml.cs</Link>
+      <DependentUpon>WindowDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\BorderDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\BorderDemoCtl.xaml.cs</Link>
+      <DependentUpon>BorderDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\BrushDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\BrushDemoCtl.xaml.cs</Link>
+      <DependentUpon>BrushDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\ButtonDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\ButtonDemoCtl.xaml.cs</Link>
+      <DependentUpon>ButtonDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\CalendarDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\CalendarDemoCtl.xaml.cs</Link>
+      <DependentUpon>CalendarDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\CheckBoxDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\CheckBoxDemoCtl.xaml.cs</Link>
+      <DependentUpon>CheckBoxDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\DataGridDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\DataGridDemoCtl.xaml.cs</Link>
+      <DependentUpon>DataGridDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\ExpanderDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\ExpanderDemoCtl.xaml.cs</Link>
+      <DependentUpon>ExpanderDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\FlowDocumentDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\FlowDocumentDemoCtl.xaml.cs</Link>
+      <DependentUpon>FlowDocumentDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\FrameDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\FrameDemoCtl.xaml.cs</Link>
+      <DependentUpon>FrameDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\GroupBoxDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\GroupBoxDemoCtl.xaml.cs</Link>
+      <DependentUpon>GroupBoxDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\LabelDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\LabelDemoCtl.xaml.cs</Link>
+      <DependentUpon>LabelDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\ListBoxDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\ListBoxDemoCtl.xaml.cs</Link>
+      <DependentUpon>ListBoxDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\ListViewDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\ListViewDemoCtl.xaml.cs</Link>
+      <DependentUpon>ListViewDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\MenuDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\MenuDemoCtl.xaml.cs</Link>
+      <DependentUpon>MenuDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\NativeComboBoxDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\NativeComboBoxDemoCtl.xaml.cs</Link>
+      <DependentUpon>NativeComboBoxDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\NativeDatePickerDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\NativeDatePickerDemoCtl.xaml.cs</Link>
+      <DependentUpon>NativeDatePickerDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\NativePasswordBoxDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\NativePasswordBoxDemoCtl.xaml.cs</Link>
+      <DependentUpon>NativePasswordBoxDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\NativeProgressBarDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\NativeProgressBarDemoCtl.xaml.cs</Link>
+      <DependentUpon>NativeProgressBarDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\NativeScrollViewerDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\NativeScrollViewerDemoCtl.xaml.cs</Link>
+      <DependentUpon>NativeScrollViewerDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\NativeTabControlDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\NativeTabControlDemoCtl.xaml.cs</Link>
+      <DependentUpon>NativeTabControlDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\NativeTextBoxDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\NativeTextBoxDemoCtl.xaml.cs</Link>
+      <DependentUpon>NativeTextBoxDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\NativeWindowDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\NativeWindowDemoCtl.xaml.cs</Link>
+      <DependentUpon>NativeWindowDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\RadioButtonDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\RadioButtonDemoCtl.xaml.cs</Link>
+      <DependentUpon>RadioButtonDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\RepeatButtonDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\RepeatButtonDemoCtl.xaml.cs</Link>
+      <DependentUpon>RepeatButtonDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\RichTextBoxDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\RichTextBoxDemoCtl.xaml.cs</Link>
+      <DependentUpon>RichTextBoxDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\SliderDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\SliderDemoCtl.xaml.cs</Link>
+      <DependentUpon>SliderDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\TextBlockDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\TextBlockDemoCtl.xaml.cs</Link>
+      <DependentUpon>TextBlockDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\ToggleButtonDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\ToggleButtonDemoCtl.xaml.cs</Link>
+      <DependentUpon>ToggleButtonDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\ToolBarDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\ToolBarDemoCtl.xaml.cs</Link>
+      <DependentUpon>ToolBarDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Styles\TreeViewDemoCtl.xaml.cs">
+      <Link>UserControl\Styles\TreeViewDemoCtl.xaml.cs</Link>
+      <DependentUpon>TreeViewDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Tools\EffectsDemoCtl.xaml.cs">
+      <Link>UserControl\Tools\EffectsDemoCtl.xaml.cs</Link>
+      <DependentUpon>EffectsDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Tools\GeometryAnimationDemoCtl.xaml.cs">
+      <Link>UserControl\Tools\GeometryAnimationDemoCtl.xaml.cs</Link>
+      <DependentUpon>GeometryAnimationDemoCtl.xaml</DependentUpon>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\UserControl\Tools\HatchBrushGeneratorDemoCtl.xaml.cs">
+      <Link>UserControl\Tools\HatchBrushGeneratorDemoCtl.xaml.cs</Link>
+      <DependentUpon>HatchBrushGeneratorDemoCtl.xaml</DependentUpon>
+    </Resource>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="..\HandyControlDemo_Shared\ViewModel\Basic\ChatBoxViewModel.cs" CopyToOutputDirectory="PreserveNewest">
+      <Link>ViewModel\ChatBoxViewModel.cs</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\ViewModel\Basic\InteractiveDialogViewModel.cs">
+      <Link>ViewModel\InteractiveDialogViewModel.cs</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\ViewModel\Common\ComboBoxDemoViewModel.cs">
+      <Link>ViewModel\ComboBoxDemoViewModel.cs</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\ViewModel\Controls\BadgeDemoViewModel.cs">
+      <Link>ViewModel\BadgeDemoViewModel.cs</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\ViewModel\Controls\CardDemoViewModel.cs">
+      <Link>ViewModel\CardDemoViewModel.cs</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\ViewModel\Controls\CoverViewModel.cs">
+      <Link>ViewModel\CoverViewModel.cs</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\ViewModel\Controls\DialogDemoViewModel.cs">
+      <Link>ViewModel\DialogDemoViewModel.cs</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\ViewModel\Controls\GrowlDemoViewModel.cs">
+      <Link>ViewModel\GrowlDemoViewModel.cs</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\ViewModel\Controls\ImageBrowserDemoViewModel.cs">
+      <Link>ViewModel\ImageBrowserDemoViewModel.cs</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\ViewModel\Controls\NotificationDemoViewModel.cs">
+      <Link>ViewModel\NotificationDemoViewModel.cs</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\ViewModel\Controls\NotifyIconDemoViewModel.cs">
+      <Link>ViewModel\NotifyIconDemoViewModel.cs</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\ViewModel\Controls\PaginationDemoViewModel.cs">
+      <Link>ViewModel\PaginationDemoViewModel.cs</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\ViewModel\Controls\SearchBarDemoViewModel.cs">
+      <Link>ViewModel\SearchBarDemoViewModel.cs</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\ViewModel\Controls\SideMenuDemoViewModel.cs">
+      <Link>ViewModel\SideMenuDemoViewModel.cs</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\ViewModel\Controls\SplitButtonDemoViewModel.cs">
+      <Link>ViewModel\SplitButtonDemoViewModel.cs</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\ViewModel\Controls\SpriteDemoViewModel.cs">
+      <Link>ViewModel\SpriteDemoViewModel.cs</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\ViewModel\Controls\StepBarDemoViewModel.cs">
+      <Link>ViewModel\StepBarDemoViewModel.cs</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\ViewModel\Controls\TabControlDemoViewModel.cs">
+      <Link>ViewModel\TabControlDemoViewModel.cs</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\ViewModel\Controls\WindowDemoViewModel.cs">
+      <Link>ViewModel\WindowDemoViewModel.cs</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\ViewModel\DemoViewModelBase!1.cs">
+      <Link>ViewModel\DemoViewModelBase!1.cs</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\ViewModel\Main\ItemsDisplayViewModel.cs">
+      <Link>ViewModel\ItemsDisplayViewModel.cs</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\ViewModel\Main\MainViewModel.cs">
+      <Link>ViewModel\MainViewModel.cs</Link>
+    </Resource>
+    <Resource Include="..\HandyControlDemo_Shared\ViewModel\Main\NoUserViewModel.cs">
+      <Link>ViewModel\NoUserViewModel.cs</Link>
+    </Resource>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="PresentationFramework" />
+    <Reference Include="System" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

src/Shared/HandyControlDemo_Shared/App.xaml.cs

@@ -3,6 +3,7 @@ using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Net;
+using System.Runtime;
 using System.Security.Authentication; 
 using System.Threading;
 using System.Windows;
@@ -20,6 +21,19 @@ namespace HandyControlDemo
         private static Mutex AppMutex;
 #pragma warning restore IDE0052
 
+        public App()
+        {
+#if !netle40
+            var cachePath = $"{AppDomain.CurrentDomain.BaseDirectory}Cache";
+            if (!Directory.Exists(cachePath))
+            {
+                Directory.CreateDirectory(cachePath);
+            }
+            ProfileOptimization.SetProfileRoot(cachePath);
+            ProfileOptimization.StartProfile("Profile");
+#endif
+        }
+
         protected override void OnStartup(StartupEventArgs e)
         {
             AppMutex = new Mutex(true, "HandyControlDemo", out var createdNew);
@@ -56,7 +70,6 @@ namespace HandyControlDemo
                     UpdateSkin(GlobalData.Config.Skin);
                 }
 
-                ConfigHelper.Instance.SetWindowDefaultStyle();
                 ConfigHelper.Instance.SetSystemVersionInfo(CommonHelper.GetSystemVersionInfo());
 
                 ServicePointManager.SecurityProtocol = (SecurityProtocolType)(SslProtocols)0x00000C00;

src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json

@@ -26,10 +26,12 @@
       [ "GroupBox", "GroupBoxDemoCtl", "GroupBox_16x", "" ],
       [ "Menu", "MenuDemoCtl", "ContextMenu_16x", "" ],
       [ "RichTextBox", "RichTextBoxDemoCtl", "RichTextBox_16x", "" ],
-      [ "FlowDocumentScrollViewer", "FlowDocumentScrollViewerDemoCtl", "WPFFlowDocument_16x", "1" ],
+      [ "FlowDocument", "FlowDocumentDemoCtl", "WPFFlowDocument_16x", "1" ],
       [ "ToolBar", "ToolBarDemoCtl", "ToolBar_16x", "" ],
       [ "Border", "BorderDemoCtl", "BorderElement_16x", "" ],
-      [ "Label", "LabelDemoCtl", "Label_16x", "" ]
+      [ "Label", "LabelDemoCtl", "Label_16x", "" ],
+	  [ "Frame", "FrameDemoCtl", "frame_16xLG", "1" ],
+	  [ "Window", "NativeWindowDemoCtl", "WindowsForm_16x", "1" ]
     ]
   },
   {
@@ -70,7 +72,7 @@
       [ "Divider", "DividerDemoCtl", "DottedSplitter_16x", "" ],
       [ "CirclePanel", "CirclePanelDemoCtl", "ColorWheel_16x", "" ],
       [ "Grid", "GridDemoCtl", "GridPane_16x", "" ],
-      [ "RelativePanel", "RelativePanelDemoCtl", "TransformRelative_16x", "1" ],
+      [ "RelativePanel", "RelativePanelDemoCtl", "TransformRelative_16x", "" ],
       [ "WaterfallPanel", "WaterfallPanelDemoCtl", "Panel_16x", "" ],
       [ "HoneycombPanel", "HoneycombPanelDemoCtl", "PolygonHexagon_16x", "" ],
       [ "TransitioningContentControl", "TransitioningContentControlDemoCtl", "TransitioningContentControl_16x", "" ],
@@ -96,6 +98,7 @@
       [ "Sprite", "SpriteDemoCtl", "HandyControl", "" ],
       [ "Notification", "NotificationDemoCtl", "Procedure_16x", "" ],
       [ "Dialog", "DialogDemoCtl", "Dialog_16x", "" ],
+      [ "Screenshot", "ScreenshotDemoCtl", "WindowScreenshot_16x", "1" ],
       [ "Window", "WindowDemoCtl", "WindowsForm_16x", "1" ]
     ]
   },
@@ -104,7 +107,7 @@
     "demoItemList": [
       [ "HatchBrushGenerator", "HatchBrushGeneratorDemoCtl", "DataGenerator_16x", "" ],
       [ "Morphing Animation", "GeometryAnimationDemoCtl", "Animation_16x", "" ],
-      [ "Effects", "EffectsDemoCtl", "Effects_16x", "1" ]
+      [ "Effects", "EffectsDemoCtl", "Effects_16x", "" ]
     ]
   }
 ]

src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs

@@ -18,7 +18,7 @@
 
         public static readonly string MainWindow = nameof(MainWindow);
 
-        public static readonly string OverView = nameof(OverView);
+        public static readonly string PracticalDemo = nameof(PracticalDemo);
 
         public static readonly string ProjectsView = nameof(ProjectsView);
 
@@ -42,5 +42,9 @@
 
         public static readonly string GlowWindow = nameof(GlowWindow);
 
+        public static readonly string NativeCommonWindow = nameof(NativeCommonWindow);
+
+        public static readonly string NavigationWindow = nameof(NavigationWindow);
+
     }
 }

src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt

@@ -12,7 +12,7 @@ var messageList = new List<string>
 	"GrowlDemoPanel",
 	"DialogDemoWindow",
 	"MainWindow",
-	"OverView",
+	"PracticalDemo",
 	"ProjectsView",
 	"BlogsView",
 	"WebsitesView",
@@ -23,7 +23,9 @@ var messageList = new List<string>
 	"CustomNonClientAreaWindow",
 	"NoNonClientAreaDragableWindow",
 	"QQGroupView",
-	"GlowWindow"
+	"GlowWindow",
+	"NativeCommonWindow",
+	"NavigationWindow"
 };
 #>
 namespace HandyControlDemo.Data

src/Shared/HandyControlDemo_Shared/Data/Model/DemoInfoModel.cs

@@ -5,6 +5,8 @@ namespace HandyControlDemo.Data
 {
     public class DemoInfoModel : ViewModelBase
     {
+        public string Key { get; set; }
+
         private string _title;
 
         public string Title
@@ -17,7 +19,7 @@ namespace HandyControlDemo.Data
 #endif
         }
 
-        private int _selectedIndex = -1;
+        private int _selectedIndex;
 
         public int SelectedIndex
         {

src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems

@@ -35,7 +35,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\StringRepeatConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\AssemblyHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\CommonHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\ExternDllHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\Win32Helper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Basic\Avatar.xaml.cs">
       <DependentUpon>Avatar.xaml</DependentUpon>
@@ -191,6 +190,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\RunningBlockDemoCtl.xaml.cs">
       <DependentUpon>RunningBlockDemoCtl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\ScreenshotDemoCtl.xaml.cs">
+      <DependentUpon>ScreenshotDemoCtl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\ScrollViewerDemoCtl.xaml.cs">
       <DependentUpon>ScrollViewerDemoCtl.xaml</DependentUpon>
     </Compile>
@@ -251,8 +253,8 @@
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\ProjectsView.xaml.cs">
       <DependentUpon>ProjectsView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\OverView.xaml.cs">
-      <DependentUpon>OverView.xaml</DependentUpon>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\PracticalDemo.cs">
+      <DependentUpon>PracticalDemo.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\ContributorsView.xaml.cs">
       <DependentUpon>ContributorsView.xaml</DependentUpon>
@@ -272,6 +274,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\WebsitesView.xaml.cs">
       <DependentUpon>WebsitesView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Practical\Login.xaml.cs">
+      <DependentUpon>Login.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\BorderDemoCtl.xaml.cs">
       <DependentUpon>BorderDemoCtl.xaml</DependentUpon>
     </Compile>
@@ -293,8 +298,11 @@
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\ExpanderDemoCtl.xaml.cs">
       <DependentUpon>ExpanderDemoCtl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\FlowDocumentScrollViewerDemoCtl.xaml.cs">
-      <DependentUpon>FlowDocumentScrollViewerDemoCtl.xaml</DependentUpon>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\FlowDocumentDemoCtl.xaml.cs">
+      <DependentUpon>FlowDocumentDemoCtl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\FrameDemoCtl.xaml.cs">
+      <DependentUpon>FrameDemoCtl.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\GroupBoxDemoCtl.xaml.cs">
       <DependentUpon>GroupBoxDemoCtl.xaml</DependentUpon>
@@ -332,6 +340,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\NativeTextBoxDemoCtl.xaml.cs">
       <DependentUpon>NativeTextBoxDemoCtl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\NativeWindowDemoCtl.xaml.cs">
+      <DependentUpon>NativeWindowDemoCtl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\RadioButtonDemoCtl.xaml.cs">
       <DependentUpon>RadioButtonDemoCtl.xaml</DependentUpon>
     </Compile>
@@ -413,6 +424,12 @@
     <Compile Include="$(MSBuildThisFileDirectory)Window\GrowlDemoWindow.xaml.cs">
       <DependentUpon>GrowlDemoWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Window\NativeCommonWindow.xaml.cs">
+      <DependentUpon>NativeCommonWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Window\NavigationWindow.xaml.cs">
+      <DependentUpon>NavigationWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Window\NoNonClientAreaDragableWindow.xaml.cs">
       <DependentUpon>NoNonClientAreaDragableWindow.xaml</DependentUpon>
     </Compile>
@@ -670,6 +687,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\ScreenshotDemoCtl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\ScrollViewerDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -750,7 +771,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)UserControl\Main\OverView.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Main\PracticalDemo.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -778,6 +799,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Practical\Login.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)UserControl\Styles\BorderDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -806,7 +831,11 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)UserControl\Styles\FlowDocumentScrollViewerDemoCtl.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Styles\FlowDocumentDemoCtl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Styles\FrameDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -858,6 +887,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Styles\NativeWindowDemoCtl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)UserControl\Styles\RadioButtonDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -934,6 +967,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Window\NativeCommonWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Window\NavigationWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Window\NoNonClientAreaDragableWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

src/Shared/HandyControlDemo_Shared/MainWindow.xaml

@@ -1,4 +1,4 @@
-<hc:BlurWindow x:Class="HandyControlDemo.MainWindow"
+<hc:Window x:Class="HandyControlDemo.MainWindow"
                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -9,6 +9,7 @@
                mc:Ignorable="d"
                Title="HandyControlDemo"
                ShowTitle="False"
+               Background="{DynamicResource SecondaryRegionBrush}"
                ResizeMode="CanResizeWithGrip"
                WindowStartupLocation="CenterScreen"
                DataContext="{Binding Main,Source={StaticResource Locator}}"
@@ -25,18 +26,18 @@
     <hc:Window.NonClientAreaContent>
         <userControl:NoUserContent/>
     </hc:Window.NonClientAreaContent>
-    <Border BorderThickness="0,1,0,0" BorderBrush="{DynamicResource BorderBrush}">
+    <Border BorderThickness="0,1,0,0" BorderBrush="{DynamicResource BorderBrush}" Background="{StaticResource CloudDrawingBrush}">
         <Grid>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="200" MinWidth="200" MaxWidth="400"/>
+                <ColumnDefinition Width="240" MinWidth="240" MaxWidth="400"/>
                 <ColumnDefinition MinWidth="200"/>
             </Grid.ColumnDefinitions>
             <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}"/>
+            <userControl:MainContent Grid.Column="1" d:IsHidden="true"/>
+            <GridSplitter Margin="0,26,10,26" Grid.Column="0" HorizontalAlignment="Right" Width="4" Background="Transparent"/>
             <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>
     </Border>
-</hc:BlurWindow>
+</hc:Window>

src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs

@@ -19,7 +19,7 @@ namespace HandyControlDemo
             base.OnInitialized(e);
 
             Messenger.Default.Send(true, MessageToken.FullSwitch);
-            Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.OverView}"), MessageToken.LoadShowContent);
+            Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.PracticalDemo}"), MessageToken.LoadShowContent);
         }
 
         protected override void OnClosing(CancelEventArgs e)

src/Shared/HandyControlDemo_Shared/Properties/App.config

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+</configuration>

src/Shared/HandyControlDemo_Shared/Properties/AssemblyInfo.cs

@@ -13,5 +13,5 @@ using System.Windows;
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
-[assembly: AssemblyVersion("2.4.0")]
+[assembly: AssemblyVersion("2.5.0")]
 #endif

src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs

@@ -627,6 +627,33 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 流文档 的本地化字符串。
+        /// </summary>
+        public static string FlowDocument {
+            get {
+                return ResourceManager.GetString("FlowDocument", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 流文档单页视图 的本地化字符串。
+        /// </summary>
+        public static string FlowDocumentPageViewer {
+            get {
+                return ResourceManager.GetString("FlowDocumentPageViewer", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 流文档查看器 的本地化字符串。
+        /// </summary>
+        public static string FlowDocumentReader {
+            get {
+                return ResourceManager.GetString("FlowDocumentReader", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 流文档滚动视图 的本地化字符串。
         /// </summary>
@@ -636,6 +663,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 导航框架 的本地化字符串。
+        /// </summary>
+        public static string Frame {
+            get {
+                return ResourceManager.GetString("Frame", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Gif图片 的本地化字符串。
         /// </summary>
@@ -1086,6 +1122,24 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 点击打开原生常规窗口 的本地化字符串。
+        /// </summary>
+        public static string OpenNativeCommonWindow {
+            get {
+                return ResourceManager.GetString("OpenNativeCommonWindow", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 点击打开导航窗口 的本地化字符串。
+        /// </summary>
+        public static string OpenNavigationWindow {
+            get {
+                return ResourceManager.GetString("OpenNavigationWindow", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 打开无非客户端区域可拖拽窗口 的本地化字符串。
         /// </summary>
@@ -1122,15 +1176,6 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
-        /// <summary>
-        ///   查找类似 概览 的本地化字符串。
-        /// </summary>
-        public static string Overview {
-            get {
-                return ResourceManager.GetString("Overview", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 页码条 的本地化字符串。
         /// </summary>
@@ -1221,6 +1266,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 实用例子 的本地化字符串。
+        /// </summary>
+        public static string PracticalDemos {
+            get {
+                return ResourceManager.GetString("PracticalDemos", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 上一步 的本地化字符串。
         /// </summary>
@@ -1428,6 +1482,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 截图 的本地化字符串。
+        /// </summary>
+        public static string Screenshot {
+            get {
+                return ResourceManager.GetString("Screenshot", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 滚动视图 的本地化字符串。
         /// </summary>
@@ -1545,6 +1608,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 开始截图 的本地化字符串。
+        /// </summary>
+        public static string StartScreenshot {
+            get {
+                return ResourceManager.GetString("StartScreenshot", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 保持打开 的本地化字符串。
         /// </summary>

src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx

@@ -576,9 +576,6 @@
   <data name="SideMenu" xml:space="preserve">
     <value>SideMenu</value>
   </data>
-  <data name="Overview" xml:space="preserve">
-    <value>Overview</value>
-  </data>
   <data name="Grid" xml:space="preserve">
     <value>Grid</value>
   </data>
@@ -720,4 +717,31 @@
   <data name="OpenGlowWindow" xml:space="preserve">
     <value>Open glowWindow</value>
   </data>
+  <data name="FlowDocument" xml:space="preserve">
+    <value>FlowDocument</value>
+  </data>
+  <data name="FlowDocumentPageViewer" xml:space="preserve">
+    <value>FlowDocumentPageViewer</value>
+  </data>
+  <data name="FlowDocumentReader" xml:space="preserve">
+    <value>FlowDocumentReader</value>
+  </data>
+  <data name="OpenNativeCommonWindow" xml:space="preserve">
+    <value>Open native common window</value>
+  </data>
+  <data name="OpenNavigationWindow" xml:space="preserve">
+    <value>Open navigation window</value>
+  </data>
+  <data name="Frame" xml:space="preserve">
+    <value>Frame</value>
+  </data>
+  <data name="PracticalDemos" xml:space="preserve">
+    <value>Practical demos</value>
+  </data>
+  <data name="StartScreenshot" xml:space="preserve">
+    <value>Start screenshot</value>
+  </data>
+  <data name="Screenshot" xml:space="preserve">
+    <value>Screenshot</value>
+  </data>
 </root>

src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx

@@ -576,9 +576,6 @@
   <data name="SideMenu" xml:space="preserve">
     <value>SideMenu</value>
   </data>
-  <data name="Overview" xml:space="preserve">
-    <value>دید کلی</value>
-  </data>
   <data name="Grid" xml:space="preserve">
     <value>Grid</value>
   </data>
@@ -720,4 +717,31 @@
   <data name="OpenGlowWindow" xml:space="preserve">
     <value>Open glowWindow</value>
   </data>
+  <data name="FlowDocument" xml:space="preserve">
+    <value>FlowDocument</value>
+  </data>
+  <data name="FlowDocumentPageViewer" xml:space="preserve">
+    <value>FlowDocumentPageViewer</value>
+  </data>
+  <data name="FlowDocumentReader" xml:space="preserve">
+    <value>FlowDocumentReader</value>
+  </data>
+  <data name="OpenNativeCommonWindow" xml:space="preserve">
+    <value>Open native common window</value>
+  </data>
+  <data name="OpenNavigationWindow" xml:space="preserve">
+    <value>Open navigation window</value>
+  </data>
+  <data name="Frame" xml:space="preserve">
+    <value>Frame</value>
+  </data>
+  <data name="PracticalDemos" xml:space="preserve">
+    <value>Practical demos</value>
+  </data>
+  <data name="StartScreenshot" xml:space="preserve">
+    <value>Start screenshot</value>
+  </data>
+  <data name="Screenshot" xml:space="preserve">
+    <value>Screenshot</value>
+  </data>
 </root>

src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx

@@ -576,9 +576,6 @@
   <data name="SideMenu" xml:space="preserve">
     <value>SideMenu</value>
   </data>
-  <data name="Overview" xml:space="preserve">
-    <value>Vue d'ensemble</value>
-  </data>
   <data name="Grid" xml:space="preserve">
     <value>Grid</value>
   </data>
@@ -720,4 +717,31 @@
   <data name="OpenGlowWindow" xml:space="preserve">
     <value>Open glowWindow</value>
   </data>
+  <data name="FlowDocument" xml:space="preserve">
+    <value>FlowDocument</value>
+  </data>
+  <data name="FlowDocumentPageViewer" xml:space="preserve">
+    <value>FlowDocumentPageViewer</value>
+  </data>
+  <data name="FlowDocumentReader" xml:space="preserve">
+    <value>FlowDocumentReader</value>
+  </data>
+  <data name="OpenNativeCommonWindow" xml:space="preserve">
+    <value>Open native common window</value>
+  </data>
+  <data name="OpenNavigationWindow" xml:space="preserve">
+    <value>Open navigation window</value>
+  </data>
+  <data name="Frame" xml:space="preserve">
+    <value>Frame</value>
+  </data>
+  <data name="PracticalDemos" xml:space="preserve">
+    <value>Practical demos</value>
+  </data>
+  <data name="StartScreenshot" xml:space="preserve">
+    <value>Start screenshot</value>
+  </data>
+  <data name="Screenshot" xml:space="preserve">
+    <value>Screenshot</value>
+  </data>
 </root>

src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx

@@ -465,9 +465,6 @@
   <data name="OutlineText" xml:space="preserve">
     <value>OutlineText</value>
   </data>
-  <data name="Overview" xml:space="preserve">
-    <value>Overview</value>
-  </data>
   <data name="Pagination" xml:space="preserve">
     <value>Pagination</value>
   </data>
@@ -720,4 +717,31 @@
   <data name="OpenGlowWindow" xml:space="preserve">
     <value>Open glowWindow</value>
   </data>
+  <data name="FlowDocument" xml:space="preserve">
+    <value>FlowDocument</value>
+  </data>
+  <data name="FlowDocumentPageViewer" xml:space="preserve">
+    <value>FlowDocumentPageViewer</value>
+  </data>
+  <data name="FlowDocumentReader" xml:space="preserve">
+    <value>FlowDocumentReader</value>
+  </data>
+  <data name="OpenNativeCommonWindow" xml:space="preserve">
+    <value>Open native common window</value>
+  </data>
+  <data name="OpenNavigationWindow" xml:space="preserve">
+    <value>Open navigation window</value>
+  </data>
+  <data name="Frame" xml:space="preserve">
+    <value>Frame</value>
+  </data>
+  <data name="PracticalDemos" xml:space="preserve">
+    <value>Practical demos</value>
+  </data>
+  <data name="StartScreenshot" xml:space="preserve">
+    <value>Start screenshot</value>
+  </data>
+  <data name="Screenshot" xml:space="preserve">
+    <value>Screenshot</value>
+  </data>
 </root>