Merge branch 'master' into pr/75

README.md

@@ -46,8 +46,22 @@ Step 2：Add code in App.xaml as follows:
 ```
 Step 3：enjoy coding
 
+## Overview
+
+![Overview](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Overview.png)
+
+![Overview-dark](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Overview-dark.png)
+
 ## Latest examples
 
+### Grid
+
+![Grid](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Grid.gif)
+
+### SideMenu
+
+![SideMenu](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/SideMenu.png)
+
 ### NotifyIcon
 
 ![NotifyIcon](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/NotifyIcon.png)
@@ -60,6 +74,8 @@ Step 3：enjoy coding
 
 ![WaveProgressBar](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/WaveProgressBar.gif)
 
+## History publication
+
 ### Badge
 
 ![Badge](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Badge.png)
@@ -68,8 +84,6 @@ Step 3：enjoy coding
 
 ![Gravatar](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Gravatar.gif)
 
-## History publication
-
 ### GoToTop
 
 ![GoToTop](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/GoToTop.gif)

src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj

@@ -5,7 +5,7 @@
     <UseWPF>true</UseWPF>
     <AssemblyName>HandyControlDemo</AssemblyName>
     <RootNamespace>HandyControlDemo</RootNamespace>
-    <Version>1.5.4</Version>
+    <Version>1.5.5</Version>
     <ApplicationIcon>..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -19,6 +19,20 @@
     <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Shared\HandyControlDemo_Shared\Data\MessageToken.cs">
+      <Link>Data\MessageToken.cs</Link>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>MessageToken.tt</DependentUpon>
+    </Compile>
+    <Compile Include="..\..\Shared\HandyControlDemo_Shared\Properties\Langs\Lang.Designer.cs">
+      <Link>Properties\Langs\Lang.Designer.cs</Link>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Lang.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
   <ItemGroup>
     <Compile Remove="Properties\AssemblyInfo.cs" />
     <Compile Remove="Properties\Langs\Lang.en.Designer.cs" />
@@ -235,6 +249,9 @@
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\RadioButton_16x.png">
       <Link>Resources\Img\LeftMainContent\RadioButton_16x.png</Link>
     </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\RepeatButton_16x.png">
+      <Link>Resources\Img\LeftMainContent\RepeatButton_16x.png</Link>
+    </Resource>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\RichTextBox_16x.png">
       <Link>Resources\Img\LeftMainContent\RichTextBox_16x.png</Link>
     </Resource>
@@ -298,12 +315,61 @@
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\WindowsForm_16x.png">
       <Link>Resources\Img\LeftMainContent\WindowsForm_16x.png</Link>
     </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\WindowsForm_16x.png">
+      <Link>Resources\Img\LeftMainContent\GridPane_16x.png</Link>
+    </Resource>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\qq-group.jpg">
       <Link>Resources\Img\qq-group.jpg</Link>
     </Resource>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\under_construction.gif">
       <Link>Resources\Img\under_construction.gif</Link>
     </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\DevOps\DevOps-Boards.png">
+      <Link>Resources\Img\DevOps\DevOps-Boards.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\DevOps\DevOps-Overview.png">
+      <Link>Resources\Img\DevOps\DevOps-Overview.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\DevOps\DevOps-Pipelines.png">
+      <Link>Resources\Img\DevOps\DevOps-Pipelines.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\DevOps\DevOps-Repos.png">
+      <Link>Resources\Img\DevOps\DevOps-Repos.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\DevOps\DevOps-TestPlans.png">
+      <Link>Resources\Img\DevOps\DevOps-TestPlans.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\MainMenuControl_16x.png">
+      <Link>Resources\Img\LeftMainContent\MainMenuControl_16x.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\fabric-icons.ttf">
+      <Link>Resources\fabric-icons.ttf</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\MainMenuControl_16x.png">
+      <Link>Resources\Img\LeftMainContent\MainMenuControl_16x.png</Link>
+    </Resource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="..\..\Shared\HandyControlDemo_Shared\Properties\Langs\Lang.en.resx">
+      <Link>Properties\Langs\Lang.en.resx</Link>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\Shared\HandyControlDemo_Shared\Properties\Langs\Lang.resx">
+      <Link>Properties\Langs\Lang.resx</Link>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Lang.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\..\Shared\HandyControlDemo_Shared\Data\MessageToken.tt">
+      <Link>Data\MessageToken.tt</Link>
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>MessageToken.cs</LastGenOutput>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\Shared\HandyControlDemo_Shared\Data\MessageToken.tt" Link="Data\MessageToken.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+    </None>
   </ItemGroup>
   <Import Project="..\..\Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems" Label="Shared" />
 </Project>

src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj

@@ -4,8 +4,8 @@
     <UseWPF>true</UseWPF>
     <AssemblyName>HandyControl</AssemblyName>
     <RootNamespace>HandyControl</RootNamespace>
-    <Version>1.5.4</Version>
-    <AssemblyVersion>1.5.4.0</AssemblyVersion>
+    <Version>1.5.5</Version>
+    <AssemblyVersion>1.5.5.0</AssemblyVersion>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
   </PropertyGroup>
@@ -16,6 +16,24 @@
     <DefineConstants>TRACE;Core</DefineConstants>
     <DocumentationFile>C:\Code\GitHub\HandyControl\src\Core_30\HandyControl_Core_30\HandyControl.xml</DocumentationFile>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Shared\HandyControl_Shared\Properties\Langs\Lang.Designer.cs">
+      <Link>Properties\Langs\Lang.Designer.cs</Link>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Lang.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="..\..\Shared\HandyControl_Shared\Properties\Langs\Lang.en.resx">
+      <Link>Properties\Langs\Lang.en.resx</Link>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\Shared\HandyControl_Shared\Properties\Langs\Lang.resx">
+      <Link>Properties\Langs\Lang.resx</Link>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Lang.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="..\..\Shared\HandyControl_Shared\HandyControl_Shared.projitems" Label="Shared" />
   <ItemGroup>
     <None Remove="Themes\Styles\Base\TreeViewBaseStyle.xaml" />

src/Core_30/HandyControl_Core_30/Themes/Styles/Base/ComboBoxBaseStyle.xaml

@@ -887,6 +887,147 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
+    <ControlTemplate x:Key="ComboBoxPlusEditableTopAutoCompleteTemplate" TargetType="controls:ComboBox">
+        <ControlTemplate.Resources>
+            <Storyboard x:Key="StoryboardShow">
+                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2"/>
+            </Storyboard>
+            <Storyboard x:Key="StoryboardHidden">
+                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0"/>
+            </Storyboard>
+        </ControlTemplate.Resources>
+        <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="{Binding Path=(controls:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition Width="Auto" MinWidth="30"/>
+            </Grid.ColumnDefinitions>
+            <StackPanel Grid.ColumnSpan="2" Visibility="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" Orientation="Horizontal" Margin="{TemplateBinding Padding}">
+                <TextBlock Margin="1,0,0,0" Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
+            </StackPanel>
+            <Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
+                    <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
+                        <controls:SimplePanel RenderOptions.ClearTypeHint="Enabled">
+                            <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                <Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
+                            </Canvas>
+                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </controls:SimplePanel>
+                    </ScrollViewer>
+                </Border>
+            </Popup>
+            <Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup_AutoComplete" StaysOpen="False" AllowsTransparency="true" Grid.ColumnSpan="2" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder_AutoComplete" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
+                    <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer_AutoComplete">
+                        <controls:SimplePanel RenderOptions.ClearTypeHint="Enabled">
+                            <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                <Rectangle x:Name="opaqueRect_AutoComplete" Fill="{Binding Background, ElementName=dropDownBorder_AutoComplete}" Height="{Binding ActualHeight, ElementName=dropDownBorder_AutoComplete}" Width="{Binding ActualWidth, ElementName=dropDownBorder_AutoComplete}"/>
+                            </Canvas>
+                            <StackPanel Name="PART_AutoCompletePanel" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </controls:SimplePanel>
+                    </ScrollViewer>
+                </Border>
+            </Popup>
+            <TextBlock Grid.Column="0" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1"/>
+            <ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}"/>
+            <Border Grid.Row="1" Grid.Column="0" x:Name="border" Margin="-1,1">
+                <TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+            </Border>
+            <Button Grid.Column="1" Grid.Row="1" Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Style="{StaticResource ButtonIcon}" Padding="0,6" controls:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="HasItems" Value="false">
+                <Setter Property="Height" TargetName="dropDownBorder" Value="95"/>
+                <Setter Property="Height" TargetName="dropDownBorder_AutoComplete" Value="95"/>
+            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsGrouping" Value="true"/>
+                    <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+            </MultiTrigger>
+            <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer" Value="false">
+                <Setter Property="Canvas.Top" TargetName="opaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}"/>
+                <Setter Property="Canvas.Left" TargetName="opaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}"/>
+            </Trigger>
+            <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer_AutoComplete" Value="false">
+                <Setter Property="Canvas.Top" TargetName="opaqueRect_AutoComplete" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer_AutoComplete}"/>
+                <Setter Property="Canvas.Left" TargetName="opaqueRect_AutoComplete" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer_AutoComplete}"/>
+            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="border"/>
+                    <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
+                    <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear"/>
+                    <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
+                    <Condition Property="IsFocused" Value="true" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
+            </MultiTrigger>
+            <Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
+                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
+            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
+                    <Condition Property="ShowClearButton" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="border"/>
+                    <Condition Property="ShowClearButton" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear"/>
+                    <Condition Property="ShowClearButton" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
+            </MultiTrigger>
+            <Trigger Property="IsError" Value="true">
+                <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}"/>
+                <Trigger.EnterActions>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardShow}"/>
+                </Trigger.EnterActions>
+                <Trigger.ExitActions>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}"/>
+                </Trigger.ExitActions>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Opacity" Value="0.4" TargetName="toggleButton"/>
+                <Setter Property="Opacity" Value="0.4" TargetName="border"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
     <!--标题在左侧的Handy式可编辑下拉框模板-->
     <ControlTemplate x:Key="ComboBoxPlusEditableLeftTemplate" TargetType="controls:ComboBox">
         <ControlTemplate.Resources>
@@ -1009,6 +1150,144 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
+    <ControlTemplate x:Key="ComboBoxPlusEditableLeftAutoCompleteTemplate" TargetType="controls:ComboBox">
+        <ControlTemplate.Resources>
+            <Storyboard x:Key="StoryboardShow">
+                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2"/>
+            </Storyboard>
+            <Storyboard x:Key="StoryboardHidden">
+                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0"/>
+            </Storyboard>
+        </ControlTemplate.Resources>
+        <Grid x:Name="templateRoot" SnapsToDevicePixels="true" Height="{Binding Path=(controls:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="{Binding Path=(controls:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <ColumnDefinition/>
+                <ColumnDefinition Width="Auto" MinWidth="30"/>
+            </Grid.ColumnDefinitions>
+            <StackPanel VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="0,8,6,8" Visibility="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" Orientation="Horizontal">
+                <TextBlock Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
+            </StackPanel>
+            <Popup Grid.Column="1" x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
+                    <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
+                        <controls:SimplePanel RenderOptions.ClearTypeHint="Enabled">
+                            <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                <Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
+                            </Canvas>
+                            <ItemsPresenter KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </controls:SimplePanel>
+                    </ScrollViewer>
+                </Border>
+            </Popup>
+            <Popup Grid.Column="1" x:Name="PART_Popup_AutoComplete" AllowsTransparency="true" Grid.ColumnSpan="2" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder_AutoComplete" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
+                    <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer_AutoComplete">
+                        <controls:SimplePanel RenderOptions.ClearTypeHint="Enabled">
+                            <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                <Rectangle x:Name="opaqueRect_AutoComplete" Fill="{Binding Background, ElementName=dropDownBorder_AutoComplete}" Height="{Binding ActualHeight, ElementName=dropDownBorder_AutoComplete}" Width="{Binding ActualWidth, ElementName=dropDownBorder_AutoComplete}"/>
+                            </Canvas>
+                            <StackPanel Name="PART_AutoCompletePanel" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </controls:SimplePanel>
+                    </ScrollViewer>
+                </Border>
+            </Popup>
+            <TextBlock Grid.Column="1" Grid.ColumnSpan="2" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}"/>
+            <ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}"/>
+            <Border Grid.Column="1" x:Name="border" Background="Transparent" Margin="-1,1">
+                <TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+            </Border>
+            <Button Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="2" Style="{StaticResource ButtonIcon}" Padding="0,6" controls:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="HasItems" Value="false">
+                <Setter Property="Height" TargetName="dropDownBorder" Value="95"/>
+                <Setter Property="Height" TargetName="dropDownBorder_AutoComplete" Value="95"/>
+            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsGrouping" Value="true"/>
+                    <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+            </MultiTrigger>
+            <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer" Value="false">
+                <Setter Property="Canvas.Top" TargetName="opaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}"/>
+                <Setter Property="Canvas.Left" TargetName="opaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}"/>
+            </Trigger>
+            <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer_AutoComplete" Value="false">
+                <Setter Property="Canvas.Top" TargetName="opaqueRect_AutoComplete" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer_AutoComplete}"/>
+                <Setter Property="Canvas.Left" TargetName="opaqueRect_AutoComplete" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer_AutoComplete}"/>
+            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="border"/>
+                    <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
+                    <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear"/>
+                    <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
+                    <Condition Property="IsFocused" Value="true" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
+            </MultiTrigger>
+            <Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
+                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
+            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
+                    <Condition Property="ShowClearButton" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="border"/>
+                    <Condition Property="ShowClearButton" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear"/>
+                    <Condition Property="ShowClearButton" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
+            </MultiTrigger>
+            <Trigger Property="IsError" Value="true">
+                <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}"/>
+                <Trigger.EnterActions>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardShow}"/>
+                </Trigger.EnterActions>
+                <Trigger.ExitActions>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}"/>
+                </Trigger.ExitActions>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Opacity" Value="0.4" TargetName="toggleButton"/>
+                <Setter Property="Opacity" Value="0.4" TargetName="border"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
     <!--Handy式下拉框样式-->
     <Style x:Key="ComboBoxPlusBaseStyle" BasedOn="{StaticResource ComboBoxExtendBaseStyle}" TargetType="controls:ComboBox">
         <Setter Property="Template" Value="{StaticResource ComboBoxPlusTopTemplate}"/>
@@ -1027,6 +1306,14 @@
                 </MultiTrigger.Conditions>
                 <Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableTopTemplate}"/>
             </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsEditable" Value="True"/>
+                    <Condition Property="controls:InfoElement.TitleAlignment" Value="Top"/>
+                    <Condition Property="AutoComplete" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableTopAutoCompleteTemplate}"/>
+            </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition Property="IsEditable" Value="True"/>
@@ -1034,6 +1321,14 @@
                 </MultiTrigger.Conditions>
                 <Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableLeftTemplate}"/>
             </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsEditable" Value="True"/>
+                    <Condition Property="controls:InfoElement.TitleAlignment" Value="Left"/>
+                    <Condition Property="AutoComplete" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableLeftAutoCompleteTemplate}"/>
+            </MultiTrigger>
         </Style.Triggers>
     </Style>
 

src/HandyControl_Net_GE45.sln.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=HandyControl_002EAnnotations/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj

@@ -63,6 +63,15 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\Shared\HandyControlDemo_Shared\Data\MessageToken.cs">
+      <Link>Data\MessageToken.cs</Link>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>MessageToken.tt</DependentUpon>
+    </Compile>
+    <Compile Include="..\..\Shared\HandyControlDemo_Shared\Properties\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="UserControl\Main\NoUserContent.xaml.cs">
       <DependentUpon>NoUserContent.xaml</DependentUpon>
     </Compile>
@@ -73,6 +82,14 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Shared\HandyControlDemo_Shared\Properties\Langs\Lang.Designer.cs">
+      <Link>Properties\Langs\Lang.Designer.cs</Link>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Lang.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\1.jpg">
       <Link>Resources\Img\1.jpg</Link>
@@ -357,6 +374,52 @@
       <Name>HandyControl_Net_40</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="..\..\Shared\HandyControlDemo_Shared\Properties\Langs\Lang.en.resx">
+      <Link>Properties\Langs\Lang.en.resx</Link>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\Shared\HandyControlDemo_Shared\Properties\Langs\Lang.resx">
+      <Link>Properties\Langs\Lang.resx</Link>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Lang.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\fabric-icons.ttf">
+      <Link>Resources\fabric-icons.ttf</Link>
+    </Resource>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\..\Shared\HandyControlDemo_Shared\Data\MessageToken.tt">
+      <Link>Data\MessageToken.tt</Link>
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>MessageToken.cs</LastGenOutput>
+    </Content>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\GridPane_16x.png">
+      <Link>Resources\Img\LeftMainContent\GridPane_16x.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\MainMenuControl_16x.png">
+      <Link>Resources\Img\LeftMainContent\MainMenuControl_16x.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\DevOps\DevOps-Boards.png">
+      <Link>Resources\Img\DevOps\DevOps-Boards.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\DevOps\DevOps-Overview.png">
+      <Link>Resources\Img\DevOps\DevOps-Overview.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\DevOps\DevOps-Pipelines.png">
+      <Link>Resources\Img\DevOps\DevOps-Pipelines.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\DevOps\DevOps-Repos.png">
+      <Link>Resources\Img\DevOps\DevOps-Repos.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\DevOps\DevOps-TestPlans.png">
+      <Link>Resources\Img\DevOps\DevOps-TestPlans.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\RepeatButton_16x.png">
+      <Link>Resources\Img\LeftMainContent\RepeatButton_16x.png</Link>
+    </Resource>
+  </ItemGroup>
   <Import Project="..\..\Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj

@@ -34,6 +34,17 @@
     <DocumentationFile>bin\Release\HandyControl.xml</DocumentationFile>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Shared\HandyControl_Shared\Properties\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Shared\HandyControl_Shared\Properties\Langs\Lang.Designer.cs">
+      <Link>Properties\Langs\Lang.Designer.cs</Link>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Lang.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
   <ItemGroup>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -79,6 +90,16 @@
       <Version>3.0.1</Version>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="..\..\Shared\HandyControl_Shared\Properties\Langs\Lang.en.resx">
+      <Link>Properties\Langs\Lang.en.resx</Link>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\Shared\HandyControl_Shared\Properties\Langs\Lang.resx">
+      <Link>Properties\Langs\Lang.resx</Link>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Lang.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="..\..\Shared\HandyControl_Shared\HandyControl_Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

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

@@ -824,6 +824,140 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
+    <ControlTemplate x:Key="ComboBoxPlusEditableTopAutoCompleteTemplate" TargetType="controls:ComboBox">
+        <ControlTemplate.Resources>
+            <Storyboard x:Key="StoryboardShow">
+                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2"/>
+            </Storyboard>
+            <Storyboard x:Key="StoryboardHidden">
+                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0"/>
+            </Storyboard>
+        </ControlTemplate.Resources>
+        <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="{Binding Path=(controls:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition Width="Auto" MinWidth="30"/>
+            </Grid.ColumnDefinitions>
+            <StackPanel Grid.ColumnSpan="2" Visibility="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" Orientation="Horizontal" Margin="{TemplateBinding Padding}">
+                <TextBlock Margin="1,0,0,0" Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
+            </StackPanel>
+            <Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
+                    <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
+                        <controls:SimplePanel RenderOptions.ClearTypeHint="Enabled">
+                            <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                <Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
+                            </Canvas>
+                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </controls:SimplePanel>
+                    </ScrollViewer>
+                </Border>
+            </Popup>
+            <Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup_AutoComplete" StaysOpen="False" AllowsTransparency="true" Grid.ColumnSpan="2" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder_AutoComplete" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
+                    <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer_AutoComplete">
+                        <controls:SimplePanel RenderOptions.ClearTypeHint="Enabled">
+                            <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                <Rectangle x:Name="opaqueRect_AutoComplete" Fill="{Binding Background, ElementName=dropDownBorder_AutoComplete}" Height="{Binding ActualHeight, ElementName=dropDownBorder_AutoComplete}" Width="{Binding ActualWidth, ElementName=dropDownBorder_AutoComplete}"/>
+                            </Canvas>
+                            <StackPanel Name="PART_AutoCompletePanel" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </controls:SimplePanel>
+                    </ScrollViewer>
+                </Border>
+            </Popup>
+            <TextBlock Grid.Column="0" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1"/>
+            <ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}"/>
+            <Border Grid.Row="1" Grid.Column="0" x:Name="border" Margin="-1,1">
+                <TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+            </Border>
+            <Button Grid.Column="1" Grid.Row="1" Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Style="{StaticResource ButtonIcon}" Padding="0,6" controls:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="HasItems" Value="false">
+                <Setter Property="Height" TargetName="dropDownBorder" Value="95"/>
+                <Setter Property="Height" TargetName="dropDownBorder_AutoComplete" Value="95"/>
+            </Trigger>
+            <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer" Value="false">
+                <Setter Property="Canvas.Top" TargetName="opaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}"/>
+                <Setter Property="Canvas.Left" TargetName="opaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}"/>
+            </Trigger>
+            <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer_AutoComplete" Value="false">
+                <Setter Property="Canvas.Top" TargetName="opaqueRect_AutoComplete" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer_AutoComplete}"/>
+                <Setter Property="Canvas.Left" TargetName="opaqueRect_AutoComplete" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer_AutoComplete}"/>
+            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="border"/>
+                    <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
+                    <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear"/>
+                    <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
+                    <Condition Property="IsFocused" Value="true" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
+            </MultiTrigger>
+            <Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
+                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
+            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
+                    <Condition Property="ShowClearButton" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="border"/>
+                    <Condition Property="ShowClearButton" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear"/>
+                    <Condition Property="ShowClearButton" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
+            </MultiTrigger>
+            <Trigger Property="IsError" Value="true">
+                <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}"/>
+                <Trigger.EnterActions>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardShow}"/>
+                </Trigger.EnterActions>
+                <Trigger.ExitActions>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}"/>
+                </Trigger.ExitActions>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Opacity" Value="0.4" TargetName="toggleButton"/>
+                <Setter Property="Opacity" Value="0.4" TargetName="border"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
     <!--标题在左侧的Handy式可编辑下拉框模板-->
     <ControlTemplate x:Key="ComboBoxPlusEditableLeftTemplate" TargetType="controls:ComboBox">
         <ControlTemplate.Resources>
@@ -939,6 +1073,137 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
+    <ControlTemplate x:Key="ComboBoxPlusEditableLeftAutoCompleteTemplate" TargetType="controls:ComboBox">
+        <ControlTemplate.Resources>
+            <Storyboard x:Key="StoryboardShow">
+                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2"/>
+            </Storyboard>
+            <Storyboard x:Key="StoryboardHidden">
+                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0"/>
+            </Storyboard>
+        </ControlTemplate.Resources>
+        <Grid x:Name="templateRoot" SnapsToDevicePixels="true" Height="{Binding Path=(controls:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="{Binding Path=(controls:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <ColumnDefinition/>
+                <ColumnDefinition Width="Auto" MinWidth="30"/>
+            </Grid.ColumnDefinitions>
+            <StackPanel VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="0,8,6,8" Visibility="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" Orientation="Horizontal">
+                <TextBlock Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
+            </StackPanel>
+            <Popup Grid.Column="1" x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
+                    <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
+                        <controls:SimplePanel RenderOptions.ClearTypeHint="Enabled">
+                            <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                <Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
+                            </Canvas>
+                            <ItemsPresenter KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </controls:SimplePanel>
+                    </ScrollViewer>
+                </Border>
+            </Popup>
+            <Popup Grid.Column="1" x:Name="PART_Popup_AutoComplete" AllowsTransparency="true" Grid.ColumnSpan="2" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder_AutoComplete" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
+                    <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer_AutoComplete">
+                        <controls:SimplePanel RenderOptions.ClearTypeHint="Enabled">
+                            <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                <Rectangle x:Name="opaqueRect_AutoComplete" Fill="{Binding Background, ElementName=dropDownBorder_AutoComplete}" Height="{Binding ActualHeight, ElementName=dropDownBorder_AutoComplete}" Width="{Binding ActualWidth, ElementName=dropDownBorder_AutoComplete}"/>
+                            </Canvas>
+                            <StackPanel Name="PART_AutoCompletePanel" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </controls:SimplePanel>
+                    </ScrollViewer>
+                </Border>
+            </Popup>
+            <TextBlock Grid.Column="1" Grid.ColumnSpan="2" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}"/>
+            <ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}"/>
+            <Border Grid.Column="1" x:Name="border" Background="Transparent" Margin="-1,1">
+                <TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+            </Border>
+            <Button Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="2" Style="{StaticResource ButtonIcon}" Padding="0,6" controls:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="HasItems" Value="false">
+                <Setter Property="Height" TargetName="dropDownBorder" Value="95"/>
+                <Setter Property="Height" TargetName="dropDownBorder_AutoComplete" Value="95"/>
+            </Trigger>
+            <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer" Value="false">
+                <Setter Property="Canvas.Top" TargetName="opaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}"/>
+                <Setter Property="Canvas.Left" TargetName="opaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}"/>
+            </Trigger>
+            <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer_AutoComplete" Value="false">
+                <Setter Property="Canvas.Top" TargetName="opaqueRect_AutoComplete" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer_AutoComplete}"/>
+                <Setter Property="Canvas.Left" TargetName="opaqueRect_AutoComplete" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer_AutoComplete}"/>
+            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="border"/>
+                    <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
+                    <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear"/>
+                    <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
+                    <Condition Property="IsFocused" Value="true" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
+            </MultiTrigger>
+            <Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
+                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
+            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
+                    <Condition Property="ShowClearButton" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="border"/>
+                    <Condition Property="ShowClearButton" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear"/>
+                    <Condition Property="ShowClearButton" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
+            </MultiTrigger>
+            <Trigger Property="IsError" Value="true">
+                <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}"/>
+                <Trigger.EnterActions>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardShow}"/>
+                </Trigger.EnterActions>
+                <Trigger.ExitActions>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}"/>
+                </Trigger.ExitActions>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Opacity" Value="0.4" TargetName="toggleButton"/>
+                <Setter Property="Opacity" Value="0.4" TargetName="border"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
     <!--Handy式下拉框样式-->
     <Style x:Key="ComboBoxPlusBaseStyle" BasedOn="{StaticResource ComboBoxExtendBaseStyle}" TargetType="controls:ComboBox">
         <Setter Property="Template" Value="{StaticResource ComboBoxPlusTopTemplate}"/>
@@ -957,6 +1222,14 @@
                 </MultiTrigger.Conditions>
                 <Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableTopTemplate}"/>
             </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsEditable" Value="True"/>
+                    <Condition Property="controls:InfoElement.TitleAlignment" Value="Top"/>
+                    <Condition Property="AutoComplete" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableTopAutoCompleteTemplate}"/>
+            </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition Property="IsEditable" Value="True"/>
@@ -964,6 +1237,14 @@
                 </MultiTrigger.Conditions>
                 <Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableLeftTemplate}"/>
             </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsEditable" Value="True"/>
+                    <Condition Property="controls:InfoElement.TitleAlignment" Value="Left"/>
+                    <Condition Property="AutoComplete" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableLeftAutoCompleteTemplate}"/>
+            </MultiTrigger>
         </Style.Triggers>
     </Style>
 

src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj

@@ -90,6 +90,21 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\Shared\HandyControlDemo_Shared\Data\MessageToken.cs">
+      <Link>Data\MessageToken.cs</Link>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>MessageToken.tt</DependentUpon>
+    </Compile>
+    <Compile Include="..\..\Shared\HandyControlDemo_Shared\Properties\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Shared\HandyControlDemo_Shared\Properties\Langs\Lang.Designer.cs">
+      <Link>Properties\Langs\Lang.Designer.cs</Link>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Lang.resx</DependentUpon>
+    </Compile>
     <Compile Include="UserControl\Main\NoUserContent.xaml.cs">
       <DependentUpon>NoUserContent.xaml</DependentUpon>
     </Compile>
@@ -372,13 +387,60 @@
       <Link>Resources\Img\under_construction.gif</Link>
     </Resource>
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
     <Page Include="UserControl\Main\NoUserContent.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="..\..\Shared\HandyControlDemo_Shared\Properties\Langs\Lang.en.resx">
+      <Link>Properties\Langs\Lang.en.resx</Link>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\Shared\HandyControlDemo_Shared\Properties\Langs\Lang.resx">
+      <Link>Properties\Langs\Lang.resx</Link>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Lang.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\RepeatButton_16x.png">
+      <Link>Resources\Img\LeftMainContent\RepeatButton_16x.png</Link>
+    </Resource>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\..\Shared\HandyControlDemo_Shared\Data\MessageToken.tt">
+      <Link>Data\MessageToken.tt</Link>
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>MessageToken.cs</LastGenOutput>
+    </Content>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\GridPane_16x.png">
+      <Link>Resources\Img\LeftMainContent\GridPane_16x.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\DevOps\DevOps-Boards.png">
+      <Link>Resources\Img\DevOps\DevOps-Boards.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\DevOps\DevOps-Overview.png">
+      <Link>Resources\Img\DevOps\DevOps-Overview.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\DevOps\DevOps-Pipelines.png">
+      <Link>Resources\Img\DevOps\DevOps-Pipelines.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\DevOps\DevOps-Repos.png">
+      <Link>Resources\Img\DevOps\DevOps-Repos.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\DevOps\DevOps-TestPlans.png">
+      <Link>Resources\Img\DevOps\DevOps-TestPlans.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\MainMenuControl_16x.png">
+      <Link>Resources\Img\LeftMainContent\MainMenuControl_16x.png</Link>
+    </Resource>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\fabric-icons.ttf">
+      <Link>Resources\fabric-icons.ttf</Link>
+    </Resource>
+  </ItemGroup>
   <Import Project="..\..\Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj

@@ -80,6 +80,17 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <netVersion>netgt40</netVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Shared\HandyControl_Shared\Properties\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Shared\HandyControl_Shared\Properties\Langs\Lang.Designer.cs">
+      <Link>Properties\Langs\Lang.Designer.cs</Link>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Lang.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
   <ItemGroup>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -120,6 +131,16 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="..\..\Shared\HandyControl_Shared\Properties\Langs\Lang.en.resx">
+      <Link>Properties\Langs\Lang.en.resx</Link>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\Shared\HandyControl_Shared\Properties\Langs\Lang.resx">
+      <Link>Properties\Langs\Lang.resx</Link>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Lang.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="..\..\Shared\HandyControl_Shared\HandyControl_Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

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

@@ -887,6 +887,147 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
+    <ControlTemplate x:Key="ComboBoxPlusEditableTopAutoCompleteTemplate" TargetType="controls:ComboBox">
+        <ControlTemplate.Resources>
+            <Storyboard x:Key="StoryboardShow">
+                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2"/>
+            </Storyboard>
+            <Storyboard x:Key="StoryboardHidden">
+                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0"/>
+            </Storyboard>
+        </ControlTemplate.Resources>
+        <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="{Binding Path=(controls:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition Width="Auto" MinWidth="30"/>
+            </Grid.ColumnDefinitions>
+            <StackPanel Grid.ColumnSpan="2" Visibility="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" Orientation="Horizontal" Margin="{TemplateBinding Padding}">
+                <TextBlock Margin="1,0,0,0" Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
+            </StackPanel>
+            <Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
+                    <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
+                        <controls:SimplePanel RenderOptions.ClearTypeHint="Enabled">
+                            <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                <Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
+                            </Canvas>
+                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </controls:SimplePanel>
+                    </ScrollViewer>
+                </Border>
+            </Popup>
+            <Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup_AutoComplete" StaysOpen="False" AllowsTransparency="true" Grid.ColumnSpan="2" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder_AutoComplete" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
+                    <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer_AutoComplete">
+                        <controls:SimplePanel RenderOptions.ClearTypeHint="Enabled">
+                            <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                <Rectangle x:Name="opaqueRect_AutoComplete" Fill="{Binding Background, ElementName=dropDownBorder_AutoComplete}" Height="{Binding ActualHeight, ElementName=dropDownBorder_AutoComplete}" Width="{Binding ActualWidth, ElementName=dropDownBorder_AutoComplete}"/>
+                            </Canvas>
+                            <StackPanel Name="PART_AutoCompletePanel" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </controls:SimplePanel>
+                    </ScrollViewer>
+                </Border>
+            </Popup>
+            <TextBlock Grid.Column="0" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1"/>
+            <ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}"/>
+            <Border Grid.Row="1" Grid.Column="0" x:Name="border" Margin="-1,1">
+                <TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+            </Border>
+            <Button Grid.Column="1" Grid.Row="1" Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Style="{StaticResource ButtonIcon}" Padding="0,6" controls:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="HasItems" Value="false">
+                <Setter Property="Height" TargetName="dropDownBorder" Value="95"/>
+                <Setter Property="Height" TargetName="dropDownBorder_AutoComplete" Value="95"/>
+            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsGrouping" Value="true"/>
+                    <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+            </MultiTrigger>
+            <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer" Value="false">
+                <Setter Property="Canvas.Top" TargetName="opaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}"/>
+                <Setter Property="Canvas.Left" TargetName="opaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}"/>
+            </Trigger>
+            <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer_AutoComplete" Value="false">
+                <Setter Property="Canvas.Top" TargetName="opaqueRect_AutoComplete" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer_AutoComplete}"/>
+                <Setter Property="Canvas.Left" TargetName="opaqueRect_AutoComplete" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer_AutoComplete}"/>
+            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="border"/>
+                    <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
+                    <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear"/>
+                    <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
+                    <Condition Property="IsFocused" Value="true" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
+            </MultiTrigger>
+            <Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
+                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
+            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
+                    <Condition Property="ShowClearButton" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="border"/>
+                    <Condition Property="ShowClearButton" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear"/>
+                    <Condition Property="ShowClearButton" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
+            </MultiTrigger>
+            <Trigger Property="IsError" Value="true">
+                <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}"/>
+                <Trigger.EnterActions>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardShow}"/>
+                </Trigger.EnterActions>
+                <Trigger.ExitActions>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}"/>
+                </Trigger.ExitActions>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Opacity" Value="0.4" TargetName="toggleButton"/>
+                <Setter Property="Opacity" Value="0.4" TargetName="border"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
     <!--标题在左侧的Handy式可编辑下拉框模板-->
     <ControlTemplate x:Key="ComboBoxPlusEditableLeftTemplate" TargetType="controls:ComboBox">
         <ControlTemplate.Resources>
@@ -1009,6 +1150,144 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
+    <ControlTemplate x:Key="ComboBoxPlusEditableLeftAutoCompleteTemplate" TargetType="controls:ComboBox">
+        <ControlTemplate.Resources>
+            <Storyboard x:Key="StoryboardShow">
+                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2"/>
+            </Storyboard>
+            <Storyboard x:Key="StoryboardHidden">
+                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0"/>
+            </Storyboard>
+        </ControlTemplate.Resources>
+        <Grid x:Name="templateRoot" SnapsToDevicePixels="true" Height="{Binding Path=(controls:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="{Binding Path=(controls:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <ColumnDefinition/>
+                <ColumnDefinition Width="Auto" MinWidth="30"/>
+            </Grid.ColumnDefinitions>
+            <StackPanel VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="0,8,6,8" Visibility="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" Orientation="Horizontal">
+                <TextBlock Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
+            </StackPanel>
+            <Popup Grid.Column="1" x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
+                    <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
+                        <controls:SimplePanel RenderOptions.ClearTypeHint="Enabled">
+                            <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                <Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
+                            </Canvas>
+                            <ItemsPresenter KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </controls:SimplePanel>
+                    </ScrollViewer>
+                </Border>
+            </Popup>
+            <Popup Grid.Column="1" x:Name="PART_Popup_AutoComplete" AllowsTransparency="true" Grid.ColumnSpan="2" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder_AutoComplete" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
+                    <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer_AutoComplete">
+                        <controls:SimplePanel RenderOptions.ClearTypeHint="Enabled">
+                            <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                <Rectangle x:Name="opaqueRect_AutoComplete" Fill="{Binding Background, ElementName=dropDownBorder_AutoComplete}" Height="{Binding ActualHeight, ElementName=dropDownBorder_AutoComplete}" Width="{Binding ActualWidth, ElementName=dropDownBorder_AutoComplete}"/>
+                            </Canvas>
+                            <StackPanel Name="PART_AutoCompletePanel" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </controls:SimplePanel>
+                    </ScrollViewer>
+                </Border>
+            </Popup>
+            <TextBlock Grid.Column="1" Grid.ColumnSpan="2" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}"/>
+            <ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}"/>
+            <Border Grid.Column="1" x:Name="border" Background="Transparent" Margin="-1,1">
+                <TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+            </Border>
+            <Button Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="2" Style="{StaticResource ButtonIcon}" Padding="0,6" controls:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="HasItems" Value="false">
+                <Setter Property="Height" TargetName="dropDownBorder" Value="95"/>
+                <Setter Property="Height" TargetName="dropDownBorder_AutoComplete" Value="95"/>
+            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsGrouping" Value="true"/>
+                    <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+            </MultiTrigger>
+            <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer" Value="false">
+                <Setter Property="Canvas.Top" TargetName="opaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}"/>
+                <Setter Property="Canvas.Left" TargetName="opaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}"/>
+            </Trigger>
+            <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer_AutoComplete" Value="false">
+                <Setter Property="Canvas.Top" TargetName="opaqueRect_AutoComplete" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer_AutoComplete}"/>
+                <Setter Property="Canvas.Left" TargetName="opaqueRect_AutoComplete" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer_AutoComplete}"/>
+            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="border"/>
+                    <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
+                    <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear"/>
+                    <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
+                    <Condition Property="IsFocused" Value="true" SourceName="PART_EditableTextBox"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
+            </MultiTrigger>
+            <Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
+                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
+            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
+                    <Condition Property="ShowClearButton" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="border"/>
+                    <Condition Property="ShowClearButton" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear"/>
+                    <Condition Property="ShowClearButton" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
+            </MultiTrigger>
+            <Trigger Property="IsError" Value="true">
+                <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}"/>
+                <Trigger.EnterActions>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardShow}"/>
+                </Trigger.EnterActions>
+                <Trigger.ExitActions>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}"/>
+                </Trigger.ExitActions>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Opacity" Value="0.4" TargetName="toggleButton"/>
+                <Setter Property="Opacity" Value="0.4" TargetName="border"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
     <!--Handy式下拉框样式-->
     <Style x:Key="ComboBoxPlusBaseStyle" BasedOn="{StaticResource ComboBoxExtendBaseStyle}" TargetType="controls:ComboBox">
         <Setter Property="Template" Value="{StaticResource ComboBoxPlusTopTemplate}"/>
@@ -1027,6 +1306,14 @@
                 </MultiTrigger.Conditions>
                 <Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableTopTemplate}"/>
             </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsEditable" Value="True"/>
+                    <Condition Property="controls:InfoElement.TitleAlignment" Value="Top"/>
+                    <Condition Property="AutoComplete" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableTopAutoCompleteTemplate}"/>
+            </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition Property="IsEditable" Value="True"/>
@@ -1034,6 +1321,14 @@
                 </MultiTrigger.Conditions>
                 <Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableLeftTemplate}"/>
             </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsEditable" Value="True"/>
+                    <Condition Property="controls:InfoElement.TitleAlignment" Value="Left"/>
+                    <Condition Property="AutoComplete" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableLeftAutoCompleteTemplate}"/>
+            </MultiTrigger>
         </Style.Triggers>
     </Style>
 

src/Shared/HandyControlDemo_Shared/App.xaml.cs

@@ -20,7 +20,7 @@ namespace HandyControlDemo
             base.OnStartup(e);
 
             GlobalData.Init();
-            Thread.CurrentThread.CurrentUICulture = new CultureInfo(GlobalData.Config.Lang);
+            ConfigHelper.Instance.SetLang(GlobalData.Config.Lang);
 
             if (GlobalData.Config.Skin != SkinType.Default)
             {
@@ -28,7 +28,7 @@ namespace HandyControlDemo
             }
 
 #if !Core
-            BlurWindow.SystemVersionInfo = CommonHelper.GetSystemVersionInfo();
+            ConfigHelper.Instance.SetSystemVersionInfo(CommonHelper.GetSystemVersionInfo());
 #endif
         }
 

src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs

@@ -92,8 +92,14 @@
 	
         public static readonly string DialogDemoCtl = nameof(DialogDemoCtl);
 	
+        public static readonly string SideMenuDemoCtl = nameof(SideMenuDemoCtl);
+	
+        public static readonly string GridDemoCtl = nameof(GridDemoCtl);
+	
         public static readonly string ButtonDemoCtl = nameof(ButtonDemoCtl);
 
+        public static readonly string RepeatButtonDemoCtl = nameof(RepeatButtonDemoCtl);
+
         public static readonly string ToggleButtonDemoCtl = nameof(ToggleButtonDemoCtl);
 
         public static readonly string ExpanderDemoCtl = nameof(ExpanderDemoCtl);
@@ -162,5 +168,11 @@
 
         public static readonly string GrowlDemoPanel = nameof(GrowlDemoPanel);
 
+        public static readonly string DialogDemoWindow = nameof(DialogDemoWindow);
+
+        public static readonly string MainWindow = nameof(MainWindow);
+
+        public static readonly string OverView = nameof(OverView);
+
     }
 }

src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt

@@ -48,11 +48,14 @@ var controlList = new List<string>
 	"NotifyIconDemoCtl",
 	"BadgeDemoCtl",
 	"GravatarDemoCtl",
-	"DialogDemoCtl"
+	"DialogDemoCtl",
+	"SideMenuDemoCtl",
+	"GridDemoCtl"
 };
 var styleList = new List<string>
 {
 	"ButtonDemoCtl",
+	"RepeatButtonDemoCtl",
 	"ToggleButtonDemoCtl",
 	"ExpanderDemoCtl",
 	"NativeProgressBarDemoCtl",
@@ -92,7 +95,10 @@ var messageList = new List<string>
 	"ContributorsView",
 	"ClearLeftSelected",
 	"SendChatMessage",
-	"GrowlDemoPanel"
+	"GrowlDemoPanel",
+	"DialogDemoWindow",
+	"MainWindow",
+	"OverView"
 };
 #>
 namespace HandyControlDemo.Data

src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems

@@ -16,11 +16,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Data\AppConfig.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\DemoType.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\GlobalData.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Data\MessageToken.cs">
-      <DependentUpon>MessageToken.tt</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Data\Model\ChatInfoModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Model\ContributorModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Model\CoverViewDemoModel.cs" />
@@ -30,9 +25,7 @@
       <SubType>Code</SubType>
       <DependentUpon>MainWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Properties\AssemblyInfo.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Properties\Langs\Lang.Designer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Properties\Langs\Lang.en.Designer.cs" />
+    <!-- <Compile Include="$(MSBuildThisFileDirectory)Properties\Langs\Lang.Designer.cs" /> -->
     <Compile Include="$(MSBuildThisFileDirectory)Service\DataService.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\String2BrushConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\StringRepeatConverter.cs" />
@@ -45,6 +38,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Basic\ChatBox.xaml.cs">
       <DependentUpon>ChatBox.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Basic\IFull.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Basic\InteractiveDialog.xaml.cs">
       <DependentUpon>InteractiveDialog.xaml</DependentUpon>
     </Compile>
@@ -81,6 +75,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\CompareSliderDemoCtl.xaml.cs">
       <DependentUpon>CompareSliderDemoCtl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\GridDemoCtl.xaml.cs">
+      <DependentUpon>GridDemoCtl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\CoverFlowDemoCtl.xaml.cs">
       <DependentUpon>CoverFlowDemoCtl.xaml</DependentUpon>
     </Compile>
@@ -153,6 +150,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\ShieldDemoCtl.xaml.cs">
       <DependentUpon>ShieldDemoCtl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\SideMenuDemoCtl.xaml.cs">
+      <DependentUpon>SideMenuDemoCtl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\StepBarDemoCtl.xaml.cs">
       <DependentUpon>StepBarDemoCtl.xaml</DependentUpon>
     </Compile>
@@ -180,6 +180,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\WindowDemoCtl.xaml.cs">
       <DependentUpon>WindowDemoCtl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\OverView.xaml.cs">
+      <DependentUpon>OverView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\ContributorsView.xaml.cs">
       <DependentUpon>ContributorsView.xaml</DependentUpon>
     </Compile>
@@ -255,6 +258,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\RadioButtonDemoCtl.xaml.cs">
       <DependentUpon>RadioButtonDemoCtl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\RepeatButtonDemoCtl.xaml.cs">
+      <DependentUpon>RepeatButtonDemoCtl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\RichTextBoxDemoCtl.xaml.cs">
       <DependentUpon>RichTextBoxDemoCtl.xaml</DependentUpon>
     </Compile>
@@ -284,6 +290,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\NotifyIconDemoViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\PaginationDemoViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\SearchBarDemoViewModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\SideMenuDemoViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\StepBarDemoViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\WindowDemoViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\DemoViewModelBase!1.cs" />
@@ -302,6 +309,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)Window\CustomNonClientAreaWindow.xaml.cs">
       <DependentUpon>CustomNonClientAreaWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Window\DialogDemoWindow.xaml.cs">
+      <DependentUpon>DialogDemoWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Window\GrowlDemoWindow.xaml.cs">
       <DependentUpon>GrowlDemoWindow.xaml</DependentUpon>
     </Compile>
@@ -309,9 +319,6 @@
       <DependentUpon>NoNonClientAreaDragableWindow.xaml</DependentUpon>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="$(MSBuildThisFileDirectory)Data\MessageToken.tt" />
-  </ItemGroup>
   <ItemGroup>
     <Page Include="$(MSBuildThisFileDirectory)MainWindow.xaml">
       <SubType>Designer</SubType>
@@ -337,6 +344,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Resources\Themes\Basic\Fonts.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Resources\Themes\Basic\Geometries.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -349,18 +360,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Resources\Themes\Style.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Resources\Themes\Styles\Style.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Resources\Themes\Styles\StyleDark.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Resources\Themes\Theme.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -421,6 +424,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\GridDemoCtl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\CoverFlowDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -517,6 +524,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\SideMenuDemoCtl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\StepBarDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -553,6 +564,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Main\OverView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)UserControl\Main\ContributorsView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -653,6 +668,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Styles\RepeatButtonDemoCtl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)UserControl\Styles\RichTextBoxDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -693,6 +712,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Window\DialogDemoWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Window\GrowlDemoWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -708,8 +731,4 @@
       <Generator>MSBuild:Compile</Generator>
     </ApplicationDefinition>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Properties\Langs\Lang.en.resx" />
-    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Properties\Langs\Lang.resx" />
-  </ItemGroup>
 </Project>

src/Shared/HandyControlDemo_Shared/MainWindow.xaml

@@ -5,6 +5,7 @@
                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                      xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
                      xmlns:userControl="clr-namespace:HandyControlDemo.UserControl"
+                     xmlns:data="clr-namespace:HandyControlDemo.Data"
                      mc:Ignorable="d"
                      BorderThickness="1"
                      BorderBrush="#262e2f"
@@ -19,6 +20,7 @@
                      ResizeMode="CanResizeWithGrip"
                      Name="MyWindow"
                      DataContext="{Binding Main,Source={StaticResource Locator}}"
+                     controls:Dialog.Token="{x:Static data:MessageToken.MainWindow}"
                      d:DesignHeight="800" 
                      d:DesignWidth="1400">
     <controls:Window.NonClientAreaContent>

src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs

@@ -1,6 +1,9 @@
-using System.ComponentModel;
+using System;
+using System.ComponentModel;
+using GalaSoft.MvvmLight.Messaging;
 using HandyControl.Controls;
 using HandyControlDemo.Data;
+using HandyControlDemo.Tools;
 
 namespace HandyControlDemo
 {
@@ -11,6 +14,15 @@ namespace HandyControlDemo
             InitializeComponent();
         }
 
+        protected override void OnInitialized(EventArgs e)
+        {
+            base.OnInitialized(e);
+
+            Messenger.Default.Send<object>(null, MessageToken.ClearLeftSelected);
+            Messenger.Default.Send(true, MessageToken.FullSwitch);
+            Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.OverView}"), MessageToken.LoadShowContent);
+        }
+
         protected override void OnClosing(CancelEventArgs e)
         {
             if (GlobalData.NotifyIconIsShow)

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("1.5.4")]
+[assembly: AssemblyVersion("1.5.5")]
 #endif

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

@@ -47,7 +47,7 @@ namespace HandyControlDemo.Properties.Langs {
         }
         
         /// <summary>
-        ///   使用此强类型资源类，为所有资源查找
+        ///   重写当前线程的 CurrentUICulture 属性
         ///   重写当前线程的 CurrentUICulture 属性。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
@@ -114,6 +114,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 基础布局 的本地化字符串。
+        /// </summary>
+        public static string BasicLayout {
+            get {
+                return ResourceManager.GetString("BasicLayout", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 闪烁 的本地化字符串。
         /// </summary>
@@ -135,9 +144,9 @@ namespace HandyControlDemo.Properties.Langs {
         /// <summary>
         ///   查找类似 边框 的本地化字符串。
         /// </summary>
-        public static string Border1 {
+        public static string Border {
             get {
-                return ResourceManager.GetString("Border1", resourceCulture);
+                return ResourceManager.GetString("Border", resourceCulture);
             }
         }
         
@@ -160,11 +169,11 @@ namespace HandyControlDemo.Properties.Langs {
         }
         
         /// <summary>
-        ///   查找类似 透明按钮 的本地化字符串。
+        ///   查找类似 自定义按钮 的本地化字符串。
         /// </summary>
-        public static string ButtonOpacity {
+        public static string ButtonCustom {
             get {
-                return ResourceManager.GetString("ButtonOpacity", resourceCulture);
+                return ResourceManager.GetString("ButtonCustom", resourceCulture);
             }
         }
         
@@ -276,6 +285,24 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 分栏偏移 的本地化字符串。
+        /// </summary>
+        public static string ColumnOffset {
+            get {
+                return ResourceManager.GetString("ColumnOffset", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 分栏间隔 的本地化字符串。
+        /// </summary>
+        public static string ColumnSpacing {
+            get {
+                return ResourceManager.GetString("ColumnSpacing", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 组合框 的本地化字符串。
         /// </summary>
@@ -429,6 +456,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 对话框示例 的本地化字符串。
+        /// </summary>
+        public static string DialogDemo {
+            get {
+                return ResourceManager.GetString("DialogDemo", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 在这里拖拽 的本地化字符串。
         /// </summary>
@@ -519,6 +555,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 栅格 的本地化字符串。
+        /// </summary>
+        public static string Grid {
+            get {
+                return ResourceManager.GetString("Grid", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 分组框 的本地化字符串。
         /// </summary>
@@ -609,6 +654,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 混合布局 的本地化字符串。
+        /// </summary>
+        public static string HybridLayout {
+            get {
+                return ResourceManager.GetString("HybridLayout", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 忽略 的本地化字符串。
         /// </summary>
@@ -870,6 +924,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 概览 的本地化字符串。
+        /// </summary>
+        public static string Overview {
+            get {
+                return ResourceManager.GetString("Overview", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 页码条 的本地化字符串。
         /// </summary>
@@ -1032,6 +1095,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 重复按钮 的本地化字符串。
+        /// </summary>
+        public static string RepeatButton {
+            get {
+                return ResourceManager.GetString("RepeatButton", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 回复 的本地化字符串。
         /// </summary>
@@ -1050,6 +1122,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 响应式布局 的本地化字符串。
+        /// </summary>
+        public static string ResponsiveLayout {
+            get {
+                return ResourceManager.GetString("ResponsiveLayout", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 富文本框 的本地化字符串。
         /// </summary>
@@ -1113,6 +1194,24 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 在当前窗口显示 的本地化字符串。
+        /// </summary>
+        public static string ShowInCurrentWindow {
+            get {
+                return ResourceManager.GetString("ShowInCurrentWindow", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 在主窗口显示 的本地化字符串。
+        /// </summary>
+        public static string ShowInMainWindow {
+            get {
+                return ResourceManager.GetString("ShowInMainWindow", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 显示行号 的本地化字符串。
         /// </summary>
@@ -1122,6 +1221,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 侧边菜单 的本地化字符串。
+        /// </summary>
+        public static string SideMenu {
+            get {
+                return ResourceManager.GetString("SideMenu", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 滑块 的本地化字符串。
         /// </summary>

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

@@ -210,8 +210,8 @@
   <data name="Danger" xml:space="preserve">
     <value>Danger</value>
   </data>
-  <data name="ButtonOpacity" xml:space="preserve">
-    <value>Opacity button</value>
+  <data name="ButtonCustom" xml:space="preserve">
+    <value>Custom button</value>
   </data>
   <data name="Title" xml:space="preserve">
     <value>Title</value>
@@ -309,9 +309,6 @@
   <data name="TreeView" xml:space="preserve">
     <value>TreeView</value>
   </data>
-  <data name="Border1" xml:space="preserve">
-    <value>Border</value>
-  </data>
   <data name="ScrollViewer" xml:space="preserve">
     <value>ScrollViewer</value>
   </data>
@@ -564,4 +561,43 @@
   <data name="Click2Count" xml:space="preserve">
     <value>Click to count</value>
   </data>
+  <data name="RepeatButton" xml:space="preserve">
+    <value>RepeatButton</value>
+  </data>
+  <data name="DialogDemo" xml:space="preserve">
+    <value>Dialog demo</value>
+  </data>
+  <data name="ShowInCurrentWindow" xml:space="preserve">
+    <value>Show in the current window</value>
+  </data>
+  <data name="ShowInMainWindow" xml:space="preserve">
+    <value>Show in the main window</value>
+  </data>
+  <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>
+  <data name="BasicLayout" xml:space="preserve">
+    <value>Basic layout</value>
+  </data>
+  <data name="ColumnSpacing" xml:space="preserve">
+    <value>Column spacing</value>
+  </data>
+  <data name="HybridLayout" xml:space="preserve">
+    <value>Hybrid layout</value>
+  </data>
+  <data name="ColumnOffset" xml:space="preserve">
+    <value>Column offset</value>
+  </data>
+  <data name="ResponsiveLayout" xml:space="preserve">
+    <value>Responsive layout</value>
+  </data>
+  <data name="Border" xml:space="preserve">
+    <value>Border</value>
+  </data>
 </root>

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

@@ -210,8 +210,8 @@
   <data name="Danger" xml:space="preserve">
     <value>危险</value>
   </data>
-  <data name="ButtonOpacity" xml:space="preserve">
-    <value>透明按钮</value>
+  <data name="ButtonCustom" xml:space="preserve">
+    <value>自定义按钮</value>
   </data>
   <data name="Title" xml:space="preserve">
     <value>标题</value>
@@ -309,7 +309,7 @@
   <data name="TreeView" xml:space="preserve">
     <value>树视图</value>
   </data>
-  <data name="Border1" xml:space="preserve">
+  <data name="Border" xml:space="preserve">
     <value>边框</value>
   </data>
   <data name="ScrollViewer" xml:space="preserve">
@@ -564,4 +564,40 @@
   <data name="Click2Count" xml:space="preserve">
     <value>点击计数</value>
   </data>
+  <data name="RepeatButton" xml:space="preserve">
+    <value>重复按钮</value>
+  </data>
+  <data name="DialogDemo" xml:space="preserve">
+    <value>对话框示例</value>
+  </data>
+  <data name="ShowInCurrentWindow" xml:space="preserve">
+    <value>在当前窗口显示</value>
+  </data>
+  <data name="ShowInMainWindow" xml:space="preserve">
+    <value>在主窗口显示</value>
+  </data>
+  <data name="SideMenu" xml:space="preserve">
+    <value>侧边菜单</value>
+  </data>
+  <data name="Overview" xml:space="preserve">
+    <value>概览</value>
+  </data>
+  <data name="Grid" xml:space="preserve">
+    <value>栅格</value>
+  </data>
+  <data name="BasicLayout" xml:space="preserve">
+    <value>基础布局</value>
+  </data>
+  <data name="ColumnSpacing" xml:space="preserve">
+    <value>分栏间隔</value>
+  </data>
+  <data name="HybridLayout" xml:space="preserve">
+    <value>混合布局</value>
+  </data>
+  <data name="ColumnOffset" xml:space="preserve">
+    <value>分栏偏移</value>
+  </data>
+  <data name="ResponsiveLayout" xml:space="preserve">
+    <value>响应式布局</value>
+  </data>
 </root>

src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Basic.xaml

@@ -4,6 +4,7 @@
         <ResourceDictionary Source="Brushes.xaml"/>
         <ResourceDictionary Source="Geometries.xaml"/>
         <ResourceDictionary Source="Converters.xaml"/>
+        <ResourceDictionary Source="Fonts.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>

src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Fonts.xaml

@@ -0,0 +1,6 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <FontFamily x:Key="FabricIcons">pack://application:,,,/HandyControlDemo;component/Resources/fabric-icons.ttf#Fabric MDL2 Assets</FontFamily>
+
+</ResourceDictionary>

src/Shared/HandyControlDemo_Shared/Resources/Themes/Style.xaml

@@ -1,7 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Basic/Brushes.xaml"/>
-    </ResourceDictionary.MergedDictionaries>
-
-</ResourceDictionary>

src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml

@@ -5,6 +5,7 @@
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../Basic/Geometries.xaml"/>
+        <ResourceDictionary Source="../Basic/Fonts.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="CirclePanelButton" BasedOn="{StaticResource ButtonCustom}" TargetType="Button">
@@ -99,4 +100,9 @@
         <Setter Property="CloseButtonForeground" Value="White"/>
     </Style>
 
+    <Style x:Key="TextBlockFabricIcons" TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="{StaticResource FabricIcons}"/>
+        <Setter Property="FontSize" Value="14"/>
+    </Style>
+
 </ResourceDictionary>

src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/StyleDark.xaml

@@ -1,12 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="../Basic/Brushes.xaml"/>
-        <ResourceDictionary Source="../Basic/Geometries.xaml"/>
-        <ResourceDictionary Source="../Basic/Converters.xaml"/>
-        <ResourceDictionary Source="ListBoxItem.xaml"/>
-        <ResourceDictionary Source="Label.xaml"/>
-        <ResourceDictionary Source="Button.xaml"/>
-    </ResourceDictionary.MergedDictionaries>
-
-</ResourceDictionary>

src/Shared/HandyControlDemo_Shared/Service/DataService.cs

@@ -72,7 +72,7 @@ namespace HandyControlDemo.Service
             var list = new List<string>();
             for (var i = 1; i <= 9; i++)
             {
-                list.Add(converter.Convert(Properties.Langs.Lang.Text, null, i, CultureInfo.CurrentCulture)?.ToString());
+                list.Add($"{converter.Convert(Properties.Langs.Lang.Text, null, i, CultureInfo.CurrentCulture)}{i}");
             }
 
             return list;

src/Shared/HandyControlDemo_Shared/UserControl/Basic/IFull.cs

@@ -0,0 +1,7 @@
+namespace HandyControlDemo.UserControl
+{
+    internal interface IFull
+    {
+        
+    }
+}

src/Shared/HandyControlDemo_Shared/UserControl/Controls/ClockDemoCtl.xaml

@@ -4,6 +4,9 @@
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
              Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
-        <controls:Clock Margin="32"/>
+        <StackPanel Orientation="Horizontal" Margin="32">
+            <controls:Clock/>
+            <controls:ListClock Margin="16,0,0,0"/>
+        </StackPanel>
     </controls:TransitioningContentControl>
 </UserControl>

src/Shared/HandyControlDemo_Shared/UserControl/Controls/ComboBoxDemoCtl.xaml

@@ -15,12 +15,12 @@
                 <controls:ComboBox ItemsSource="{Binding DataList}" SelectedIndex="0" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
                 <controls:ComboBox ShowClearButton="True" ItemsSource="{Binding DataList}" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" controls:InfoElement.Necessary="True" Margin="0,32,0,0"/>
                 <controls:ComboBox ItemsSource="{Binding DataList}" IsEditable="True" SelectedIndex="0" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
-                <controls:ComboBox ShowClearButton="True" ItemsSource="{Binding DataList}" IsEditable="True" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" controls:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+                <controls:ComboBox AutoComplete="True" ShowClearButton="True" ItemsSource="{Binding DataList}" IsEditable="True" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" controls:InfoElement.Necessary="True" Margin="0,32,0,0"/>
 
                 <controls:ComboBox ItemsSource="{Binding DataList}" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
                 <controls:ComboBox ShowClearButton="True" ItemsSource="{Binding DataList}" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" controls:InfoElement.Necessary="True" Margin="0,32,0,0"/>
                 <controls:ComboBox ItemsSource="{Binding DataList}" IsEditable="True" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
-                <controls:ComboBox ShowClearButton="True" ItemsSource="{Binding DataList}" IsEditable="True" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" controls:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+                <controls:ComboBox AutoComplete="True" ShowClearButton="True" ItemsSource="{Binding DataList}" IsEditable="True" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" controls:InfoElement.Necessary="True" Margin="0,32,0,0"/>
             </StackPanel>
         </ScrollViewer>
     </controls:TransitioningContentControl>

src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverFlowDemoCtl.xaml.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 
 namespace HandyControlDemo.UserControl
 {
@@ -9,7 +8,7 @@ namespace HandyControlDemo.UserControl
         {
             InitializeComponent();
 
-            CoverFlowMain.AddRange(new List<Uri>
+            CoverFlowMain.AddRange(new []
             {
                 new Uri(@"pack://application:,,,/Resources/Img/Album/1.jpg"),
                 new Uri(@"pack://application:,,,/Resources/Img/Album/2.jpg"),

src/Shared/HandyControlDemo_Shared/UserControl/Controls/DialogDemoCtl.xaml

@@ -11,6 +11,7 @@
             <Button Content="{x:Static langs:Lang.TextDialog}" Command="{Binding ShowTextCmd}" />
             <TextBox Margin="0,32,0,0" Text="{Binding DialogResult,UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource TextBoxExtend}" controls:InfoElement.Placeholder="{x:Static langs:Lang.PleaseInput}"/>
             <Button Margin="0,10,0,0" Content="{x:Static langs:Lang.InteractiveDialog}" Command="{Binding ShowInteractiveDialogCmd}"/>
+            <Button Margin="0,32,0,0" Content="{x:Static langs:Lang.NewWindow}" Command="{Binding NewWindowCmd}"/>
         </StackPanel>
     </controls:TransitioningContentControl>
 </UserControl>

src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml

@@ -0,0 +1,157 @@
+<UserControl x:Class="HandyControlDemo.UserControl.GridDemoCtl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:extension="clr-namespace:HandyControl.Tools.Extension;assembly=HandyControl"
+             xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+             Background="{DynamicResource RegionBrush}">
+    <ScrollViewer>
+        <StackPanel Margin="32">
+            <TextBlock Text="{x:Static langs:Lang.BasicLayout}" Style="{StaticResource TextBlockLargeBold}" HorizontalAlignment="Left"/>
+            <controls:Row Margin="0,20,0,0">
+                <controls:Col Span="24">
+                    <Border Background="{DynamicResource SecondaryBorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+            </controls:Row>
+            <controls:Row Margin="0,20,0,0">
+                <controls:Col Span="12">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Span="12">
+                    <Border Background="{DynamicResource SecondaryBorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+            </controls:Row>
+            <controls:Row Margin="0,20,0,0">
+                <controls:Col Span="8">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Span="8">
+                    <Border Background="{DynamicResource SecondaryBorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Span="8">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+            </controls:Row>
+            <controls:Row Margin="0,20,0,0">
+                <controls:Col Span="6">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Span="6">
+                    <Border Background="{DynamicResource SecondaryBorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Span="6">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Span="6">
+                    <Border Background="{DynamicResource SecondaryBorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+            </controls:Row>
+            <controls:Row Margin="0,20,0,0">
+                <controls:Col Span="4">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Span="4">
+                    <Border Background="{DynamicResource SecondaryBorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Span="4">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Span="4">
+                    <Border Background="{DynamicResource SecondaryBorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Span="4">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Span="4">
+                    <Border Background="{DynamicResource SecondaryBorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+            </controls:Row>
+            <TextBlock Text="{x:Static langs:Lang.ColumnSpacing}" Margin="0,32,0,0" Style="{StaticResource TextBlockLargeBold}" HorizontalAlignment="Left"/>
+            <controls:Row Margin="0,20,0,0" Gutter="20">
+                <controls:Col Span="6">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Span="6">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Span="6">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Span="6">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+            </controls:Row>
+            <TextBlock Text="{x:Static langs:Lang.HybridLayout}" Margin="0,32,0,0" Style="{StaticResource TextBlockLargeBold}" HorizontalAlignment="Left"/>
+            <controls:Row Margin="0,20,0,0" Gutter="20">
+                <controls:Col Span="16">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Span="8">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+            </controls:Row>
+            <controls:Row Margin="0,20,0,0" Gutter="20">
+                <controls:Col Span="8">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Span="8">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Span="4">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Span="4">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+            </controls:Row>
+            <controls:Row Margin="0,20,0,0" Gutter="20">
+                <controls:Col Span="4">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Span="16">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Span="4">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+            </controls:Row>
+            <TextBlock Text="{x:Static langs:Lang.ColumnOffset}" Margin="0,32,0,0" Style="{StaticResource TextBlockLargeBold}" HorizontalAlignment="Left"/>
+            <controls:Row Margin="0,20,0,0" Gutter="20">
+                <controls:Col Span="6">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Span="6" Offset="6">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+            </controls:Row>
+            <controls:Row Margin="0,20,0,0" Gutter="20">
+                <controls:Col Span="6" Offset="6">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Span="6" Offset="6">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+            </controls:Row>
+            <controls:Row Margin="0,20,0,0" Gutter="20">
+                <controls:Col Span="12" Offset="6">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+            </controls:Row>
+            <TextBlock Text="{x:Static langs:Lang.ResponsiveLayout}" Margin="0,32,0,0" Style="{StaticResource TextBlockLargeBold}" HorizontalAlignment="Left"/>
+            <controls:Row Margin="0,20,0,0" Gutter="10">
+                <controls:Col Layout="{extension:ColLayout Xs=8, Sm=6, Md=4, Lg=3, Xl=1}">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Layout="{extension:ColLayout Xs=4, Sm=6, Md=8, Lg=9, Xl=11}">
+                    <Border Background="{DynamicResource SecondaryBorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Layout="{extension:ColLayout Xs=4, Sm=6, Md=8, Lg=9, Xl=11}">
+                    <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+                <controls:Col Layout="{extension:ColLayout Xs=8, Sm=6, Md=4, Lg=3, Xl=1}">
+                    <Border Background="{DynamicResource SecondaryBorderBrush}" Height="36" CornerRadius="4"/>
+                </controls:Col>
+            </controls:Row>
+        </StackPanel>
+    </ScrollViewer>
+</UserControl>

src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml.cs

@@ -0,0 +1,10 @@
+namespace HandyControlDemo.UserControl
+{
+    public partial class GridDemoCtl : IFull
+    {
+        public GridDemoCtl()
+        {
+            InitializeComponent();
+        }
+    }
+}

src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml

@@ -15,27 +15,27 @@
             <Border BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
                 <controls:ScrollViewer Orientation="Horizontal" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Hidden" IsEnableInertia="True">
                     <StackPanel Orientation="Horizontal">
-                        <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
+                        <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
-                        <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
+                        <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
-                        <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
+                        <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
-                        <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
+                        <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
-                        <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
+                        <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
@@ -46,27 +46,27 @@
             <Border Grid.Row="1" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Margin="0,16,0,0">
                 <controls:ScrollViewer IsEnableInertia="True">
                     <WrapPanel Orientation="Horizontal">
-                        <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
+                        <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
-                        <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
+                        <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
-                        <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
+                        <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
-                        <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
+                        <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
-                        <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
+                        <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>

src/Shared/HandyControlDemo_Shared/UserControl/Controls/SideMenuDemoCtl.xaml

@@ -0,0 +1,155 @@
+<UserControl x:Class="HandyControlDemo.UserControl.SideMenuDemoCtl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:command="http://www.galasoft.ch/mvvmlight"
+             DataContext="{Binding SideMenuDemo,Source={StaticResource Locator}}"
+             Background="{DynamicResource RegionBrush}">
+
+    <controls:TransitioningContentControl>
+        <controls:SideMenu BorderThickness="1" Width="200" Margin="32">
+            <i:Interaction.Triggers>
+                <i:EventTrigger EventName="SelectionChanged">
+                    <command:EventToCommand Command="{Binding SwitchItemCmd}" PassEventArgsToCommand="True" />
+                </i:EventTrigger>
+            </i:Interaction.Triggers>
+            <controls:SideMenuItem Header="Overview">
+                <controls:SideMenuItem.Icon>
+                    <Image Source="/HandyControlDemo;component/Resources/Img/DevOps/DevOps-Overview.png" Width="24" Height="24"/>
+                </controls:SideMenuItem.Icon>
+                <controls:SideMenuItem Header="Summary">
+                    <controls:SideMenuItem.Icon>
+                        <TextBlock Text="&#xf2cb;" Style="{StaticResource TextBlockFabricIcons}"/>
+                    </controls:SideMenuItem.Icon>
+                </controls:SideMenuItem>
+                <controls:SideMenuItem Header="Dashboards">
+                    <controls:SideMenuItem.Icon>
+                        <TextBlock Text="&#xf246;" Style="{StaticResource TextBlockFabricIcons}"/>
+                    </controls:SideMenuItem.Icon>
+                </controls:SideMenuItem>
+                <controls:SideMenuItem Header="Wiki">
+                    <controls:SideMenuItem.Icon>
+                        <TextBlock Text="&#xe82d;" Style="{StaticResource TextBlockFabricIcons}"/>
+                    </controls:SideMenuItem.Icon>
+                </controls:SideMenuItem>
+            </controls:SideMenuItem>
+            <controls:SideMenuItem Header="Boards">
+                <controls:SideMenuItem.Icon>
+                    <Image Source="/HandyControlDemo;component/Resources/Img/DevOps/DevOps-Boards.png" Width="24" Height="24"/>
+                </controls:SideMenuItem.Icon>
+                <controls:SideMenuItem Header="Work Items">
+                    <controls:SideMenuItem.Icon>
+                        <TextBlock Text="&#xf314;" Style="{StaticResource TextBlockFabricIcons}"/>
+                    </controls:SideMenuItem.Icon>
+                </controls:SideMenuItem>
+                <controls:SideMenuItem Header="Boards">
+                    <controls:SideMenuItem.Icon>
+                        <TextBlock Text="&#xf444;" Style="{StaticResource TextBlockFabricIcons}"/>
+                    </controls:SideMenuItem.Icon>
+                </controls:SideMenuItem>
+                <controls:SideMenuItem Header="Backlogs">
+                    <controls:SideMenuItem.Icon>
+                        <TextBlock Text="&#xf6bf;" Style="{StaticResource TextBlockFabricIcons}"/>
+                    </controls:SideMenuItem.Icon>
+                </controls:SideMenuItem>
+                <controls:SideMenuItem Header="Sprints">
+                    <controls:SideMenuItem.Icon>
+                        <TextBlock Text="&#xf3b0;" Style="{StaticResource TextBlockFabricIcons}"/>
+                    </controls:SideMenuItem.Icon>
+                </controls:SideMenuItem>
+                <controls:SideMenuItem Header="Queries">
+                    <controls:SideMenuItem.Icon>
+                        <TextBlock Text="&#xf2b8;" Style="{StaticResource TextBlockFabricIcons}"/>
+                    </controls:SideMenuItem.Icon>
+                </controls:SideMenuItem>
+            </controls:SideMenuItem>
+            <controls:SideMenuItem Header="Repos">
+                <controls:SideMenuItem.Icon>
+                    <Image Source="/HandyControlDemo;component/Resources/Img/DevOps/DevOps-Repos.png" Width="24" Height="24"/>
+                </controls:SideMenuItem.Icon>
+                <controls:SideMenuItem Header="Files">
+                    <controls:SideMenuItem.Icon>
+                        <TextBlock Text="&#xf30e;" Style="{StaticResource TextBlockFabricIcons}"/>
+                    </controls:SideMenuItem.Icon>
+                </controls:SideMenuItem>
+                <controls:SideMenuItem Header="Commits">
+                    <controls:SideMenuItem.Icon>
+                        <TextBlock Text="&#xf293;" Style="{StaticResource TextBlockFabricIcons}"/>
+                    </controls:SideMenuItem.Icon>
+                </controls:SideMenuItem>
+                <controls:SideMenuItem Header="Pushes">
+                    <controls:SideMenuItem.Icon>
+                        <TextBlock Text="&#xf298;" Style="{StaticResource TextBlockFabricIcons}"/>
+                    </controls:SideMenuItem.Icon>
+                </controls:SideMenuItem>
+                <controls:SideMenuItem Header="Branches">
+                    <controls:SideMenuItem.Icon>
+                        <TextBlock Text="&#xebc2;" Style="{StaticResource TextBlockFabricIcons}"/>
+                    </controls:SideMenuItem.Icon>
+                </controls:SideMenuItem>
+                <controls:SideMenuItem Header="Tags">
+                    <controls:SideMenuItem.Icon>
+                        <TextBlock Text="&#xe8ec;" Style="{StaticResource TextBlockFabricIcons}"/>
+                    </controls:SideMenuItem.Icon>
+                </controls:SideMenuItem>
+                <controls:SideMenuItem Header="Pull requests">
+                    <controls:SideMenuItem.Icon>
+                        <TextBlock Text="&#xf296;" Style="{StaticResource TextBlockFabricIcons}"/>
+                    </controls:SideMenuItem.Icon>
+                </controls:SideMenuItem>
+            </controls:SideMenuItem>
+            <controls:SideMenuItem Header="Pipelines">
+                <controls:SideMenuItem.Icon>
+                    <Image Source="/HandyControlDemo;component/Resources/Img/DevOps/DevOps-Pipelines.png" Width="24" Height="24"/>
+                </controls:SideMenuItem.Icon>
+                <controls:SideMenuItem Header="Builds">
+                    <controls:SideMenuItem.Icon>
+                        <TextBlock Text="&#xf28f;" Style="{StaticResource TextBlockFabricIcons}"/>
+                    </controls:SideMenuItem.Icon>
+                </controls:SideMenuItem>
+                <controls:SideMenuItem Header="Releases">
+                    <controls:SideMenuItem.Icon>
+                        <TextBlock Text="&#xf3b3;" Style="{StaticResource TextBlockFabricIcons}"/>
+                    </controls:SideMenuItem.Icon>
+                </controls:SideMenuItem>
+                <controls:SideMenuItem Header="Library">
+                    <controls:SideMenuItem.Icon>
+                        <TextBlock Text="&#xe8f1;" Style="{StaticResource TextBlockFabricIcons}"/>
+                    </controls:SideMenuItem.Icon>
+                </controls:SideMenuItem>
+                <controls:SideMenuItem Header="Task groups">
+                    <controls:SideMenuItem.Icon>
+                        <TextBlock Text="&#xf2ae;" Style="{StaticResource TextBlockFabricIcons}"/>
+                    </controls:SideMenuItem.Icon>
+                </controls:SideMenuItem>
+                <controls:SideMenuItem Header="Deployment groups">
+                    <controls:SideMenuItem.Icon>
+                        <TextBlock Text="&#xf29d;" Style="{StaticResource TextBlockFabricIcons}"/>
+                    </controls:SideMenuItem.Icon>
+                </controls:SideMenuItem>
+            </controls:SideMenuItem>
+            <controls:SideMenuItem Header="Test Plans">
+                <controls:SideMenuItem.Icon>
+                    <Image Source="/HandyControlDemo;component/Resources/Img/DevOps/DevOps-TestPlans.png" Width="24" Height="24"/>
+                </controls:SideMenuItem.Icon>
+                <controls:SideMenuItem Header="Test Plans">
+                    <controls:SideMenuItem.Icon>
+                        <TextBlock Text="&#xf3ab;" Style="{StaticResource TextBlockFabricIcons}"/>
+                    </controls:SideMenuItem.Icon>
+                </controls:SideMenuItem>
+                <controls:SideMenuItem Header="Runs">
+                    <controls:SideMenuItem.Icon>
+                        <TextBlock Text="&#xf3ac;" Style="{StaticResource TextBlockFabricIcons}"/>
+                    </controls:SideMenuItem.Icon>
+                </controls:SideMenuItem>
+                <controls:SideMenuItem Header="Load test">
+                    <controls:SideMenuItem.Icon>
+                        <TextBlock Text="&#xe8a9;" Style="{StaticResource TextBlockFabricIcons}"/>
+                    </controls:SideMenuItem.Icon>
+                </controls:SideMenuItem>
+            </controls:SideMenuItem>
+        </controls:SideMenu>
+    </controls:TransitioningContentControl>
+
+</UserControl>

src/Shared/HandyControlDemo_Shared/UserControl/Controls/SideMenuDemoCtl.xaml.cs

@@ -0,0 +1,10 @@
+namespace HandyControlDemo.UserControl
+{
+    public partial class SideMenuDemoCtl
+    {
+        public SideMenuDemoCtl()
+        {
+            InitializeComponent();
+        }
+    }
+}

src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml

@@ -7,7 +7,7 @@
         <controls:ScrollViewer HorizontalScrollBarVisibility="Auto">
             <StackPanel>
                 <Label Style="{StaticResource LabelPrimary}" Content="Default" Margin="32,32,0,0" HorizontalAlignment="Left"/>
-                <controls:TabControl Margin="32,16,32,0" Width="800" Height="300">
+                <controls:TabControl Margin="32,16,32,0" Width="800" Height="300" IsScrollable="True">
                     <controls:TabItem Header="TabItem1">
                         <controls:SimplePanel Background="White"/>
                     </controls:TabItem>

src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimePickerDemoCtl.xaml

@@ -17,7 +17,11 @@
                 <controls:TimePicker Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource TimePickerExtend}" controls:InfoElement.Necessary="True" Margin="0,16,0,0"/>
             </StackPanel>
             <StackPanel Margin="32,0,0,0">
-                <controls:TimePicker ShowClearButton="True" Style="{StaticResource TimePickerPlus}"/>
+                <controls:TimePicker ShowClearButton="True" Style="{StaticResource TimePickerPlus}">
+                    <controls:TimePicker.Clock>
+                        <controls:ListClock/>
+                    </controls:TimePicker.Clock>
+                </controls:TimePicker>
                 <controls:TimePicker Margin="0,16,0,0" IsEnabled="False" Style="{StaticResource TimePickerPlus}"/>
 
                 <controls:TimePicker ShowClearButton="True" Style="{StaticResource TimePickerPlus}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0"/>

src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml

@@ -8,403 +8,421 @@
         xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
         xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-    <TabControl SelectionChanged="TabControl_OnSelectionChanged" Style="{StaticResource TabControlInLine}" Background="Transparent" >
-        <i:Interaction.Triggers>
-            <i:EventTrigger EventName="SelectionChanged">
-                <command:EventToCommand Command="{Binding SwitchDemoCmd}" PassEventArgsToCommand="True" />
-            </i:EventTrigger>
-        </i:Interaction.Triggers>
-        <TabItem Background="Transparent" Header="{x:Static langs:Lang.Styles}">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition/>
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition/>
-                    <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
-                <controls:SearchBar x:Name="SearchBarStyle" SearchStarted="SearchBarStyle_OnSearchStarted" Style="{StaticResource SearchBarPlus}" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterKey}" Margin="4"/>
-                <ToggleButton Name="ButtonStyleAscending" Click="ButtonStyleAscending_OnClick" Grid.Row="0" Grid.Column="1" Margin="0,0,4,0" Style="{StaticResource ToggleButtonCustom}">
-                    <Border CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" Height="30" Width="30" >
-                        <Image Stretch="None" Source="/HandyControlDemo;component/Resources/Img/LeftMainContent/SortAscending_grey_16x.png"/>
-                    </Border>
-                    <controls:StatusSwitchElement.CheckedElement>
-                        <Border CornerRadius="4" Height="30" Width="30" BorderThickness="1" BorderBrush="{DynamicResource PrimaryBrush}"/>
-                    </controls:StatusSwitchElement.CheckedElement>
-                </ToggleButton>
-                <ListBox Name="ListBoxStyle" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" BorderThickness="0" SelectionMode="Single" Style="{StaticResource ListBoxTransparent}">
-                    <ListBoxItem Tag="{x:Static data:MessageToken.BrushDemoCtl}" Content="{x:Static langs:Lang.Brush}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Brush_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.ButtonDemoCtl}" Content="{x:Static langs:Lang.Button}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/ButtonClick_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.ToggleButtonDemoCtl}" Content="{x:Static langs:Lang.ToggleButton}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Toggle_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.RadioButtonDemoCtl}" Content="{x:Static langs:Lang.RadioButton}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/RadioButton_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.CheckBoxDemoCtl}" Content="{x:Static langs:Lang.CheckBox}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/CheckBox_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.NativeScrollViewerDemoCtl}" Content="{x:Static langs:Lang.ScrollViewer}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/ScrollBox_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.SliderDemoCtl}" Content="{x:Static langs:Lang.Slider}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Slider_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.TextBlockDemoCtl}" Content="{x:Static langs:Lang.TextBlock}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/TextBlock_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.NativeTextBoxDemoCtl}" Content="{x:Static langs:Lang.TextBox}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/TextBox_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.NativeComboBoxDemoCtl}" Content="{x:Static langs:Lang.ComboBox}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/ComboBox_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.NativePasswordBoxDemoCtl}" Content="{x:Static langs:Lang.PasswordBox}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/PasswordBox_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.ExpanderDemoCtl}" Content="{x:Static langs:Lang.Expander}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Expander_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.NativeProgressBarDemoCtl}" Content="{x:Static langs:Lang.ProgressBar}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/ProgressBar_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.CalendarDemoCtl}" Content="{x:Static langs:Lang.Calendar}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Calendar_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.NativeDatePickerDemoCtl}" Content="{x:Static langs:Lang.DatePicker}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/DatePicker_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.NativeTabControlDemoCtl}" Content="{x:Static langs:Lang.TabControl}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/TabPage_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.DataGridDemoCtl}" Content="{x:Static langs:Lang.DataGrid}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/DataGrid_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.TreeViewDemoCtl}" Content="{x:Static langs:Lang.TreeView}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/TreeView_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.ListBoxDemoCtl}" Content="{x:Static langs:Lang.ListBox}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/ListBox_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.ListViewDemoCtl}" Content="{x:Static langs:Lang.ListView}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/ListView_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.GroupBoxDemoCtl}" Content="{x:Static langs:Lang.GroupBox}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/GroupBox_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.MenuDemoCtl}" Content="{x:Static langs:Lang.Menu}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/ContextMenu_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.RichTextBoxDemoCtl}" Content="{x:Static langs:Lang.RichTextBox}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/RichTextBox_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.ToolBarDemoCtl}" Content="{x:Static langs:Lang.ToolBar}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/ToolBar_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.BorderDemoCtl}" Content="{x:Static langs:Lang.Border1}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/BorderElement_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.LabelDemoCtl}" Content="{x:Static langs:Lang.Label}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Label_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    
-                </ListBox>
-            </Grid>
-        </TabItem>
-        <TabItem Background="Transparent" Header="{x:Static langs:Lang.Controls}">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition/>
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition/>
-                    <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
-                <controls:SearchBar SearchStarted="SearchBarControl_OnSearchStarted" Style="{StaticResource SearchBarPlus}" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterKey}" Margin="4"/>
-                <ToggleButton Name="ButtonControlAscending" Click="ButtonControlAscending_OnClick" Grid.Row="0" Grid.Column="1" Margin="0,0,4,0" Style="{StaticResource ToggleButtonCustom}">
-                    <Border CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" Height="30" Width="30" >
-                        <Image Stretch="None" Source="/HandyControlDemo;component/Resources/Img/LeftMainContent/SortAscending_grey_16x.png"/>
-                    </Border>
-                    <controls:StatusSwitchElement.CheckedElement>
-                        <Border CornerRadius="4" Height="30" Width="30" BorderThickness="1" BorderBrush="{DynamicResource PrimaryBrush}"/>
-                    </controls:StatusSwitchElement.CheckedElement>
-                </ToggleButton>
-                <ListBox Name="ListBoxControl" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" BorderThickness="0" SelectionMode="Single"  Style="{StaticResource ListBoxTransparent}">
-                    <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.GravatarDemoCtl}" Content="{x:Static langs:Lang.Gravatar}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/User_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.BadgeDemoCtl}" Content="{x:Static langs:Lang.Badge}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/DotLarge_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.GotoTopDemoCtl}" Content="{x:Static langs:Lang.GotoTop}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/GoToTop_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.ProgressButtonDemoCtl}" Content="{x:Static langs:Lang.ProgressButton}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/ProgressButton_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.ChatBubbleDemoCtl}" Content="{x:Static langs:Lang.ChatBubble}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Bubble_16xLG.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.NotifyIconDemoCtl}" Content="{x:Static langs:Lang.NotifyIcon}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/NotificationHub_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.NumericUpDownDemoCtl}" Content="{x:Static langs:Lang.NumericUpDown}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/NumericListBox_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.TextBoxDemoCtl}" Content="{x:Static langs:Lang.TextBox}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/TextBox_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.ComboBoxDemoCtl}" Content="{x:Static langs:Lang.ComboBox}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/ComboBox_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.PasswordBoxDemoCtl}" Content="{x:Static langs:Lang.PasswordBox}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/PasswordBox_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.DatePickerDemoCtl}" Content="{x:Static langs:Lang.DatePicker}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/DatePicker_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.ClockDemoCtl}" Content="{x:Static langs:Lang.Clock}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Time_color_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.TimePickerDemoCtl}" Content="{x:Static langs:Lang.TimePicker}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/TimePicker_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.CalendarWithClockDemoCtl}" Content="{x:Static langs:Lang.CalendarWithClock}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Calendar_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.DateTimePickerDemoCtl}" Content="{x:Static langs:Lang.DateTimePicker}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/DatePicker_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.TransferDemoCtl}" Content="{x:Static langs:Lang.Transfer}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Transfer_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.FlipClockDemoCtl}" Content="{x:Static langs:Lang.FlipClock}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/FlipVertical_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.RateDemoCtl}" Content="{x:Static langs:Lang.Rate}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Star.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.ShieldDemoCtl}" Content="{x:Static langs:Lang.Shield}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Shield_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.SearchBarDemoCtl}" Content="{x:Static langs:Lang.SearchBar}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Search_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.TagDemoCtl}" Content="{x:Static langs:Lang.Tag}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Tag_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.GifImageDemoCtl}" Content="{x:Static langs:Lang.GifImage}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Animation_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.OutlineTextDemoCtl}" Content="{x:Static langs:Lang.OutlineText}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/TextBlock_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.CirclePanelDemoCtl}" Content="{x:Static langs:Lang.CirclePanel}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/ColorWheel_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.WaterfallPanelDemoCtl}" Content="{x:Static langs:Lang.WaterfallPanel}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Panel_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.CoverViewDemoCtl}" Content="{x:Static langs:Lang.CoverView}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/DetailDataView_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.CoverFlowDemoCtl}" Content="{x:Static langs:Lang.CoverFlow}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/LinearCarousel_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.ProgressBarDemoCtl}" Content="{x:Static langs:Lang.ProgressBar}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/ProgressBar_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.StepBarDemoCtl}" Content="{x:Static langs:Lang.StepBar}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Flow_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.GrowlDemoCtl}" Content="{x:Static langs:Lang.Growl}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Message_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.LoadingDemoCtl}" Content="{x:Static langs:Lang.Loading}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Loading_Blue_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.ImageBrowserDemoCtl}" Content="{x:Static langs:Lang.ImageBrowser}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/ImageBrowser_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.ColorPickerDemoCtl}" Content="{x:Static langs:Lang.ColorPicker}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/ColorPalette_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.CarouselDemoCtl}" Content="{x:Static langs:Lang.Carousel}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Carousel_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.CompareSliderDemoCtl}" Content="{x:Static langs:Lang.CompareSlider}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/SplitterControl_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.PreviewSliderDemoCtl}" Content="{x:Static langs:Lang.PreviewSlider}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/HoverMenu_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.TimeBarDemoCtl}" Content="{x:Static langs:Lang.TimeBar}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Timeline_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.PaginationDemoCtl}" Content="{x:Static langs:Lang.Pagination}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Paginator_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.AnimationPathDemoCtl}" Content="{x:Static langs:Lang.AnimationPath}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Path_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.TabControlDemoCtl}" Content="{x:Static langs:Lang.TabControl}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/TabPage_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.ScrollViewerDemoCtl}" Content="{x:Static langs:Lang.ScrollViewer}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/ScrollBox_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.DialogDemoCtl}" Content="{x:Static langs:Lang.Dialog}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/Dialog_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.WindowDemoCtl}" Content="{x:Static langs:Lang.Window}">
-                        <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/WindowsForm_16x.png"/>
-                        </controls:EdgeElement.LeftContent>
-                    </ListBoxItem>
-                </ListBox>
-            </Grid>
-        </TabItem>
-    </TabControl>
+    <DockPanel>
+        <Button Command="{Binding OpenOverviewCmd}" DockPanel.Dock="Top" HorizontalAlignment="Stretch" Margin="4,4,4,0" Content="{x:Static langs:Lang.Overview}"/>
+        <TabControl SelectionChanged="TabControl_OnSelectionChanged" Style="{StaticResource TabControlInLine}" Background="Transparent" >
+            <i:Interaction.Triggers>
+                <i:EventTrigger EventName="SelectionChanged">
+                    <command:EventToCommand Command="{Binding SwitchDemoCmd}" PassEventArgsToCommand="True" />
+                </i:EventTrigger>
+            </i:Interaction.Triggers>
+            <TabItem Background="Transparent" Header="{x:Static langs:Lang.Styles}">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <controls:SearchBar x:Name="SearchBarStyle" SearchStarted="SearchBarStyle_OnSearchStarted" Style="{StaticResource SearchBarPlus}" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterKey}" Margin="4"/>
+                    <ToggleButton Name="ButtonStyleAscending" Click="ButtonStyleAscending_OnClick" Grid.Row="0" Grid.Column="1" Margin="0,0,4,0" Style="{StaticResource ToggleButtonCustom}">
+                        <Border CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" Height="30" Width="30" >
+                            <Image Stretch="None" Source="/HandyControlDemo;component/Resources/Img/LeftMainContent/SortAscending_grey_16x.png"/>
+                        </Border>
+                        <controls:StatusSwitchElement.CheckedElement>
+                            <Border CornerRadius="4" Height="30" Width="30" BorderThickness="1" BorderBrush="{DynamicResource PrimaryBrush}"/>
+                        </controls:StatusSwitchElement.CheckedElement>
+                    </ToggleButton>
+                    <ListBox Name="ListBoxStyle" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" BorderThickness="0" SelectionMode="Single" Style="{StaticResource ListBoxTransparent}">
+                        <ListBoxItem Tag="{x:Static data:MessageToken.BrushDemoCtl}" Content="{x:Static langs:Lang.Brush}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Brush_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.ButtonDemoCtl}" Content="{x:Static langs:Lang.Button}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/ButtonClick_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.RepeatButtonDemoCtl}" Content="{x:Static langs:Lang.RepeatButton}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/RepeatButton_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.ToggleButtonDemoCtl}" Content="{x:Static langs:Lang.ToggleButton}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Toggle_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.RadioButtonDemoCtl}" Content="{x:Static langs:Lang.RadioButton}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/RadioButton_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.CheckBoxDemoCtl}" Content="{x:Static langs:Lang.CheckBox}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/CheckBox_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.NativeScrollViewerDemoCtl}" Content="{x:Static langs:Lang.ScrollViewer}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/ScrollBox_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.SliderDemoCtl}" Content="{x:Static langs:Lang.Slider}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Slider_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.TextBlockDemoCtl}" Content="{x:Static langs:Lang.TextBlock}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/TextBlock_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.NativeTextBoxDemoCtl}" Content="{x:Static langs:Lang.TextBox}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/TextBox_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.NativeComboBoxDemoCtl}" Content="{x:Static langs:Lang.ComboBox}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/ComboBox_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.NativePasswordBoxDemoCtl}" Content="{x:Static langs:Lang.PasswordBox}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/PasswordBox_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.ExpanderDemoCtl}" Content="{x:Static langs:Lang.Expander}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Expander_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.NativeProgressBarDemoCtl}" Content="{x:Static langs:Lang.ProgressBar}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/ProgressBar_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.CalendarDemoCtl}" Content="{x:Static langs:Lang.Calendar}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Calendar_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.NativeDatePickerDemoCtl}" Content="{x:Static langs:Lang.DatePicker}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/DatePicker_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.NativeTabControlDemoCtl}" Content="{x:Static langs:Lang.TabControl}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/TabPage_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.DataGridDemoCtl}" Content="{x:Static langs:Lang.DataGrid}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/DataGrid_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.TreeViewDemoCtl}" Content="{x:Static langs:Lang.TreeView}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/TreeView_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.ListBoxDemoCtl}" Content="{x:Static langs:Lang.ListBox}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/ListBox_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.ListViewDemoCtl}" Content="{x:Static langs:Lang.ListView}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/ListView_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.GroupBoxDemoCtl}" Content="{x:Static langs:Lang.GroupBox}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/GroupBox_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.MenuDemoCtl}" Content="{x:Static langs:Lang.Menu}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/ContextMenu_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.RichTextBoxDemoCtl}" Content="{x:Static langs:Lang.RichTextBox}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/RichTextBox_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.ToolBarDemoCtl}" Content="{x:Static langs:Lang.ToolBar}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/ToolBar_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.BorderDemoCtl}" Name="ListBoxItemBorder">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/BorderElement_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.LabelDemoCtl}" Content="{x:Static langs:Lang.Label}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Label_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+
+                    </ListBox>
+                </Grid>
+            </TabItem>
+            <TabItem Background="Transparent" Header="{x:Static langs:Lang.Controls}">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <controls:SearchBar SearchStarted="SearchBarControl_OnSearchStarted" Style="{StaticResource SearchBarPlus}" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterKey}" Margin="4"/>
+                    <ToggleButton Name="ButtonControlAscending" Click="ButtonControlAscending_OnClick" Grid.Row="0" Grid.Column="1" Margin="0,0,4,0" Style="{StaticResource ToggleButtonCustom}">
+                        <Border CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" Height="30" Width="30" >
+                            <Image Stretch="None" Source="/HandyControlDemo;component/Resources/Img/LeftMainContent/SortAscending_grey_16x.png"/>
+                        </Border>
+                        <controls:StatusSwitchElement.CheckedElement>
+                            <Border CornerRadius="4" Height="30" Width="30" BorderThickness="1" BorderBrush="{DynamicResource PrimaryBrush}"/>
+                        </controls:StatusSwitchElement.CheckedElement>
+                    </ToggleButton>
+                    <ListBox Name="ListBoxControl" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" BorderThickness="0" SelectionMode="Single"  Style="{StaticResource ListBoxTransparent}">
+                        <ListBoxItem Tag="{x:Static data:MessageToken.GravatarDemoCtl}" Content="{x:Static langs:Lang.Gravatar}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/User_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.BadgeDemoCtl}" Content="{x:Static langs:Lang.Badge}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/DotLarge_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.GotoTopDemoCtl}" Content="{x:Static langs:Lang.GotoTop}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/GoToTop_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.ProgressButtonDemoCtl}" Content="{x:Static langs:Lang.ProgressButton}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/ProgressButton_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.ChatBubbleDemoCtl}" Content="{x:Static langs:Lang.ChatBubble}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Bubble_16xLG.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.NotifyIconDemoCtl}" Content="{x:Static langs:Lang.NotifyIcon}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/NotificationHub_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.NumericUpDownDemoCtl}" Content="{x:Static langs:Lang.NumericUpDown}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/NumericListBox_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.TextBoxDemoCtl}" Content="{x:Static langs:Lang.TextBox}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/TextBox_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.ComboBoxDemoCtl}" Content="{x:Static langs:Lang.ComboBox}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/ComboBox_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.PasswordBoxDemoCtl}" Content="{x:Static langs:Lang.PasswordBox}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/PasswordBox_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.DatePickerDemoCtl}" Content="{x:Static langs:Lang.DatePicker}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/DatePicker_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.ClockDemoCtl}" Content="{x:Static langs:Lang.Clock}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Time_color_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.TimePickerDemoCtl}" Content="{x:Static langs:Lang.TimePicker}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/TimePicker_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.CalendarWithClockDemoCtl}" Content="{x:Static langs:Lang.CalendarWithClock}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Calendar_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.DateTimePickerDemoCtl}" Content="{x:Static langs:Lang.DateTimePicker}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/DatePicker_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.TransferDemoCtl}" Content="{x:Static langs:Lang.Transfer}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Transfer_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.FlipClockDemoCtl}" Content="{x:Static langs:Lang.FlipClock}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/FlipVertical_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.RateDemoCtl}" Content="{x:Static langs:Lang.Rate}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Star.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.ShieldDemoCtl}" Content="{x:Static langs:Lang.Shield}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Shield_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.SearchBarDemoCtl}" Content="{x:Static langs:Lang.SearchBar}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Search_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.TagDemoCtl}" Content="{x:Static langs:Lang.Tag}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Tag_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.GifImageDemoCtl}" Content="{x:Static langs:Lang.GifImage}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Animation_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.OutlineTextDemoCtl}" Content="{x:Static langs:Lang.OutlineText}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/TextBlock_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.CirclePanelDemoCtl}" Content="{x:Static langs:Lang.CirclePanel}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/ColorWheel_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.GridDemoCtl}" Content="{x:Static langs:Lang.Grid}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/GridPane_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.WaterfallPanelDemoCtl}" Content="{x:Static langs:Lang.WaterfallPanel}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Panel_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.CoverViewDemoCtl}" Content="{x:Static langs:Lang.CoverView}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/DetailDataView_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.CoverFlowDemoCtl}" Content="{x:Static langs:Lang.CoverFlow}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/LinearCarousel_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.ProgressBarDemoCtl}" Content="{x:Static langs:Lang.ProgressBar}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/ProgressBar_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.StepBarDemoCtl}" Content="{x:Static langs:Lang.StepBar}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Flow_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.GrowlDemoCtl}" Content="{x:Static langs:Lang.Growl}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Message_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.LoadingDemoCtl}" Content="{x:Static langs:Lang.Loading}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Loading_Blue_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.ImageBrowserDemoCtl}" Content="{x:Static langs:Lang.ImageBrowser}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/ImageBrowser_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.ColorPickerDemoCtl}" Content="{x:Static langs:Lang.ColorPicker}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/ColorPalette_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.CarouselDemoCtl}" Content="{x:Static langs:Lang.Carousel}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Carousel_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.CompareSliderDemoCtl}" Content="{x:Static langs:Lang.CompareSlider}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/SplitterControl_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.PreviewSliderDemoCtl}" Content="{x:Static langs:Lang.PreviewSlider}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/HoverMenu_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.TimeBarDemoCtl}" Content="{x:Static langs:Lang.TimeBar}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Timeline_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.PaginationDemoCtl}" Content="{x:Static langs:Lang.Pagination}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Paginator_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.AnimationPathDemoCtl}" Content="{x:Static langs:Lang.AnimationPath}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Path_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.TabControlDemoCtl}" Content="{x:Static langs:Lang.TabControl}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/TabPage_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.SideMenuDemoCtl}" Content="{x:Static langs:Lang.SideMenu}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/MainMenuControl_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.ScrollViewerDemoCtl}" Content="{x:Static langs:Lang.ScrollViewer}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/ScrollBox_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.DialogDemoCtl}" Content="{x:Static langs:Lang.Dialog}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/Dialog_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                        <ListBoxItem Tag="{x:Static data:MessageToken.WindowDemoCtl}" Content="{x:Static langs:Lang.Window}">
+                            <controls:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/WindowsForm_16x.png"/>
+                            </controls:EdgeElement.LeftContent>
+                        </ListBoxItem>
+                    </ListBox>
+                </Grid>
+            </TabItem>
+        </TabControl>
+    </DockPanel>
 </Border>

src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml.cs

@@ -16,6 +16,13 @@ namespace HandyControlDemo.UserControl
         public LeftMainContent()
         {
             InitializeComponent();
+
+            /*You have to ask me why I made Border special.
+             What drives me crazy is that if you don't do this, 
+             the content of ListBoxItemBorder will always be 1 ! 
+             How amazing!
+             I wish someone could tell me why. */
+            ListBoxItemBorder.Content = Properties.Langs.Lang.Border;
         }
 
         private void TabControl_OnSelectionChanged(object sender, SelectionChangedEventArgs e)

src/Shared/HandyControlDemo_Shared/UserControl/Main/OverView.xaml

@@ -0,0 +1,364 @@
+<UserControl x:Class="HandyControlDemo.UserControl.OverView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d"
+             Background="{DynamicResource RegionBrush}"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:userControl="clr-namespace:HandyControlDemo.UserControl"
+             xmlns:interactivity="clr-namespace:HandyControl.Interactivity;assembly=HandyControl">
+    <ScrollViewer HorizontalScrollBarVisibility="Auto">
+        <Canvas HorizontalAlignment="Center" VerticalAlignment="Center" Name="CanvasMain" Margin="32" Width="1665" Height="1300" Effect="{StaticResource EffectShadow5}">
+            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4">
+                <StackPanel>
+                    <Button Width="80" Content="Button" Margin="0,0,0,10"/>
+                    <Button Width="80" Content="Button" Style="{StaticResource ButtonPrimary}" Margin="0,0,0,10"/>
+                    <Button Width="80" Padding="16,8" controls:IconElement.Geometry="{StaticResource DeleteGeometry}" Margin="0,0,0,10"/>
+                    <Button Width="80" Content="Clock"  Margin="0,0,0,10" Style="{StaticResource ButtonPrimary}" controls:IconElement.Geometry="{StaticResource ClockGeometry}"/>
+                    <Button Width="80"  Margin="0,0,0,10" Height="28" Padding="10,0" Background="#24292e" Foreground="White" Content="Button" Style="{StaticResource ButtonCustom}" controls:BackgroundSwitchElement.MouseHoverBackground="Red" controls:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
+                    <Button Width="80" Padding="16,8" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource PrimaryTextBrush}" controls:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                </StackPanel>
+            </Border>
+            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="128">
+                <StackPanel>
+                    <ToggleButton Width="128" Margin="0,0,0,10" IsChecked="True" Content="ToggleButton"/>
+                    <ToggleButton Width="128" Margin="0,0,0,10" Content="ToggleButton" Style="{StaticResource ToggleButtonPrimary}"/>
+                    <ToggleButton Width="128" Margin="0,0,0,10" Style="{StaticResource ToggleButtonIcon}" controls:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
+                    <ToggleButton Width="128" Margin="0,0,0,10" IsChecked="True" Content="ToggleButton" controls:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource ToggleButtonPrimary}"/>
+                    <ToggleButton Margin="0,0,0,10" IsChecked="True" Style="{StaticResource ToggleButtonCustom}" controls:StatusSwitchElement.HiddenElement="True">
+                        <controls:StatusSwitchElement.CheckedElement>
+                            <Border Width="128" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
+                                <Ellipse Width="20" Height="20" Fill="{DynamicResource PrimaryBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
+                            </Border>
+                        </controls:StatusSwitchElement.CheckedElement>
+                        <Border Width="128" 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,0,0,10" IsChecked="True" HorizontalAlignment="Center" Style="{StaticResource ToggleButtonSwitch}"/>
+                    <ToggleButton Style="{StaticResource ToggleButtonIconTransparent}" controls:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
+                </StackPanel>
+            </Border>
+            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="611">
+                <userControl:SideMenuDemoCtl Height="424" Margin="-32" Background="Transparent"/>
+            </Border>
+            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="304">
+                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                        <StackPanel>
+                            <RadioButton Content="Radio"/>
+                            <RadioButton Margin="0,16,0,0" Content="Radio" IsChecked="True" IsEnabled="False"/>
+                            <RadioButton Margin="0,16,0,0" Content="Radio"/>
+                            <RadioButton Margin="0,16,0,0" Content="Radio" IsEnabled="False"/>
+                        </StackPanel>
+                        <UniformGrid Margin="22,0,0,0" Rows="2" Columns="2">
+                            <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" controls:IconElement.Geometry="{StaticResource CalendarGeometry}" Style="{StaticResource RadioButtonIcon}" Content="Radio"/>
+                            <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" Style="{StaticResource RadioButtonIcon}" Content="Radio" IsChecked="True"/>
+                            <RadioButton Margin="10,0,0,0" BorderThickness="1" controls:IconElement.Geometry="{StaticResource CalendarGeometry}" Style="{StaticResource RadioButtonIcon}" Content="Radio"/>
+                            <RadioButton Margin="10,0,0,0" BorderThickness="1" Style="{StaticResource RadioButtonIcon}" Content="Radio"/>
+                        </UniformGrid>
+                    </StackPanel>
+                    <controls:RadioGroup Margin="0,32,0,0">
+                        <RadioButton Content="Radio" IsChecked="True"/>
+                        <RadioButton Content="Radio"/>
+                        <RadioButton IsEnabled="False" Content="Radio"/>
+                        <RadioButton Content="Radio"/>
+                    </controls:RadioGroup>
+                    <controls:RadioGroup Margin="0,16,0,0" Style="{StaticResource RadioGroupSolid}">
+                        <RadioButton Content="Radio"/>
+                        <RadioButton Content="Radio"/>
+                        <RadioButton IsEnabled="False" Content="Radio"/>
+                        <RadioButton Content="Radio" IsChecked="True"/>
+                    </controls:RadioGroup>
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                        <controls:RadioGroup Margin="0,16,8,0" Orientation="Vertical">
+                            <RadioButton Content="Radio" IsChecked="True"/>
+                            <RadioButton Content="Radio"/>
+                            <RadioButton IsEnabled="False" Content="Radio"/>
+                            <RadioButton Content="Radio"/>
+                        </controls:RadioGroup>
+                        <controls:RadioGroup Margin="8,16,0,0" Orientation="Vertical" Style="{StaticResource RadioGroupSolid}">
+                            <RadioButton Content="Radio"/>
+                            <RadioButton Content="Radio"/>
+                            <RadioButton IsEnabled="False" Content="Radio"/>
+                            <RadioButton Content="Radio" IsChecked="True"/>
+                        </controls:RadioGroup>
+                    </StackPanel>
+                </StackPanel>
+            </Border>
+            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Top="276" Height="226">
+                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                    <CheckBox Content="CheckBox" IsChecked="True"/>
+                    <CheckBox Margin="0,16,0,0" Content="CheckBox" IsChecked="True" IsEnabled="False"/>
+                    <CheckBox Margin="0,16,0,0" Content="CheckBox"/>
+                    <CheckBox Margin="0,16,0,0" Content="CheckBox" IsEnabled="False"/>
+                    <CheckBox Margin="0,16,0,0" Content="CheckBox" IsChecked="{x:Null}"/>
+                    <CheckBox Margin="0,16,0,0" Content="CheckBox" IsChecked="{x:Null}" IsEnabled="False"/>
+                </StackPanel>
+            </Border>
+            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Top="516">
+                <StackPanel>
+                    <Slider Width="400" IsSnapToTickEnabled="True" Value="8"/>
+                    <Slider Width="400" IsSnapToTickEnabled="True" Value="3" Margin="0,32,0,0" IsEnabled="False"/>
+                    <Slider Width="400" IsSnapToTickEnabled="True" TickFrequency="5" Maximum="100" TickPlacement="TopLeft" Value="10" IsSelectionRangeEnabled="True" SelectionStart="10" SelectionEnd="80" Margin="0,32,0,0"/>
+                    <Slider Width="400" controls:TipElement.Visibility="Visible" IsSnapToTickEnabled="True" Maximum="100" Value="60" TickFrequency="10" TickPlacement="BottomRight" Margin="0,32,0,0"/>
+                    <Slider Width="400" controls:TipElement.Visibility="Visible" controls:TipElement.Placement="BottomRight" IsSnapToTickEnabled="True" Value="5" TickPlacement="Both" Margin="0,32,0,0"/>
+                </StackPanel>
+            </Border>
+            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Top="806" Width="349">
+                <TabControl Height="200" Style="{StaticResource TabControlInLine}">
+                    <TabItem Header="Title" HeaderStringFormat="{}{0}1">
+                        <Border Background="{DynamicResource PrimaryBrush}">
+                            <TextBlock Style="{StaticResource TextBlockLargeBold}" Foreground="{DynamicResource TextIconBrush}">
+                                <Run Text="Text"/>
+                                <Run Text="1"/>
+                            </TextBlock>
+                        </Border>
+                    </TabItem>
+                    <TabItem Header="Title" HeaderStringFormat="{}{0}2">
+                        <Border Background="{DynamicResource SuccessBrush}">
+                            <TextBlock Style="{StaticResource TextBlockLargeBold}" Foreground="{DynamicResource TextIconBrush}">
+                                <Run Text="Text"/>
+                                <Run Text="2"/>
+                            </TextBlock>
+                        </Border>
+                    </TabItem>
+                    <TabItem Header="Title" HeaderStringFormat="{}{0}3">
+                        <Border Background="{DynamicResource InfoBrush}">
+                            <TextBlock Style="{StaticResource TextBlockLargeBold}" Foreground="{DynamicResource TextIconBrush}">
+                                <Run Text="Text"/>
+                                <Run Text="3"/>
+                            </TextBlock>
+                        </Border>
+                    </TabItem>
+                    <TabItem Header="Title" HeaderStringFormat="{}{0}4">
+                        <Border Background="{DynamicResource WarningBrush}">
+                            <TextBlock Style="{StaticResource TextBlockLargeBold}" Foreground="{DynamicResource TextIconBrush}">
+                                <Run Text="Text"/>
+                                <Run Text="4"/>
+                            </TextBlock>
+                        </Border>
+                    </TabItem>
+                    <TabItem IsSelected="True" Header="Title" HeaderStringFormat="{}{0}5">
+                        <Border Background="{DynamicResource DangerBrush}">
+                            <TextBlock Style="{StaticResource TextBlockLargeBold}" Foreground="{DynamicResource TextIconBrush}">
+                                <Run Text="Text"/>
+                                <Run Text="5"/>
+                            </TextBlock>
+                        </Border>
+                    </TabItem>
+                </TabControl>
+            </Border>
+            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="859" Width="240">
+                <StackPanel>
+                    <ProgressBar Value="20" Margin="0,0,0,10"/>
+                    <ProgressBar Style="{StaticResource ProgressBarDangerStripe}" Margin="0,0,0,10" Value="120" Maximum="200" />
+                    <ProgressBar Style="{StaticResource ProgressBarFlat}" Margin="0,8,0,10" Value="110" Maximum="200" />
+                </StackPanel>
+            </Border>
+            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="859" Height="264" Canvas.Top="130">
+                <ScrollViewer>
+                    <StackPanel VerticalAlignment="Top">
+                        <Expander Header="Title" BorderThickness="1,1,1,0" BorderBrush="{DynamicResource BorderBrush}" Width="206" HorizontalAlignment="Left">
+                            <Border Height="100" Background="{DynamicResource SecondaryRegionBrush}"/>
+                        </Expander>
+                        <Expander Header="Title" BorderThickness="1,1,1,0" BorderBrush="{DynamicResource BorderBrush}" Width="206" HorizontalAlignment="Left">
+                            <Border Height="100" Background="{DynamicResource SecondaryRegionBrush}"/>
+                        </Expander>
+                        <Expander Header="Title" BorderThickness="1,1,1,0" BorderBrush="{DynamicResource BorderBrush}" Width="206" HorizontalAlignment="Left">
+                            <Border Height="100" Background="{DynamicResource SecondaryRegionBrush}"/>
+                        </Expander>
+                        <Expander Header="Title" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Width="206" HorizontalAlignment="Left">
+                            <Border Height="100" Background="{DynamicResource SecondaryRegionBrush}"/>
+                        </Expander>
+                    </StackPanel>
+                </ScrollViewer>
+            </Border>
+            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1113">
+                <Calendar SelectionMode="MultipleRange"/>
+            </Border>
+            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1421" Height="346">
+                <controls:Clock/>
+            </Border>
+            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="611" Height="326" Canvas.Top="408" Width="488">
+                <DataGrid HeadersVisibility="All" RowHeaderWidth="60" AutoGenerateColumns="False" ItemsSource="{Binding DataList}">
+                    <DataGrid.RowHeaderTemplate>
+                        <DataTemplate>
+                            <CheckBox IsChecked="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=DataGridRow}}"/>
+                        </DataTemplate>
+                    </DataGrid.RowHeaderTemplate>
+                    <DataGrid.Columns>
+                        <DataGridTextColumn IsReadOnly="True" Width="80" CanUserResize="False" Binding="{Binding Index}" Header="Index"/>
+                        <DataGridTemplateColumn Width="60" CanUserResize="False">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <Image Source="{Binding ImgPath}" Width="32" Height="32" Stretch="Uniform"/>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                        <DataGridTextColumn Width="1*" Binding="{Binding Name}" Header="Name"/>
+                        <DataGridCheckBoxColumn Width="100" CanUserResize="False" Binding="{Binding IsSelected}" Header="Selected"/>
+                        <DataGridComboBoxColumn ItemsSource="{Binding Source={StaticResource DemoTypes}}" Width="100" CanUserResize="False" SelectedValueBinding="{Binding Type}" Header="Type"/>
+                        <DataGridTextColumn Width="1*" Binding="{Binding Remark}" Header="Remark"/>
+                    </DataGrid.Columns>
+                </DataGrid>
+            </Border>
+            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="363" Height="234" Canvas.Top="806">
+                <TreeView Width="200" ItemsSource="{Binding DataList}">
+                    <TreeView.ItemTemplate>
+                        <HierarchicalDataTemplate ItemsSource="{Binding DataList}">
+                            <TextBlock Text="{Binding Name}"/>
+                        </HierarchicalDataTemplate>
+                    </TreeView.ItemTemplate>
+                </TreeView>
+            </Border>
+            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1158" Height="334" Canvas.Top="748" Width="219">
+                <ListBox ItemsSource="{Binding DataList}">
+                    <ListBox.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding Name}"/>
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                </ListBox>
+            </Border>
+            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1113" Canvas.Top="360" Width="264">
+                <GroupBox Height="200" Header="GroupBox" Padding="10" Margin="0,0,-2,0" >
+                    <Border Background="{DynamicResource PrimaryBrush}" CornerRadius="4">
+                        <TextBlock Text="GroupBox" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                    </Border>
+                </GroupBox>
+            </Border>
+            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Top="1054" Width="597">
+                <ToolBarTray VerticalAlignment="Center">
+                    <ToolBar Padding="6">
+                        <CheckBox IsChecked="True" Margin="10,0,0,0"/>
+                        <Separator Margin="10,0,0,0"/>
+                        <StackPanel Orientation="Horizontal">
+                            <RadioButton IsChecked="True" Margin="10,0,0,0"/>
+                            <RadioButton Margin="10,0,0,0"/>
+                        </StackPanel>
+                        <Button Content="Button" Margin="10,0,0,0"/>
+                        <Button Content="Button" Margin="10,0,0,0" Style="{StaticResource ButtonPrimary}"/>
+                    </ToolBar>
+                    <ToolBar Band="1" Padding="6">
+                        <ComboBox DataContext="{Binding ComboBoxDemo,Source={StaticResource Locator}}" ItemsSource="{Binding DataList}" SelectedIndex="0" Width="230"/>
+                        <TextBox Text="TextTextTextText" Margin="10,0,0,0" Width="230"/>
+                    </ToolBar>
+                    <ToolBar Band="0" Padding="6">
+                        <Menu Background="Transparent" VerticalAlignment="Center">
+                            <MenuItem Header="Repository">
+                                <MenuItem Header="GitHub">
+                                    <MenuItem.Icon>
+                                        <Path Data="{StaticResource GithubGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem Header="NuGet">
+                                    <MenuItem.Icon>
+                                        <Path Data="{StaticResource NugetGeometry}" Fill="#224880"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                            </MenuItem>
+                            <MenuItem Header="About">
+                                <MenuItem Header="Email">
+                                    <MenuItem.Icon>
+                                        <Path Data="{StaticResource EmailGeometry}" Fill="{DynamicResource PrimaryBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem Header="Chatroom">
+                                    <MenuItem.Icon>
+                                        <Path Data="{StaticResource GitterGeometry}" Fill="#e52e64"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem Header="Blog">
+                                    <MenuItem.Icon>
+                                        <Path Data="{StaticResource CnblogsGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                            </MenuItem>
+                            <MenuItem Header="Contributors"/>
+                        </Menu>
+                    </ToolBar>
+                </ToolBarTray>
+            </Border>
+            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1391" Canvas.Top="360">
+                <UniformGrid Rows="3" Columns="3" Width="240" Height="240">
+                    <controls:Gravatar Id="User1"/>
+                    <controls:Gravatar Id="User2"/>
+                    <controls:Gravatar Style="{StaticResource GravatarCircleImg}">
+                        <Image Source="/HandyControlDemo;component/Resources/Img/Album/2.jpg"/>
+                    </controls:Gravatar>
+                    <controls:Gravatar Id="User4"/>
+                    <controls:Gravatar Id="User5" Style="{StaticResource GravatarCircle}"/>
+                    <controls:Gravatar Id="User6"/>
+                    <controls:Gravatar Style="{StaticResource GravatarCircle}" Source="/HandyControlDemo;component/Resources/Img/Album/1.jpg"/>
+                    <controls:Gravatar Id="User8"/>
+                    <controls:Gravatar Id="User9"/>
+                </UniformGrid>
+            </Border>
+            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="448" Canvas.Top="516" Height="276" Width="149">
+                <StackPanel VerticalAlignment="Center">
+                    <controls:Badge HorizontalAlignment="Center" Text="New" BadgeMargin="0,-14,-20,0" Height="30">
+                        <Button Content="Comment"/>
+                    </controls:Badge>
+                    <controls:Badge DataContext="{Binding BadgeDemo, Source={StaticResource Locator}}" HorizontalAlignment="Center" Value="{Binding Count}" BadgeMargin="0,-14,-10,0" Height="30" Margin="0,16,0,0" Style="{StaticResource BadgePrimary}">
+                        <Button Content="Click2Count" Command="{Binding CountCmd}"/>
+                    </controls:Badge>
+                    <controls:Badge HorizontalAlignment="Center" Value="100" BadgeMargin="0,-14,-20,0" Height="30" Margin="0,16,0,0" Style="{StaticResource BadgeDanger}">
+                        <Button Content="Comment"/>
+                    </controls:Badge>
+                    <controls:Badge HorizontalAlignment="Center" Status="Dot" Height="30" Margin="0,16,0,0" Style="{StaticResource BadgeDanger}">
+                        <Button Content="Reply"/>
+                    </controls:Badge>
+                    <controls:Badge HorizontalAlignment="Center" Status="Processing" Height="30" Margin="0,16,0,0" Style="{StaticResource BadgeDanger}">
+                        <Button Content="Reply" />
+                    </controls:Badge>
+                </StackPanel>
+            </Border>
+            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="128" Canvas.Top="310" Width="162" Height="84">
+                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
+                    <controls:Shield Subject="chat" Status="on gitter" Margin="0,0,0,0" Color="#4eb899" Command="interactivity:ControlCommands.OpenLink" controls:LinkElement.Link="https://gitter.im/HandyControl/Lobby?utm_source=badge&amp;utm_medium=badge&amp;utm_campaign=pr-badge&amp;utm_content=badge"/>
+                    <controls:Shield Subject="qq" Status="714704041" Margin="0,4,0,0" Color="#d8624c" Command="interactivity:ControlCommands.OpenLink" controls:LinkElement.Link="http://shang.qq.com/wpa/qunwpa?idkey=a571e5553c9d41e49c4f22f3a8b2865451497a795ff281fedf3285def247efc1"/>
+                </WrapPanel>
+            </Border>
+            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="128" Canvas.Top="408">
+                <StackPanel Orientation="Horizontal">
+                    <StackPanel Width="271" VerticalAlignment="Center" Margin="0,0,32,0">
+                        <controls:LoadingLine/>
+                        <controls:LoadingLine Margin="0,28,0,0" Foreground="BlueViolet" Style="{StaticResource LoadingLineLarge}"/>
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+                        <controls:LoadingCircle/>
+                        <Border VerticalAlignment="Center" Margin="32,0,0,0" Background="{DynamicResource PrimaryBrush}" CornerRadius="10">
+                            <controls:LoadingCircle Style="{StaticResource LoadingCircleLight}" Margin="10"/>
+                        </Border>
+                    </StackPanel>
+                </StackPanel>
+            </Border>
+            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="611" Canvas.Top="748" Height="214">
+                <controls:Transfer ItemsSource="{Binding DataList}">
+                    <controls:Transfer.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding Name}"/>
+                        </DataTemplate>
+                    </controls:Transfer.ItemTemplate>
+                </controls:Transfer>
+            </Border>
+            <Border Visibility="Collapsed" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="611" Canvas.Top="976">
+                <userControl:CoverFlowDemoCtl Width="563" Margin="-32" Background="Transparent"/>
+            </Border>
+            <Border Visibility="Collapsed" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1391" Canvas.Top="648" Width="274">
+                <userControl:ColorPickerDemoCtl Margin="-32" Background="Transparent"/>
+            </Border>
+            <Border Visibility="Collapsed" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1113" Canvas.Top="608" Width="264" Height="126">
+                <controls:TagPanel Orientation="Horizontal" MaxWidth="400" VerticalAlignment="Center">
+                    <controls:Tag ShowCloseButton="False" Content="TextText"/>
+                    <controls:Tag Content="Text"/>
+                    <controls:Tag IsSelected="True" Selectable="True" ShowCloseButton="False" Content="Text"/>
+                    <controls:Tag IsSelected="True" Selectable="True" Content="Text"/>
+                    <controls:Tag ShowCloseButton="False" Content="TextText"/>
+                </controls:TagPanel>
+            </Border>
+        </Canvas>
+    </ScrollViewer>
+</UserControl>

src/Shared/HandyControlDemo_Shared/UserControl/Main/OverView.xaml.cs

@@ -0,0 +1,18 @@
+using System.Windows;
+using HandyControl.Tools.Extension;
+
+namespace HandyControlDemo.UserControl
+{
+    public partial class OverView
+    {
+        public OverView()
+        {
+            InitializeComponent();
+
+            foreach (UIElement child in CanvasMain.Children)
+            {
+                child.Show();
+            }
+        }
+    }
+}

src/Shared/HandyControlDemo_Shared/UserControl/Styles/BorderDemoCtl.xaml

@@ -6,32 +6,32 @@
              Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
         <UniformGrid Margin="32,32,0,0" Columns="3" Rows="2">
-            <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="0,0,32,32">
+            <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="0,0,32,32">
                 <Border Background="{DynamicResource PrimaryBrush}">
                     <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                 </Border>
             </Border>
-            <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="0,0,32,32" Effect="{StaticResource EffectShadow1}">
+            <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="0,0,32,32" Effect="{StaticResource EffectShadow1}">
                 <Border Background="{DynamicResource InfoBrush}">
                     <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                 </Border>
             </Border>
-            <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="0,0,32,32" Effect="{StaticResource EffectShadow2}">
+            <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="0,0,32,32" Effect="{StaticResource EffectShadow2}">
                 <Border Background="{DynamicResource WarningBrush}">
                     <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                 </Border>
             </Border>
-            <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200"  Margin="0,0,32,32" Effect="{StaticResource EffectShadow3}">
+            <Border Style="{StaticResource BorderRegion}" Width="200" Height="200"  Margin="0,0,32,32" Effect="{StaticResource EffectShadow3}">
                 <Border Background="{DynamicResource DangerBrush}">
                     <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                 </Border>
             </Border>
-            <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200"  Margin="0,0,32,32" Effect="{StaticResource EffectShadow4}">
+            <Border Style="{StaticResource BorderRegion}" Width="200" Height="200"  Margin="0,0,32,32" Effect="{StaticResource EffectShadow4}">
                 <Border Background="{DynamicResource AccentBrush}">
                     <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                 </Border>
             </Border>
-            <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200"  Margin="0,0,32,32" Effect="{StaticResource EffectShadow5}">
+            <Border Style="{StaticResource BorderRegion}" Width="200" Height="200"  Margin="0,0,32,32" Effect="{StaticResource EffectShadow5}">
                 <Border Background="{DynamicResource BorderBrush}">
                     <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                 </Border>

src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml

@@ -72,8 +72,8 @@
                 </WrapPanel>
                 <WrapPanel ItemWidth="160" ItemHeight="130">
                     <StackPanel>
-                        <Button Margin="5" Height="28" Padding="10,0" Background="#24292e" Foreground="White" Content="{x:Static langs:Lang.ButtonOpacity}" Style="{StaticResource ButtonCustom}" controls:BackgroundSwitchElement.MouseHoverBackground="Red" controls:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
-                        <Button Margin="5" Height="28" IsEnabled="False" Padding="10,0" Background="#24292e" Foreground="White" Content="{x:Static langs:Lang.ButtonOpacity}" Style="{StaticResource ButtonCustom}" controls:BackgroundSwitchElement.MouseHoverBackground="Red" controls:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
+                        <Button Margin="5" Height="28" Padding="10,0" Background="#24292e" Foreground="White" Content="{x:Static langs:Lang.ButtonCustom}" Style="{StaticResource ButtonCustom}" controls:BackgroundSwitchElement.MouseHoverBackground="Red" controls:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
+                        <Button Margin="5" Height="28" IsEnabled="False" Padding="10,0" Background="#24292e" Foreground="White" Content="{x:Static langs:Lang.ButtonCustom}" Style="{StaticResource ButtonCustom}" controls:BackgroundSwitchElement.MouseHoverBackground="Red" controls:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
                         <TextBlock TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ButtonCustom"/>
                     </StackPanel>
                     <StackPanel>

src/Shared/HandyControlDemo_Shared/UserControl/Styles/CalendarDemoCtl.xaml.cs

@@ -1,5 +1,4 @@
-
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl
 {
     public partial class CalendarDemoCtl
     {

src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeScrollViewerDemoCtl.xaml

@@ -15,27 +15,27 @@
             <Border BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
                 <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Hidden">
                     <StackPanel Orientation="Horizontal">
-                        <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
+                        <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
-                        <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
+                        <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
-                        <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
+                        <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
-                        <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
+                        <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
-                        <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
+                        <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
@@ -46,27 +46,27 @@
             <Border Grid.Row="1" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Margin="0,16,0,0">
                 <ScrollViewer>
                     <WrapPanel Orientation="Horizontal">
-                        <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
+                        <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
-                        <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
+                        <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
-                        <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
+                        <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
-                        <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
+                        <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
-                        <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
+                        <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>

src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml

@@ -0,0 +1,88 @@
+<UserControl x:Class="HandyControlDemo.UserControl.RepeatButtonDemoCtl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+             Background="{DynamicResource RegionBrush}">
+    <controls:TransitioningContentControl>
+        <controls:ScrollViewer IsEnableInertia="True">
+            <StackPanel Margin="32">
+                <WrapPanel ItemWidth="160" ItemHeight="130">
+                    <StackPanel>
+                        <RepeatButton Content="{x:Static langs:Lang.Default}" Margin="5"/>
+                        <RepeatButton IsEnabled="False" Content="{x:Static langs:Lang.Default}" Margin="5"/>
+                    </StackPanel>
+                    <StackPanel>
+                        <RepeatButton Content="{x:Static langs:Lang.Primary}" Margin="5" Style="{StaticResource RepeatButtonPrimary}"/>
+                        <RepeatButton IsEnabled="False" Content="{x:Static langs:Lang.Primary}" Margin="5" Style="{StaticResource RepeatButtonPrimary}"/>
+                        <TextBlock TextAlignment="Center" Style="{StaticResource TextBlockDefault}" Text="RepeatButtonPrimary"/>
+                    </StackPanel>
+                    <StackPanel>
+                        <RepeatButton Content="{x:Static langs:Lang.Success}" Margin="5" Style="{StaticResource RepeatButtonSuccess}"/>
+                        <RepeatButton IsEnabled="False" Content="{x:Static langs:Lang.Success}" Margin="5" Style="{StaticResource RepeatButtonSuccess}"/>
+                        <TextBlock TextAlignment="Center" Style="{StaticResource TextBlockDefault}" Text="RepeatButtonSuccess"/>
+                    </StackPanel>
+                    <StackPanel>
+                        <RepeatButton Content="{x:Static langs:Lang.Info}" Margin="5" Style="{StaticResource RepeatButtonInfo}"/>
+                        <RepeatButton IsEnabled="False" Content="{x:Static langs:Lang.Info}" Margin="5" Style="{StaticResource RepeatButtonInfo}"/>
+                        <TextBlock TextAlignment="Center" Style="{StaticResource TextBlockDefault}" Text="RepeatButtonInfo"/>
+                    </StackPanel>
+                    <StackPanel>
+                        <RepeatButton Content="{x:Static langs:Lang.Warning}" Margin="5" Style="{StaticResource RepeatButtonWarning}"/>
+                        <RepeatButton IsEnabled="False" Content="{x:Static langs:Lang.Warning}" Margin="5" Style="{StaticResource RepeatButtonWarning}"/>
+                        <TextBlock TextAlignment="Center" Style="{StaticResource TextBlockDefault}" Text="RepeatButtonWarning"/>
+                    </StackPanel>
+                    <StackPanel>
+                        <RepeatButton Content="{x:Static langs:Lang.Danger}" Margin="5" Style="{StaticResource RepeatButtonDanger}"/>
+                        <RepeatButton IsEnabled="False" Content="{x:Static langs:Lang.Danger}" Margin="5" Style="{StaticResource RepeatButtonDanger}"/>
+                        <TextBlock TextAlignment="Center" Style="{StaticResource TextBlockDefault}" Text="RepeatButtonDanger"/>
+                    </StackPanel>
+                </WrapPanel>
+                <WrapPanel ItemWidth="160" ItemHeight="130">
+                    <StackPanel>
+                        <RepeatButton Width="50" Padding="16,8" Margin="5" controls:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
+                        <RepeatButton Width="50" Padding="16,8" IsEnabled="False" Margin="5" controls:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
+                        <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="Default（DeleteGeometry）"/>
+                    </StackPanel>
+                    <StackPanel>
+                        <RepeatButton Content="{x:Static langs:Lang.Clock}" Margin="5" Style="{StaticResource RepeatButtonPrimary}" controls:IconElement.Geometry="{StaticResource ClockGeometry}"/>
+                        <RepeatButton Content="{x:Static langs:Lang.Clock}" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonPrimary}" controls:IconElement.Geometry="{StaticResource ClockGeometry}"/>
+                        <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="RepeatButtonPrimary（ClockGeometry）"/>
+                    </StackPanel>
+                    <StackPanel>
+                        <RepeatButton Content="{x:Static langs:Lang.Calendar}" Margin="5" Style="{StaticResource RepeatButtonSuccess}" controls:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                        <RepeatButton Content="{x:Static langs:Lang.Calendar}" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonSuccess}" controls:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                        <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="RepeatButtonSuccess（CalendarGeometry）"/>
+                    </StackPanel>
+                    <StackPanel>
+                        <RepeatButton Width="50" Padding="16,8" Margin="5" Style="{StaticResource RepeatButtonInfo}" controls:IconElement.Geometry="{StaticResource DownGeometry}"/>
+                        <RepeatButton Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonInfo}" controls:IconElement.Geometry="{StaticResource DownGeometry}"/>
+                        <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="RepeatButtonInfo（DownGeometry）"/>
+                    </StackPanel>
+                    <StackPanel>
+                        <RepeatButton Width="50" Margin="5" Style="{StaticResource RepeatButtonWarning}" controls:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                        <RepeatButton Width="50" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonWarning}" controls:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                        <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="RepeatButtonWarning（LeftGeometry）"/>
+                    </StackPanel>
+                    <StackPanel>
+                        <RepeatButton Width="50" Padding="16,8" Margin="5" Style="{StaticResource RepeatButtonDanger}" controls:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
+                        <RepeatButton Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDanger}" controls:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
+                        <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="RepeatButtonDanger（DeleteGeometry）"/>
+                    </StackPanel>
+                </WrapPanel>
+                <WrapPanel ItemWidth="160" ItemHeight="130">
+                    <StackPanel>
+                        <RepeatButton Margin="5" Height="28" Padding="10,0" Background="#24292e" Foreground="White" Content="{x:Static langs:Lang.ButtonCustom}" Style="{StaticResource RepeatButtonCustom}" controls:BackgroundSwitchElement.MouseHoverBackground="Red" controls:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
+                        <RepeatButton Margin="5" Height="28" IsEnabled="False" Padding="10,0" Background="#24292e" Foreground="White" Content="{x:Static langs:Lang.ButtonCustom}" Style="{StaticResource RepeatButtonCustom}" controls:BackgroundSwitchElement.MouseHoverBackground="Red" controls:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
+                        <TextBlock TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="RepeatButtonCustom"/>
+                    </StackPanel>
+                    <StackPanel>
+                        <RepeatButton Width="50" Padding="16,8" Margin="5" Style="{StaticResource RepeatButtonIcon}" Foreground="{DynamicResource PrimaryTextBrush}" controls:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                        <RepeatButton Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonIcon}" Foreground="{DynamicResource PrimaryTextBrush}"  controls:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                        <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="RepeatButtonIcon（UpDownGeometry）"/>
+                    </StackPanel>
+                </WrapPanel>
+            </StackPanel>
+        </controls:ScrollViewer>
+    </controls:TransitioningContentControl>
+</UserControl>

src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml.cs

@@ -0,0 +1,10 @@
+namespace HandyControlDemo.UserControl
+{
+    public partial class RepeatButtonDemoCtl
+    {
+        public RepeatButtonDemoCtl()
+        {
+            InitializeComponent();
+        }
+    }
+}

src/Shared/HandyControlDemo_Shared/ViewModel/Basic/InteractiveDialogViewModel.cs

@@ -11,7 +11,7 @@ namespace HandyControlDemo.ViewModel.Basic
 {
     public class InteractiveDialogViewModel : ViewModelBase, IDialogResultable<string>
     {
-        public Action CloseAction { get; set; }
+        public Action<string> CloseAction { get; set; }
 
         private string _result;
 
@@ -37,6 +37,6 @@ namespace HandyControlDemo.ViewModel.Basic
 #endif
         }
 
-        public RelayCommand CloseCmd => new Lazy<RelayCommand>(() => new RelayCommand(() => CloseAction?.Invoke())).Value;
+        public RelayCommand CloseCmd => new Lazy<RelayCommand>(() => new RelayCommand(() => CloseAction?.Invoke(""))).Value;
     }
 }

src/Shared/HandyControlDemo_Shared/ViewModel/Controls/DialogDemoViewModel.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Windows;
 using GalaSoft.MvvmLight;
 #if netle40
 using GalaSoft.MvvmLight.Command;
@@ -11,6 +12,7 @@ using HandyControl.Tools.Extension;
 using HandyControlDemo.UserControl;
 using HandyControlDemo.UserControl.Basic;
 using HandyControlDemo.ViewModel.Basic;
+using HandyControlDemo.Window;
 
 namespace HandyControlDemo.ViewModel
 {
@@ -57,5 +59,14 @@ namespace HandyControlDemo.ViewModel
                 .GetResultAsync<string>();
         }
 #endif
+
+        public RelayCommand NewWindowCmd => new Lazy<RelayCommand>(() =>
+            new RelayCommand(() => new DialogDemoWindow
+            {
+                Owner = Application.Current.MainWindow
+            }.Show())).Value;
+
+        public RelayCommand<string> ShowWithTokenCmd => new Lazy<RelayCommand<string>>(() =>
+            new RelayCommand<string>(token => Dialog.Show(new TextDialog(), token))).Value;
     }
 }

src/Shared/HandyControlDemo_Shared/ViewModel/Controls/GrowlDemoViewModel.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Windows;
 #if netle40
 using GalaSoft.MvvmLight.Command;
 #else
@@ -65,6 +66,9 @@ namespace HandyControlDemo.ViewModel
             new RelayCommand(() => Growl.Clear())).Value;
 
         public RelayCommand NewWindowCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => new GrowlDemoWindow().Show())).Value;
+            new RelayCommand(() => new GrowlDemoWindow
+            {
+                Owner = Application.Current.MainWindow
+            }.Show())).Value;
     }
 }

src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SideMenuDemoViewModel.cs

@@ -0,0 +1,20 @@
+using System;
+using GalaSoft.MvvmLight;
+using HandyControl.Controls;
+using HandyControl.Data;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
+using GalaSoft.MvvmLight.CommandWpf;
+# endif
+
+namespace HandyControlDemo.ViewModel
+{
+    public class SideMenuDemoViewModel : ViewModelBase
+    {
+        public RelayCommand<FunctionEventArgs<object>> SwitchItemCmd => new Lazy<RelayCommand<FunctionEventArgs<object>>>(() =>
+            new RelayCommand<FunctionEventArgs<object>>(SwitchItem)).Value;
+
+        private void SwitchItem(FunctionEventArgs<object> info) => Growl.Info((info.Info as SideMenuItem)?.Header.ToString());
+    }
+}

src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs

@@ -9,6 +9,7 @@ using GalaSoft.MvvmLight.Messaging;
 using HandyControlDemo.Data;
 using HandyControlDemo.Service;
 using HandyControlDemo.Tools;
+using HandyControlDemo.UserControl;
 
 namespace HandyControlDemo.ViewModel
 {
@@ -91,6 +92,12 @@ namespace HandyControlDemo.ViewModel
             new Lazy<RelayCommand<SelectionChangedEventArgs>>(() =>
                 new RelayCommand<SelectionChangedEventArgs>(SwitchDemo)).Value;
 
+        /// <summary>
+        ///     打开概览命令
+        /// </summary>
+        public RelayCommand OpenOverviewCmd => new Lazy<RelayCommand>(() =>
+            new RelayCommand(OpenOverview)).Value;
+
 #endregion
 
 #region 方法
@@ -108,9 +115,10 @@ namespace HandyControlDemo.ViewModel
                     if (Equals(_listBoxItemCurrent, item)) return;
                     _listBoxItemCurrent = item;
                     ContentTitle = item.Content;
-                    Messenger.Default.Send(false, MessageToken.FullSwitch);
                     var obj = AssemblyHelper.ResolveByKey(tag);
-                    Messenger.Default.Send(obj ?? AssemblyHelper.CreateInternalInstance($"UserControl.{tag}"), MessageToken.LoadShowContent);
+                    var ctl = obj ?? AssemblyHelper.CreateInternalInstance($"UserControl.{tag}");
+                    Messenger.Default.Send(ctl is IFull, MessageToken.FullSwitch);
+                    Messenger.Default.Send(ctl, MessageToken.LoadShowContent);
                 }
                 else
                 {
@@ -121,6 +129,16 @@ namespace HandyControlDemo.ViewModel
             }
         }
 
-#endregion
+        /// <summary>
+        ///     打开概览
+        /// </summary>
+        private void OpenOverview()
+        {
+            Messenger.Default.Send<object>(null, MessageToken.ClearLeftSelected);
+            Messenger.Default.Send(true, MessageToken.FullSwitch);
+            Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.OverView}"), MessageToken.LoadShowContent);
+        }
+
+        #endregion
     }
 }

src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs

@@ -33,6 +33,7 @@ namespace HandyControlDemo.ViewModel
             SimpleIoc.Default.Register<NotifyIconDemoViewModel>();
             SimpleIoc.Default.Register<InteractiveDialogViewModel>();
             SimpleIoc.Default.Register<BadgeDemoViewModel>();
+            SimpleIoc.Default.Register<SideMenuDemoViewModel>();
         }
 
         public static ViewModelLocator Instance => new Lazy<ViewModelLocator>(() =>
@@ -71,6 +72,9 @@ namespace HandyControlDemo.ViewModel
         public InteractiveDialogViewModel InteractiveDialog => ServiceLocator.Current.GetInstance<InteractiveDialogViewModel>();
 
         public BadgeDemoViewModel BadgeDemo => ServiceLocator.Current.GetInstance<BadgeDemoViewModel>();
+
+        public SideMenuDemoViewModel SideMenuDemo => ServiceLocator.Current.GetInstance<SideMenuDemoViewModel>();
+
         #endregion
     }
 }

src/Shared/HandyControlDemo_Shared/Window/DialogDemoWindow.xaml

@@ -0,0 +1,18 @@
+<Window x:Class="HandyControlDemo.Window.DialogDemoWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+        xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+        xmlns:data="clr-namespace:HandyControlDemo.Data"
+        controls:Dialog.Token="{x:Static data:MessageToken.DialogDemoWindow}"
+        DataContext="{Binding DialogDemo,Source={StaticResource Locator}}"
+        Title="{x:Static langs:Lang.DialogDemo}"
+        Width="800"
+        Height="500">
+    <controls:TransitioningContentControl>
+        <StackPanel Margin="32" VerticalAlignment="Center">
+            <Button Content="{x:Static langs:Lang.ShowInCurrentWindow}" Command="{Binding ShowWithTokenCmd}" CommandParameter="{x:Static data:MessageToken.DialogDemoWindow}"/>
+            <Button Margin="0,10,0,0" Content="{x:Static langs:Lang.ShowInMainWindow}" Command="{Binding ShowWithTokenCmd}" CommandParameter="{x:Static data:MessageToken.MainWindow}"/>
+        </StackPanel>
+    </controls:TransitioningContentControl>
+</Window>

src/Shared/HandyControlDemo_Shared/Window/DialogDemoWindow.xaml.cs

@@ -0,0 +1,10 @@
+namespace HandyControlDemo.Window
+{
+    public partial class DialogDemoWindow
+    {
+        public DialogDemoWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}

src/Shared/HandyControl_Shared/Controls/Base/HeaderedSimpleItemsControl.cs

@@ -0,0 +1,16 @@
+using System.Windows;
+
+namespace HandyControl.Controls
+{
+    public class HeaderedSimpleItemsControl : SimpleItemsControl
+    {
+        public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(
+            "Header", typeof(object), typeof(HeaderedSimpleItemsControl), new PropertyMetadata(default(object)));
+
+        public object Header
+        {
+            get => GetValue(HeaderProperty);
+            set => SetValue(HeaderProperty, value);
+        }
+    }
+}

src/Shared/HandyControl_Shared/Controls/Base/SimpleItemsControl.cs

@@ -5,6 +5,7 @@ using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Markup;
+using HandyControl.Data;
 
 namespace HandyControl.Controls
 {
@@ -33,7 +34,14 @@ namespace HandyControl.Controls
         public SimpleItemsControl()
         {
             var items = new ObservableCollection<object>();
-            items.CollectionChanged += OnItemsChanged;
+            items.CollectionChanged += (s, e) =>
+            {
+                if (e.NewItems != null && e.NewItems.Count > 0)
+                {
+                    SetValue(HasItemsPropertyKey, true);
+                }
+                OnItemsChanged(s, e);
+            };
             Items = items;
         }
 
@@ -118,6 +126,14 @@ namespace HandyControl.Controls
 
         protected virtual void OnItemContainerStyleChanged(DependencyPropertyChangedEventArgs e) => Refresh();
 
+        internal static readonly DependencyPropertyKey HasItemsPropertyKey =
+            DependencyProperty.RegisterReadOnly(nameof(HasItems), typeof(bool), typeof(SimpleItemsControl),
+                new PropertyMetadata(ValueBoxes.FalseBox));
+
+        public static readonly DependencyProperty HasItemsProperty = HasItemsPropertyKey.DependencyProperty;
+
+        public bool HasItems => (bool) GetValue(HasItemsProperty);
+
         protected virtual void Refresh()
         {
             if (ItemsHost == null) return;

src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlow.cs

@@ -45,9 +45,9 @@ namespace HandyControl.Controls
             {
                 return 0;
             }
-            if (v >= ctl._uriList.Count)
+            if (v >= ctl._contentDic.Count)
             {
-                return ctl._uriList.Count - 1;
+                return ctl._contentDic.Count - 1;
             }
             return v;
         }
@@ -65,9 +65,9 @@ namespace HandyControl.Controls
             "Loop", typeof(bool), typeof(CoverFlow), new PropertyMetadata(ValueBoxes.FalseBox));
 
         /// <summary>
-        ///     存储所有的资源标识符
+        ///     存储所有的内容
         /// </summary>
-        private readonly Dictionary<int, Uri> _uriList = new Dictionary<int, Uri>();
+        private readonly Dictionary<int, object> _contentDic = new Dictionary<int, object>();
 
         /// <summary>
         ///     当前在显示范围内的项
@@ -154,12 +154,12 @@ namespace HandyControl.Controls
         /// <summary>
         ///     批量添加资源
         /// </summary>
-        /// <param name="uriList"></param>
-        public void AddRange(List<Uri> uriList)
+        /// <param name="contentList"></param>
+        public void AddRange(IEnumerable<object> contentList)
         {
-            foreach (var uri in uriList)
+            foreach (var content in contentList)
             {
-                _uriList.Add(_uriList.Count, uri);
+                _contentDic.Add(_contentDic.Count, content);
             }
         }
 
@@ -167,13 +167,13 @@ namespace HandyControl.Controls
         ///     添加一项资源
         /// </summary>
         /// <param name="uriString"></param>
-        public void Add(string uriString) => _uriList.Add(_uriList.Count, new Uri(uriString));
+        public void Add(string uriString) => _contentDic.Add(_contentDic.Count, new Uri(uriString));
 
         /// <summary>
         ///     添加一项资源
         /// </summary>
         /// <param name="uri"></param>
-        public void Add(Uri uri) => _uriList.Add(_uriList.Count, uri);
+        public void Add(Uri uri) => _contentDic.Add(_contentDic.Count, uri);
 
         /// <summary>
         ///     跳转
@@ -187,13 +187,15 @@ namespace HandyControl.Controls
             if (e.Delta < 0)
             {
                 var index = PageIndex + 1;
-                PageIndex = index >= _uriList.Count ? (Loop ? 0 : _uriList.Count - 1) : index;
+                PageIndex = index >= _contentDic.Count ? Loop ? 0 : _contentDic.Count - 1 : index;
             }
             else
             {
                 var index = PageIndex - 1;
-                PageIndex = index < 0 ? (Loop ? _uriList.Count - 1 : 0) : index;
+                PageIndex = index < 0 ? Loop ? _contentDic.Count - 1 : 0 : index;
             }
+
+            e.Handled = true;
         }
 
         /// <summary>
@@ -271,7 +273,7 @@ namespace HandyControl.Controls
         private void UpdateShowRange()
         {
             var newFirstShowIndex = Math.Max(PageIndex - MaxShowCountHalf, 0);
-            var newLastShowIndex = Math.Min(PageIndex + MaxShowCountHalf, _uriList.Count - 1);
+            var newLastShowIndex = Math.Min(PageIndex + MaxShowCountHalf, _contentDic.Count - 1);
 
             if (_firstShowIndex < newFirstShowIndex)
             {
@@ -292,7 +294,7 @@ namespace HandyControl.Controls
             {
                 if (!_itemShowList.ContainsKey(i))
                 {
-                    var cover = new CoverFlowItem(i, PageIndex, BitmapFrame.Create(_uriList[i]));
+                    var cover = CreateCoverFlowItem(i, _contentDic[i]);
                     _itemShowList[i] = cover;
                     _visualParent.Children.Add(cover);
                 }
@@ -301,5 +303,21 @@ namespace HandyControl.Controls
             _firstShowIndex = newFirstShowIndex;
             _lastShowIndex = newLastShowIndex;
         }
+
+        private CoverFlowItem CreateCoverFlowItem(int index, object content)
+        {
+            if (content is Uri uri)
+            {
+                return new CoverFlowItem(index, PageIndex, new Image
+                {
+                    Source = BitmapFrame.Create(uri)
+                });
+            }
+
+            return new CoverFlowItem(index, PageIndex, new ContentControl
+            {
+                Content = content
+            });
+        }
     }
 }

src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlowItem.cs

@@ -18,14 +18,15 @@ namespace HandyControl.Controls
 
         private readonly Model3DGroup _model3DGroup;
 
-        private readonly ImageSource _source;
+        private readonly UIElement _uiElement;
 
         internal int Index { get; set; }
 
-        public CoverFlowItem(int itemIndex, int currentIndex, ImageSource source)
+        public CoverFlowItem(int itemIndex, int currentIndex, UIElement element)
         {
             Index = itemIndex;
-            _source = source;
+            _uiElement = element;
+            _uiElement.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
 
             _rotation3D = new AxisAngleRotation3D(new Vector3D(0, 1, 0), GetAngleByPos(currentIndex));
             _transform3D = new TranslateTransform3D(GetXByPos(currentIndex), 0, GetZByPos(currentIndex));
@@ -35,7 +36,7 @@ namespace HandyControl.Controls
             transformGroup.Children.Add(_transform3D);
 
             _model3DGroup = new Model3DGroup();
-            _model3DGroup.Children.Add(new GeometryModel3D(CreateItemGeometry(), new DiffuseMaterial(new ImageBrush(_source))));
+            _model3DGroup.Children.Add(new GeometryModel3D(CreateItemGeometry(), new DiffuseMaterial(new VisualBrush(element))));
             _model3DGroup.Transform = transformGroup;
 
             Content = _model3DGroup;
@@ -103,8 +104,8 @@ namespace HandyControl.Controls
         /// <returns></returns>
         private Geometry3D CreateItemGeometry()
         {
-            var sx = _source.Width > _source.Height ? 0 : 1 - _source.Width / _source.Height;
-            var sy = _source.Width < _source.Height ? 0 : 1 - _source.Height / _source.Width;
+            var sx = _uiElement.DesiredSize.Width > _uiElement.DesiredSize.Height ? 0 : 1 - _uiElement.DesiredSize.Width / _uiElement.DesiredSize.Height;
+            var sy = _uiElement.DesiredSize.Width < _uiElement.DesiredSize.Height ? 0 : 1 - _uiElement.DesiredSize.Height / _uiElement.DesiredSize.Width;
 
             var p0 = new Point3D(-1 + sx, -1 + sy, 0);
             var p1 = new Point3D(1 - sx, -1 + sy, 0);

src/Shared/HandyControl_Shared/Controls/Grid/Col.cs

@@ -0,0 +1,79 @@
+using System.Windows;
+using System.Windows.Controls;
+using HandyControl.Data;
+using HandyControl.Tools.Extension;
+
+namespace HandyControl.Controls
+{
+    public class Col : ContentControl
+    {
+        public static readonly DependencyProperty LayoutProperty = DependencyProperty.Register(
+            "Layout", typeof(ColLayout), typeof(Col), new PropertyMetadata(default(ColLayout)));
+
+        public ColLayout Layout
+        {
+            get => (ColLayout)GetValue(LayoutProperty);
+            set => SetValue(LayoutProperty, value);
+        }
+
+        public static readonly DependencyProperty OffsetProperty = DependencyProperty.Register(
+            "Offset", typeof(int), typeof(Col), new PropertyMetadata(ValueBoxes.Int0Box));
+
+        public int Offset
+        {
+            get => (int)GetValue(OffsetProperty);
+            set => SetValue(OffsetProperty, value);
+        }
+
+        public static readonly DependencyProperty SpanProperty = DependencyProperty.Register(
+            "Span", typeof(int), typeof(Col), new PropertyMetadata(24), OnSpanValidate);
+
+        private static bool OnSpanValidate(object value)
+        {
+            var v = (int)value;
+            return v >= 1 || v <= 24;
+        }
+
+        public int Span
+        {
+            get => (int) GetValue(SpanProperty);
+            set => SetValue(SpanProperty, value);
+        }
+
+        internal int GetLayoutCellCount(ColLayoutStatus status)
+        {
+            var result = 0;
+
+            if (Layout != null)
+            {
+                switch (status)
+                {
+                    case ColLayoutStatus.Xs:
+                        result = Layout.Xs;
+                        break;
+                    case ColLayoutStatus.Sm:
+                        result = Layout.Sm;
+                        break;
+                    case ColLayoutStatus.Md:
+                        result = Layout.Md;
+                        break;
+                    case ColLayoutStatus.Lg:
+                        result = Layout.Lg;
+                        break;
+                    case ColLayoutStatus.Xl:
+                        result = Layout.Xl;
+                        break;
+                    case ColLayoutStatus.Xxl:
+                        result = Layout.Xxl;
+                        break;
+                }
+            }
+            else
+            {
+                result = Span;
+            }
+
+            return result;
+        }
+    }
+}

src/Shared/HandyControl_Shared/Controls/Grid/Row.cs

@@ -0,0 +1,102 @@
+using HandyControl.Tools.Extension;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using HandyControl.Data;
+using HandyControl.Tools;
+
+namespace HandyControl.Controls
+{
+    public class Row : Panel
+    {
+        private ColLayoutStatus _layoutStatus;
+
+        private double _maxChildDesiredHeight;
+
+        public static readonly DependencyProperty GutterProperty = DependencyProperty.Register(
+            "Gutter", typeof(double), typeof(Row), new PropertyMetadata(ValueBoxes.Double0Box, null, OnGutterCoerce), OnGutterValidate);
+
+        private static object OnGutterCoerce(DependencyObject d, object basevalue) => OnGutterValidate(basevalue) ? basevalue : .0;
+
+        private static bool OnGutterValidate(object value) => ValidateHelper.IsInRangeOfPosDouble(value, true);
+
+        public double Gutter
+        {
+            get => (double)GetValue(GutterProperty);
+            set => SetValue(GutterProperty, value);
+        }
+
+        protected override Size MeasureOverride(Size constraint)
+        {
+            var totalCellCount = 0;
+            var totalRowCount = 1;
+            var gutterHalf = Gutter / 2;
+
+            foreach (var child in InternalChildren.OfType<Col>())
+            {
+                child.Margin = new Thickness(gutterHalf);
+                child.Measure(constraint);
+                var childDesiredSize = child.DesiredSize;
+
+                if (_maxChildDesiredHeight < childDesiredSize.Height)
+                {
+                    _maxChildDesiredHeight = childDesiredSize.Height;
+                }
+            }
+
+            var itemWidth = constraint.Width / ColLayout.ColMaxCellCount;
+            var childBounds = new Rect(-gutterHalf, -gutterHalf, 0, _maxChildDesiredHeight);
+            _layoutStatus = ColLayout.GetLayoutStatus(constraint.Width);
+
+            foreach (var child in InternalChildren.OfType<Col>())
+            {
+                var cellCount = child.GetLayoutCellCount(_layoutStatus);
+                totalCellCount += cellCount;
+
+                if (totalCellCount > ColLayout.ColMaxCellCount)
+                {
+                    childBounds.X = -gutterHalf;
+                    childBounds.Y += _maxChildDesiredHeight;
+                    totalCellCount = cellCount;
+                    totalRowCount++;
+                }
+
+                var childWidth = cellCount * itemWidth;
+                childBounds.Width = childWidth;
+                childBounds.X += childWidth + child.Offset * itemWidth;
+            }
+
+            return new Size(0, _maxChildDesiredHeight * totalRowCount - Gutter);
+        }
+
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            var totalCellCount = 0;
+            var gutterHalf = Gutter / 2;
+            var itemWidth = (finalSize.Width + Gutter) / ColLayout.ColMaxCellCount;
+            var childBounds = new Rect(-gutterHalf, -gutterHalf, 0, _maxChildDesiredHeight);
+            _layoutStatus = ColLayout.GetLayoutStatus(finalSize.Width);
+
+            foreach (var child in InternalChildren.OfType<Col>())
+            {
+                var cellCount = child.GetLayoutCellCount(_layoutStatus);
+                totalCellCount += cellCount;
+
+                var childWidth = cellCount * itemWidth;
+                childBounds.Width = childWidth;
+                childBounds.X += child.Offset * itemWidth;
+                if (totalCellCount > ColLayout.ColMaxCellCount)
+                {
+                    childBounds.X = -gutterHalf;
+                    childBounds.Y += _maxChildDesiredHeight;
+                    totalCellCount = cellCount;
+                }
+
+                child.Arrange(childBounds);
+                childBounds.X += childWidth;
+            }
+
+            return finalSize;
+        }
+    }
+}

src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs

@@ -1,15 +1,44 @@
 using System;
+using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
 using System.Windows.Input;
+#if netle40
+using System.Windows.Threading;
+#endif
 using HandyControl.Data;
 using HandyControl.Interactivity;
 
 namespace HandyControl.Controls
 {
-    /// <inheritdoc cref="IDataInput" />
+    [TemplatePart(Name = AutoCompletePanel, Type = typeof(Panel))]
+    [TemplatePart(Name = EditableTextBox, Type = typeof(System.Windows.Controls.TextBox))]
+    [TemplatePart(Name = AutoPopupAutoComplete, Type = typeof(Popup))]
     public class ComboBox : System.Windows.Controls.ComboBox, IDataInput
     {
+#if netle40
+
+        private string _searchText;
+
+        private DispatcherTimer _autoCompleteTimer;
+
+#endif
+        private bool _isAutoCompleteAction = true;
+
+        private Panel _autoCompletePanel;
+
+        private System.Windows.Controls.TextBox _editableTextBox;
+
+        private Popup _autoPopupAutoComplete;
+
+        private const string AutoCompletePanel = "PART_AutoCompletePanel";
+
+        private const string AutoPopupAutoComplete = "PART_Popup_AutoComplete";
+
+        private const string EditableTextBox = "PART_EditableTextBox";
+
         public ComboBox()
         {
             CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
@@ -21,23 +50,125 @@ namespace HandyControl.Controls
             }));
         }
 
-        protected override void OnSelectionChanged(SelectionChangedEventArgs e)
+        public override void OnApplyTemplate()
+        {
+            if (_editableTextBox != null)
+            {
+                BindingOperations.ClearBinding(_editableTextBox, System.Windows.Controls.TextBox.TextProperty);
+                _editableTextBox.GotFocus -= EditableTextBox_GotFocus;
+                _editableTextBox.LostFocus -= EditableTextBox_LostFocus;
+            }
+
+            base.OnApplyTemplate();
+
+            if (IsEditable)
+            {
+                _editableTextBox = GetTemplateChild(EditableTextBox) as System.Windows.Controls.TextBox;
+
+                if (_editableTextBox != null)
+                {
+                    _editableTextBox.TextChanged += EditableTextBox_TextChanged;
+
+                    if (AutoComplete)
+                    {
+#if netle40
+                        _autoCompleteTimer = new DispatcherTimer
+                        {
+                            Interval = TimeSpan.FromMilliseconds(500)
+                        };
+                        _autoCompleteTimer.Tick += AutoCompleteTimer_Tick;
+#endif
+                        _autoPopupAutoComplete = GetTemplateChild(AutoPopupAutoComplete) as Popup;
+                        _autoCompletePanel = GetTemplateChild(AutoCompletePanel) as Panel;
+                        _editableTextBox.SetBinding(System.Windows.Controls.TextBox.TextProperty, new Binding(SearchTextProperty.Name)
+                        {
+                            UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged,
+                            Mode = BindingMode.OneWayToSource,
+#if !netle40
+                            Delay = 500,              
+#endif
+                            Source = this
+                        });
+                        _editableTextBox.GotFocus += EditableTextBox_GotFocus;
+                        _editableTextBox.LostFocus += EditableTextBox_LostFocus;
+                    }
+                }
+            }
+        }
+
+#if netle40
+
+        private void AutoCompleteTimer_Tick(object sender, EventArgs e)
+        {
+            UpdateSearchItems(_searchText);
+            _autoCompleteTimer.Stop();
+        }
+
+#endif
+
+        private void EditableTextBox_TextChanged(object sender, TextChangedEventArgs e)
         {
-            base.OnSelectionChanged(e);
             VerifyData();
         }
 
+        private void EditableTextBox_LostFocus(object sender, RoutedEventArgs e)
+        {
+            if (_autoPopupAutoComplete != null)
+            {
+                _autoPopupAutoComplete.IsOpen = false;
+            }
+        }
+
+#if !netle40
+        protected override void OnDropDownClosed(EventArgs e)
+        {
+            base.OnDropDownClosed(e);
+
+            _isAutoCompleteAction = false;
+        }
+#endif
+
+        private void EditableTextBox_GotFocus(object sender, RoutedEventArgs e)
+        {
+            if (_autoPopupAutoComplete != null && _editableTextBox != null &&
+                !string.IsNullOrEmpty(_editableTextBox.Text))
+            {
+                _autoPopupAutoComplete.IsOpen = true;
+            }
+        }
+
+        protected override void OnSelectionChanged(SelectionChangedEventArgs e)
+        {
+            _isAutoCompleteAction = false;
+            base.OnSelectionChanged(e);
+            VerifyData();
+#if netle40
+            _isAutoCompleteAction = true;
+#endif
+        }
+
+        /// <summary>
+        ///     数据验证委托
+        /// </summary>
         public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
 
+        /// <summary>
+        ///     数据搜索委托
+        /// </summary>
+        public Func<ItemCollection, object, IEnumerable<object>> SearchFunc { get; set; }
+
         /// <summary>
         ///     数据是否错误
         /// </summary>
         public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
             "IsError", typeof(bool), typeof(ComboBox), new PropertyMetadata(ValueBoxes.FalseBox));
 
+        /// <summary>
+        ///     数据是否错误
+        /// </summary>
         public bool IsError
         {
-            get => (bool) GetValue(IsErrorProperty);
+            get => (bool)GetValue(IsErrorProperty);
             set => SetValue(IsErrorProperty, value);
         }
 
@@ -47,12 +178,18 @@ namespace HandyControl.Controls
         public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
             "ErrorStr", typeof(string), typeof(ComboBox), new PropertyMetadata(default(string)));
 
+        /// <summary>
+        ///     错误提示
+        /// </summary>
         public string ErrorStr
         {
-            get => (string) GetValue(ErrorStrProperty);
+            get => (string)GetValue(ErrorStrProperty);
             set => SetValue(ErrorStrProperty, value);
         }
 
+        /// <summary>
+        ///     文本类型
+        /// </summary>
         public static readonly DependencyPropertyKey TextTypePropertyKey =
             DependencyProperty.RegisterReadOnly("TextType", typeof(TextType), typeof(ComboBox),
                 new PropertyMetadata(default(TextType)));
@@ -62,9 +199,12 @@ namespace HandyControl.Controls
         /// </summary>
         public static readonly DependencyProperty TextTypeProperty = TextTypePropertyKey.DependencyProperty;
 
+        /// <summary>
+        ///     文本类型
+        /// </summary>
         public TextType TextType
         {
-            get => (TextType) GetValue(TextTypeProperty);
+            get => (TextType)GetValue(TextTypeProperty);
             set => SetValue(TextTypeProperty, value);
         }
 
@@ -74,23 +214,151 @@ namespace HandyControl.Controls
         public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
             "ShowClearButton", typeof(bool), typeof(ComboBox), new PropertyMetadata(ValueBoxes.FalseBox));
 
+        /// <summary>
+        ///     是否显示清除按钮
+        /// </summary>
         public bool ShowClearButton
         {
-            get => (bool) GetValue(ShowClearButtonProperty);
+            get => (bool)GetValue(ShowClearButtonProperty);
             set => SetValue(ShowClearButtonProperty, value);
         }
 
+        /// <summary>
+        ///     是否自动完成输入
+        /// </summary>
+        public static readonly DependencyProperty AutoCompleteProperty = DependencyProperty.Register(
+            "AutoComplete", typeof(bool), typeof(ComboBox), new PropertyMetadata(ValueBoxes.FalseBox, OnAutoCompleteChanged));
+
+        private static void OnAutoCompleteChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctl = (ComboBox)d;
+            if (ctl._editableTextBox != null)
+            {
+                ctl.UpdateSearchItems(ctl._editableTextBox.Text);
+            }
+        }
+
+        /// <summary>
+        ///     更新搜索的项目
+        /// </summary>
+        /// <param name="key"></param>
+        private void UpdateSearchItems(string key)
+        {
+            if (_editableTextBox != null && _autoPopupAutoComplete != null)
+            {
+                _autoPopupAutoComplete.IsOpen = !string.IsNullOrEmpty(key);
+                _autoCompletePanel.Children.Clear();
+
+                if (SearchFunc == null)
+                {
+                    if (!string.IsNullOrEmpty(key))
+                    {
+                        foreach (var item in Items)
+                        {
+                            var content = item?.ToString();
+                            if (content == null) continue;
+                            if (!content.Contains(key)) continue;
+
+                            _autoCompletePanel.Children.Add(CreateSearchItem(item));
+                        }
+                    }
+                }
+                else
+                {
+                    foreach (var item in SearchFunc.Invoke(Items, key))
+                    {
+                        _autoCompletePanel.Children.Add(CreateSearchItem(item));
+                    }
+                }
+            }
+        }
+
+        private ComboBoxItem CreateSearchItem(object content)
+        {
+            var item = new ComboBoxItem
+            {
+                Content = content,
+                Style = ItemContainerStyle,
+                ContentTemplate = ItemTemplate
+            };
+
+            item.PreviewMouseLeftButtonDown += AutoCompleteItem_PreviewMouseLeftButtonDown;
+
+            return item;
+        }
+
+        private void AutoCompleteItem_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            if (sender is ComboBoxItem comboBoxItem)
+            {
+                if (_autoPopupAutoComplete != null)
+                {
+                    _autoPopupAutoComplete.IsOpen = false;
+                }
+
+                _isAutoCompleteAction = false;
+                SelectedValue = comboBoxItem.Content;
+            }
+        }
+
+        /// <summary>
+        ///     搜索文本
+        /// </summary>
+        internal static readonly DependencyProperty SearchTextProperty = DependencyProperty.Register(
+            "SearchText", typeof(string), typeof(ComboBox), new PropertyMetadata(default(string), OnSearchTextChanged));
+
+        private static void OnSearchTextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctl = (ComboBox)d;
+            if (ctl._isAutoCompleteAction)
+            {
+#if netle40
+                ctl._searchText = e.NewValue as string;
+                ctl._autoCompleteTimer.Stop();
+                ctl._autoCompleteTimer.Start();
+#else
+                ctl.UpdateSearchItems(e.NewValue as string);
+#endif
+            }
+
+            ctl._isAutoCompleteAction = true;
+        }
+
+        /// <summary>
+        ///     搜索文本
+        /// </summary>
+        internal string SearchText
+        {
+            get => (string)GetValue(SearchTextProperty);
+            set => SetValue(SearchTextProperty, value);
+        }
+
+        /// <summary>
+        ///     是否自动完成输入
+        /// </summary>
+        public bool AutoComplete
+        {
+            get => (bool)GetValue(AutoCompleteProperty);
+            set => SetValue(AutoCompleteProperty, value);
+        }
+
+        /// <summary>
+        ///     验证数据
+        /// </summary>
+        /// <returns></returns>
         public virtual bool VerifyData()
         {
             OperationResult<bool> result;
 
+            var value = _editableTextBox == null ? Text : _editableTextBox.Text;
+
             if (VerifyFunc != null)
             {
-                result = VerifyFunc.Invoke(Text);
+                result = VerifyFunc.Invoke(value);
             }
             else
             {
-                if (!string.IsNullOrEmpty(Text))
+                if (!string.IsNullOrEmpty(value))
                 {
                     result = OperationResult.Success();
                 }

src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs

@@ -99,15 +99,6 @@ namespace HandyControl.Controls
             set => SetValue(DateTimeFormatProperty, value);
         }
 
-        public static readonly DependencyProperty ClockStyleProperty = DependencyProperty.Register(
-            "ClockStyle", typeof(Style), typeof(DateTimePicker), new PropertyMetadata(default(Style)));
-
-        public Style ClockStyle
-        {
-            get => (Style) GetValue(ClockStyleProperty);
-            set => SetValue(ClockStyleProperty, value);
-        }
-
         public static readonly DependencyProperty CalendarStyleProperty = DependencyProperty.Register(
             "CalendarStyle", typeof(Style), typeof(DateTimePicker), new PropertyMetadata(default(Style)));
 

src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs

@@ -152,7 +152,7 @@ namespace HandyControl.Controls
         /// </summary>
         public static readonly DependencyProperty ValueProperty = DependencyProperty.Register(
             "Value", typeof(double), typeof(NumericUpDown),
-            new FrameworkPropertyMetadata(default(double), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
+            new FrameworkPropertyMetadata(ValueBoxes.Double0Box, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
                 OnValueChanged, CoerceValue), ArithmeticHelper.IsValidDoubleValue);
 
         private static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -204,7 +204,7 @@ namespace HandyControl.Controls
         ///     最大值
         /// </summary>
         public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register(
-            "Maximum", typeof(double), typeof(NumericUpDown), new PropertyMetadata(100.0, OnMaximumChanged, CoerceMaximum), ArithmeticHelper.IsValidDoubleValue);
+            "Maximum", typeof(double), typeof(NumericUpDown), new PropertyMetadata(double.MaxValue, OnMaximumChanged, CoerceMaximum), ArithmeticHelper.IsValidDoubleValue);
 
         private static void OnMaximumChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {

src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs

@@ -34,8 +34,6 @@ namespace HandyControl.Controls
 
         #region Data
 
-        private Clock _clock;
-
         private string _defaultText;
 
         private ButtonBase _dropDownButton;
@@ -79,7 +77,7 @@ namespace HandyControl.Controls
 
         public TimePicker()
         {
-            InitClock();
+            Clock = new Clock();
             CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
             {
                 ClearValue(SelectedTimeProperty);
@@ -103,18 +101,6 @@ namespace HandyControl.Controls
 
         #endregion TimeFormat
 
-        #region ClockStyle
-
-        public Style ClockStyle
-        {
-            get => (Style)GetValue(ClockStyleProperty);
-            set => SetValue(ClockStyleProperty, value);
-        }
-
-        public static readonly DependencyProperty ClockStyleProperty = DependencyProperty.Register("ClockStyle", typeof(Style), typeof(TimePicker));
-
-        #endregion CalendarStyle
-
         #region DisplayTime
 
         public DateTime DisplayTime
@@ -133,8 +119,8 @@ namespace HandyControl.Controls
         private static object CoerceDisplayTime(DependencyObject d, object value)
         {
             var dp = (TimePicker)d;
-            dp._clock.DisplayTime = (DateTime)value;
-            return dp._clock.DisplayTime;
+            dp.Clock.DisplayTime = (DateTime)value;
+            return dp.Clock.DisplayTime;
         }
 
         #endregion DisplayTime
@@ -170,7 +156,7 @@ namespace HandyControl.Controls
 
                     dp.Dispatcher.BeginInvoke(DispatcherPriority.Input, (Action)delegate
                     {
-                        dp._clock.Focus();
+                        dp.Clock.Focus();
                     });
                 }
             }
@@ -212,8 +198,8 @@ namespace HandyControl.Controls
         private static object CoerceSelectedTime(DependencyObject d, object value)
         {
             var dp = (TimePicker)d;
-            dp._clock.SelectedTime = (DateTime?)value;
-            return dp._clock.SelectedTime;
+            dp.Clock.SelectedTime = (DateTime?)value;
+            return dp.Clock.SelectedTime;
         }
 
         #endregion SelectedDate
@@ -306,6 +292,35 @@ namespace HandyControl.Controls
             set => SetValue(ShowClearButtonProperty, value);
         }
 
+        public static readonly DependencyProperty ClockProperty = DependencyProperty.Register(
+            "Clock", typeof(ClockBase), typeof(TimePicker), new FrameworkPropertyMetadata(default(Clock), FrameworkPropertyMetadataOptions.NotDataBindable, OnClockChanged));
+
+        private static void OnClockChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctl = (TimePicker) d;
+            var oldClock = e.OldValue as ClockBase;
+            var newClock = e.NewValue as ClockBase;
+
+            if (oldClock != null)
+            {
+                oldClock.SelectedTimeChanged -= ctl.Clock_SelectedTimeChanged;
+                oldClock.Confirmed -= ctl.Clock_Confirmed;
+            }
+
+            if (newClock != null)
+            {
+                newClock.ShowConfirmButton = true;
+                newClock.SelectedTimeChanged += ctl.Clock_SelectedTimeChanged;
+                newClock.Confirmed += ctl.Clock_Confirmed;
+            }
+        }
+
+        public ClockBase Clock
+        {
+            get => (ClockBase) GetValue(ClockProperty);
+            set => SetValue(ClockProperty, value);
+        }
+
         #endregion Public Properties
 
         #region Public Methods
@@ -374,7 +389,7 @@ namespace HandyControl.Controls
             _popUp.PreviewMouseLeftButtonDown += PopUp_PreviewMouseLeftButtonDown;
             _popUp.Opened += PopUp_Opened;
             _popUp.Closed += PopUp_Closed;
-            _popUp.Child = _clock;
+            _popUp.Child = Clock;
 
             if (IsDropDownOpen)
             {
@@ -439,20 +454,7 @@ namespace HandyControl.Controls
                 throw new Exception();
         }
 
-        private void InitClock()
-        {
-            _clock = new Clock
-            {
-                ShowConfirmButton = true
-            };
-            _clock.SelectedTimeChanged += Clock_SelectedTimeChanged;
-            _clock.Confirmed += Clock_Confirmed;
-        }
-
-        private void TextBox_LostFocus(object sender, RoutedEventArgs e)
-        {
-            SetSelectedTime();
-        }
+        private void TextBox_LostFocus(object sender, RoutedEventArgs e) => SetSelectedTime();
 
         private void SetIsHandlerSuspended(DependencyProperty property, bool value)
         {
@@ -560,7 +562,7 @@ namespace HandyControl.Controls
                 SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.TrueBox);
             }
 
-            _clock?.MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
+            Clock?.MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
 
             OnClockOpened(new RoutedEventArgs());
         }
@@ -572,7 +574,7 @@ namespace HandyControl.Controls
                 SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.FalseBox);
             }
 
-            if (_clock.IsKeyboardFocusWithin)
+            if (Clock.IsKeyboardFocusWithin)
             {
                 MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
             }

src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs

@@ -15,7 +15,7 @@ namespace HandyControl.Controls
         private bool _isLoaded;
 
         /// <summary>
-        ///     故事版
+        ///     故事板
         /// </summary>
         private Storyboard _storyboard;
 

src/Shared/HandyControl_Shared/Controls/Other/Dialog.cs

@@ -1,4 +1,6 @@
-using System.Windows;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Documents;
 using System.Windows.Input;
@@ -12,6 +14,8 @@ namespace HandyControl.Controls
     {
         private Adorner _container;
 
+        private static readonly Dictionary<string, System.Windows.Window> WindowDic = new Dictionary<string, System.Windows.Window>();
+
         public static readonly DependencyProperty IsClosedProperty = DependencyProperty.Register(
             "IsClosed", typeof(bool), typeof(Dialog), new PropertyMetadata(ValueBoxes.FalseBox));
 
@@ -21,21 +25,94 @@ namespace HandyControl.Controls
             internal set => SetValue(IsClosedProperty, value);
         }
 
+        public static readonly DependencyProperty TokenProperty = DependencyProperty.RegisterAttached(
+            "Token", typeof(string), typeof(Dialog), new PropertyMetadata(default(string), OnTokenChanged));
+
+        private static void OnTokenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is System.Windows.Window window)
+            {
+                if (e.NewValue == null)
+                {
+                    Unregister(window);
+                }
+                else
+                {
+                    Register(e.NewValue.ToString(), window);
+                }
+            }
+        }
+
+        public static void SetToken(DependencyObject element, string value)
+            => element.SetValue(TokenProperty, value);
+
+        public static string GetToken(DependencyObject element)
+            => (string) element.GetValue(TokenProperty);
+
         public Dialog()
         {
             CommandBindings.Add(new CommandBinding(ControlCommands.Close, (s, e) => Close()));
         }
 
-        public static Dialog Show<T>() where T : new() => Show(new T());
+        public static void Register(string token, System.Windows.Window window)
+        {
+            if (string.IsNullOrEmpty(token) || window == null) return;
+            WindowDic[token] = window;
+        }
 
-        public static Dialog Show(object content)
+        public static void Unregister(string token, System.Windows.Window window)
+        {
+            if (string.IsNullOrEmpty(token) || window == null) return;
+
+            if (WindowDic.ContainsKey(token))
+            {
+                if (ReferenceEquals(WindowDic[token], window))
+                {
+                    WindowDic.Remove(token);
+                }
+            }
+        }
+
+        public static void Unregister(System.Windows.Window window)
+        {
+            if (window == null) return;
+            var first = WindowDic.FirstOrDefault(item => ReferenceEquals(window, item.Value));
+            if (!string.IsNullOrEmpty(first.Key))
+            {
+                WindowDic.Remove(first.Key);
+            }
+        }
+
+        public static void Unregister(string token)
+        {
+            if (string.IsNullOrEmpty(token)) return;
+
+            if (WindowDic.ContainsKey(token))
+            {
+                WindowDic.Remove(token);
+            }
+        }
+
+        public static Dialog Show<T>(string token = "") where T : new() => Show(new T(), token);
+
+        public static Dialog Show(object content, string token = "")
         {
             var dialog = new Dialog
             {
                 Content = content
             };
 
-            var window = VisualHelper.GetActiveWindow();
+            System.Windows.Window window;
+
+            if (string.IsNullOrEmpty(token))
+            {
+                window = VisualHelper.GetActiveWindow();
+            }
+            else
+            {
+                WindowDic.TryGetValue(token, out window);
+            }
+
             if (window != null)
             {
                 var decorator = VisualHelper.GetChild<AdornerDecorator>(window);
@@ -62,9 +139,23 @@ namespace HandyControl.Controls
             return dialog;
         }
 
-        public void Close()
+        public void Close(string token = "")
+        {
+            if (!string.IsNullOrEmpty(token))
+            {
+                if (WindowDic.TryGetValue(token, out var window))
+                {
+                    Close(window);
+                }
+            }
+            else
+            {
+                Close(VisualHelper.GetActiveWindow());
+            }
+        }
+
+        private void Close(System.Windows.Window window)
         {
-            var window = VisualHelper.GetActiveWindow();
             if (window != null)
             {
                 var decorator = VisualHelper.GetChild<AdornerDecorator>(window);

src/Shared/HandyControl_Shared/Controls/Other/Growl.cs

@@ -98,6 +98,19 @@ namespace HandyControl.Controls
             }
         }
 
+        public static void Unregister(string token)
+        {
+            if (string.IsNullOrEmpty(token)) return;
+
+            if (PanelDic.ContainsKey(token))
+            {
+                var panel = PanelDic[token];
+                PanelDic.Remove(token);
+                panel.ContextMenu = null;
+                panel.SetCurrentValue(PanelElement.FluidMoveBehaviorProperty, DependencyProperty.UnsetValue);
+            }
+        }
+
         protected override void OnMouseEnter(MouseEventArgs e)
         {
             base.OnMouseEnter(e);

src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs

@@ -114,7 +114,8 @@ namespace HandyControl.Controls
                 _isRunning = false;
             };
             _isRunning = true;
-            BeginAnimation(CurrentVerticalOffsetProperty, animation);
+
+            BeginAnimation(CurrentVerticalOffsetProperty, animation, HandoffBehavior.Compose);
         }
 
         internal void ScrollToHorizontalOffsetInternal(double offset, double milliseconds = 500)
@@ -131,7 +132,8 @@ namespace HandyControl.Controls
                 _isRunning = false;
             };
             _isRunning = true;
-            BeginAnimation(CurrentHorizontalOffsetProperty, animation);
+
+            BeginAnimation(CurrentHorizontalOffsetProperty, animation, HandoffBehavior.Compose);
         }
 
         protected override HitTestResult HitTestCore(PointHitTestParameters hitTestParameters) =>
@@ -150,7 +152,7 @@ namespace HandyControl.Controls
 
         public static bool GetIsEnableInertia(DependencyObject element)
         {
-            return (bool) element.GetValue(IsEnableInertiaProperty);
+            return (bool)element.GetValue(IsEnableInertiaProperty);
         }
 
         /// <summary>
@@ -158,7 +160,7 @@ namespace HandyControl.Controls
         /// </summary>
         public bool IsEnableInertia
         {
-            get => (bool)GetValue(IsEnableInertiaProperty);
+            get => (bool) GetValue(IsEnableInertiaProperty);
             set => SetValue(IsEnableInertiaProperty, value);
         }
 
@@ -173,7 +175,7 @@ namespace HandyControl.Controls
         /// </summary>
         public bool IsPenetrating
         {
-            get => (bool)GetValue(IsPenetratingProperty);
+            get => (bool) GetValue(IsPenetratingProperty);
             set => SetValue(IsPenetratingProperty, value);
         }
 
@@ -190,7 +192,7 @@ namespace HandyControl.Controls
         /// <summary>
         ///     当前垂直滚动偏移
         /// </summary>
-        private static readonly DependencyProperty CurrentVerticalOffsetProperty = DependencyProperty.Register(
+        internal static readonly DependencyProperty CurrentVerticalOffsetProperty = DependencyProperty.Register(
             "CurrentVerticalOffset", typeof(double), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.Double0Box, OnCurrentVerticalOffsetChanged));
 
         private static void OnCurrentVerticalOffsetChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -204,7 +206,7 @@ namespace HandyControl.Controls
         /// <summary>
         ///     当前垂直滚动偏移
         /// </summary>
-        private double CurrentVerticalOffset
+        internal double CurrentVerticalOffset
         {
             // ReSharper disable once UnusedMember.Local
             get => (double) GetValue(CurrentVerticalOffsetProperty);
@@ -214,7 +216,7 @@ namespace HandyControl.Controls
         /// <summary>
         ///     当前水平滚动偏移
         /// </summary>
-        public static readonly DependencyProperty CurrentHorizontalOffsetProperty = DependencyProperty.Register(
+        internal static readonly DependencyProperty CurrentHorizontalOffsetProperty = DependencyProperty.Register(
             "CurrentHorizontalOffset", typeof(double), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.Double0Box, OnCurrentHorizontalOffsetChanged));
 
         private static void OnCurrentHorizontalOffsetChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -228,7 +230,7 @@ namespace HandyControl.Controls
         /// <summary>
         ///     当前水平滚动偏移
         /// </summary>
-        public double CurrentHorizontalOffset
+        internal double CurrentHorizontalOffset
         {
             get => (double) GetValue(CurrentHorizontalOffsetProperty);
             set => SetValue(CurrentHorizontalOffsetProperty, value);

src/Shared/HandyControl_Shared/Controls/Panel/SimplePanel.cs

@@ -15,11 +15,9 @@ namespace HandyControl.Controls
         protected override Size MeasureOverride(Size availableSize)
         {
             var maxSize = new Size();
-            var children = InternalChildren;
 
-            for (int i = 0, count = children.Count; i < count; ++i)
+            foreach (UIElement child in InternalChildren)
             {
-                var child = children[i];
                 if (child != null)
                 {
                     child.Measure(availableSize);

src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenu.cs

@@ -0,0 +1,189 @@
+using System;
+using System.Linq;
+using System.Windows;
+using HandyControl.Data;
+
+namespace HandyControl.Controls
+{
+    public class SideMenu : HeaderedSimpleItemsControl
+    {
+        private SideMenuItem _selectedItem;
+
+        private SideMenuItem _selectedHeader;
+
+        private bool _isItemSelected;
+
+        public SideMenu()
+        {
+            AddHandler(SideMenuItem.SelectedEvent, new RoutedEventHandler(SideMenuItemSelected));
+
+            Loaded += (s, e) => Init();
+        }
+
+        protected override void Refresh()
+        {
+            base.Refresh();
+
+            Init();
+        }
+
+        private void Init()
+        {
+            if (ItemsHost == null) return;
+
+            OnExpandModeChanged(ExpandMode);
+        }
+
+        private void SideMenuItemSelected(object sender, RoutedEventArgs e)
+        {
+            if (e.OriginalSource is SideMenuItem item)
+            {
+                if (item.Role == SideMenuItemRole.Item)
+                {
+                    if (Equals(item, _selectedItem)) return;
+
+                    if (_selectedItem != null)
+                    {
+                        _selectedItem.IsSelected = false;
+                    }
+
+                    _selectedItem = item;
+                    _selectedItem.IsSelected = true;
+                    RaiseEvent(new FunctionEventArgs<object>(SelectionChangedEvent, this)
+                    {
+                        Info = e.OriginalSource
+                    });
+                    _isItemSelected = true;
+                }
+                else
+                {
+                    if (!Equals(item, _selectedHeader))
+                    {
+                        if (_selectedHeader != null)
+                        {
+                            if (ExpandMode == ExpandMode.Freedom && item.ItemsHost.IsVisible && !_isItemSelected)
+                            {
+                                item.IsSelected = false;
+                                SwitchPanelArea(item);
+                                return;
+                            }
+
+                            _selectedHeader.IsSelected = false;
+                            if (ExpandMode != ExpandMode.Freedom)
+                            {
+                                SwitchPanelArea(_selectedHeader);
+                            }
+                        }
+
+                        _selectedHeader = item;
+                        _selectedHeader.IsSelected = true;
+                        SwitchPanelArea(_selectedHeader);
+                    }
+                    else if (ExpandMode == ExpandMode.Freedom && !_isItemSelected)
+                    {
+                        _selectedHeader.IsSelected = false;
+                        SwitchPanelArea(_selectedHeader);
+                        _selectedHeader = null;
+                    }
+
+                    if (_isItemSelected)
+                    {
+                        _isItemSelected = false;
+                    }
+                    else if(_selectedHeader != null)
+                    {
+                        _selectedHeader.SelectDefaultItem();
+                        _isItemSelected = false;
+                    }
+                }
+            }
+        }
+
+        private void SwitchPanelArea(SideMenuItem oldItem)
+        {
+            switch (ExpandMode)
+            {
+                case ExpandMode.ShowAll:
+                    return;
+                case ExpandMode.ShowOne:
+                case ExpandMode.Freedom:
+                case ExpandMode.Accordion:
+                    oldItem.SwitchPanelArea(oldItem.IsSelected);
+                    break;
+            }
+        }
+
+        protected override DependencyObject GetContainerForItemOverride() => new SideMenuItem();
+
+        protected override bool IsItemItsOwnContainerOverride(object item) => item is SideMenuItem;
+
+        public static readonly DependencyProperty ExpandModeProperty = DependencyProperty.Register(
+            "ExpandMode", typeof(ExpandMode), typeof(SideMenu), new PropertyMetadata(default(ExpandMode), OnExpandModeChanged));
+
+        private static void OnExpandModeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctl = (SideMenu) d;
+            var v = (ExpandMode) e.NewValue;
+
+            if (ctl.ItemsHost == null)
+            {
+                return;
+            }
+
+            ctl.OnExpandModeChanged(v);
+        }
+
+        private void OnExpandModeChanged(ExpandMode mode)
+        {
+            if (mode == ExpandMode.ShowAll)
+            {
+                ShowAll();
+            }
+            else if (mode == ExpandMode.ShowOne)
+            {
+                var sideMenuItem = ItemsHost.Children.OfType<SideMenuItem>().FirstOrDefault(item => item.IsSelected);
+                ShowSelectedOne(sideMenuItem);
+            }
+        }
+
+        public ExpandMode ExpandMode
+        {
+            get => (ExpandMode) GetValue(ExpandModeProperty);
+            set => SetValue(ExpandModeProperty, value);
+        }
+
+        public static readonly DependencyProperty PanelAreaLengthProperty = DependencyProperty.Register(
+            "PanelAreaLength", typeof(double), typeof(SideMenu), new PropertyMetadata(double.NaN));
+
+        public double PanelAreaLength
+        {
+            get => (double) GetValue(PanelAreaLengthProperty);
+            set => SetValue(PanelAreaLengthProperty, value);
+        }
+
+        private void ShowAll()
+        {
+            foreach (var sideMenuItem in ItemsHost.Children.OfType<SideMenuItem>())
+            {
+                sideMenuItem.SwitchPanelArea(true);
+            }
+        }
+
+        private void ShowSelectedOne(SideMenuItem item)
+        {
+            foreach (var sideMenuItem in ItemsHost.Children.OfType<SideMenuItem>())
+            {
+                sideMenuItem.SwitchPanelArea(Equals(sideMenuItem, item));
+            }
+        }
+
+        public static readonly RoutedEvent SelectionChangedEvent = EventManager.RegisterRoutedEvent(
+            "SelectionChanged", RoutingStrategy.Bubble, typeof(EventHandler<FunctionEventArgs<object>>), typeof(SideMenu));
+
+        public event EventHandler<FunctionEventArgs<object>> SelectionChanged
+        {
+            add => AddHandler(SelectionChangedEvent, value);
+            remove => RemoveHandler(SelectionChangedEvent, value);
+        }
+    }
+}

src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenuItem.cs

@@ -0,0 +1,152 @@
+using System.Linq;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Input;
+using HandyControl.Data;
+using HandyControl.Tools.Extension;
+
+namespace HandyControl.Controls
+{
+    public class SideMenuItem : HeaderedSimpleItemsControl, ISelectable
+    {
+        private bool _isMouseLeftButtonDown;
+
+        public static readonly DependencyProperty IconProperty = DependencyProperty.Register(
+            "Icon", typeof(object), typeof(SideMenuItem), new PropertyMetadata(default(object)));
+
+        public object Icon
+        {
+            get => GetValue(IconProperty);
+            set => SetValue(IconProperty, value);
+        }
+
+        public SideMenuItem()
+        {
+            SetBinding(ExpandModeProperty, new Binding(SideMenu.ExpandModeProperty.Name)
+            {
+                RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(SideMenu), 1)
+            });
+        }
+
+        internal static readonly DependencyProperty ExpandModeProperty =
+            SideMenu.ExpandModeProperty.AddOwner(typeof(SideMenuItem), new PropertyMetadata(default(ExpandMode)));
+
+        internal ExpandMode ExpandMode
+        {
+            get => (ExpandMode) GetValue(ExpandModeProperty);
+            set => SetValue(ExpandModeProperty, value);
+        }
+
+        protected override void Refresh()
+        {
+            if (ItemsHost == null) return;
+
+            ItemsHost.Children.Clear();
+            foreach (var item in Items)
+            {
+                DependencyObject container;
+                if (IsItemItsOwnContainerOverride(item))
+                {
+                    container = item as DependencyObject;
+                }
+                else
+                {
+                    container = GetContainerForItemOverride();
+                    PrepareContainerForItemOverride(container, item);
+                }
+
+                if (container is FrameworkElement element)
+                {
+                    element.Style = ItemContainerStyle;
+                    ItemsHost.Children.Add(element);
+                }
+            }
+
+            if (IsLoaded)
+            {
+                SwitchPanelArea(ExpandMode == ExpandMode.ShowAll || IsSelected);
+            }
+        }
+
+        protected virtual void OnSelected(RoutedEventArgs e) => RaiseEvent(e);
+
+        public static readonly RoutedEvent SelectedEvent =
+            EventManager.RegisterRoutedEvent("Selected", RoutingStrategy.Bubble,
+                typeof(RoutedEventHandler), typeof(SideMenuItem));
+
+        public event RoutedEventHandler Selected
+        {
+            add => AddHandler(SelectedEvent, value);
+            remove => RemoveHandler(SelectedEvent, value);
+        }
+
+        public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register(
+            "IsSelected", typeof(bool), typeof(SideMenuItem), new PropertyMetadata(ValueBoxes.FalseBox));
+
+        public bool IsSelected
+        {
+            get => (bool) GetValue(IsSelectedProperty);
+            set => SetValue(IsSelectedProperty, value);
+        }
+
+        public static readonly DependencyProperty RoleProperty = DependencyProperty.Register(
+            "Role", typeof(SideMenuItemRole), typeof(SideMenuItem), new PropertyMetadata(default(SideMenuItemRole)));
+
+        public SideMenuItemRole Role
+        {
+            get => (SideMenuItemRole) GetValue(RoleProperty);
+            internal set => SetValue(RoleProperty, value);
+        }
+
+        protected override DependencyObject GetContainerForItemOverride() => new SideMenuItem();
+
+        protected override bool IsItemItsOwnContainerOverride(object item) => item is SideMenuItem;
+
+        protected override void OnMouseLeave(MouseEventArgs e)
+        {
+            base.OnMouseLeave(e);
+
+            _isMouseLeftButtonDown = false;
+        }
+
+        protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
+        {
+            base.OnMouseLeftButtonDown(e);
+
+            _isMouseLeftButtonDown = true;
+        }
+
+        protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
+        {
+            base.OnMouseLeftButtonUp(e);
+
+            if (_isMouseLeftButtonDown)
+            {
+                IsSelected = true;
+                OnSelected(new RoutedEventArgs(SelectedEvent, this));
+                _isMouseLeftButtonDown = false;
+            }
+        }
+
+        internal void SelectDefaultItem()
+        {
+            if (Role == SideMenuItemRole.Header && ItemsHost.Children.Count > 0)
+            {
+                var item = ItemsHost.Children.OfType<SideMenuItem>().FirstOrDefault();
+                if (item != null && !item.IsSelected)
+                {
+                    item.OnSelected(new RoutedEventArgs(SelectedEvent, item));
+                }
+            }
+        }
+
+        internal void SwitchPanelArea(bool isShow)
+        {
+            if (ItemsHost == null) return;
+            if (Role == SideMenuItemRole.Header)
+            {
+                ItemsHost.Show(isShow);
+            }
+        }
+    }
+}

src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs

@@ -3,6 +3,7 @@ using System.Collections.Specialized;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
+using System.Windows.Input;
 using HandyControl.Data;
 using HandyControl.Tools.Extension;
 
@@ -10,16 +11,31 @@ namespace HandyControl.Controls
 {
     [TemplatePart(Name = OverflowButtonKey, Type = typeof(ContextMenuToggleButton))]
     [TemplatePart(Name = HeaderPanelKey, Type = typeof(TabPanel))]
+    [TemplatePart(Name = OverflowScrollviewer, Type = typeof(ScrollViewer))]
+    [TemplatePart(Name = ScrollButtonLeft, Type = typeof(Button))]
+    [TemplatePart(Name = ScrollButtonRight, Type = typeof(Button))]
     public class TabControl : System.Windows.Controls.TabControl
     {
         private const string OverflowButtonKey = "PART_OverflowButton";
 
         private const string HeaderPanelKey = "PART_HeaderPanel";
 
+        private const string OverflowScrollviewer = "PART_OverflowScrollviewer";
+
+        private const string ScrollButtonLeft = "PART_ScrollButtonLeft";
+
+        private const string ScrollButtonRight = "PART_ScrollButtonRight";
+
         private ContextMenuToggleButton _buttonOverflow;
 
         private TabPanel _headerPanel;
 
+        private ScrollViewer _scrollviewerOverflow;
+
+        private Button _buttonScrollLeft;
+
+        private Button _buttonScrollRight;
+
         /// <summary>
         ///     是否为内部操作
         /// </summary>
@@ -115,6 +131,21 @@ namespace HandyControl.Controls
             set => SetValue(TabItemHeightProperty, value);
         }
 
+        /// <summary>
+        ///     是否可以滚动
+        /// </summary>
+        public static readonly DependencyProperty IsScrollableProperty = DependencyProperty.Register(
+            "IsScrollable", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
+
+        /// <summary>
+        ///     是否可以滚动
+        /// </summary>
+        public bool IsScrollable
+        {
+            get => (bool) GetValue(IsScrollableProperty);
+            set => SetValue(IsScrollableProperty, value);
+        }
+
         /// <summary>
         ///     可见的标签数量
         /// </summary>
@@ -133,7 +164,7 @@ namespace HandyControl.Controls
             if (!IsEnableTabFill)
             {
                 _itemShowCount = (int)(ActualWidth / TabItemWidth);
-                _buttonOverflow.Show(Items.Count > 0  && Items.Count >= _itemShowCount);
+                _buttonOverflow.Show(Items.Count > 0 && Items.Count >= _itemShowCount);
             }
 
             if (IsInternalAction)
@@ -163,12 +194,33 @@ namespace HandyControl.Controls
 
         public override void OnApplyTemplate()
         {
+            if (_buttonOverflow != null)
+            {
+                if (_buttonOverflow.Menu != null)
+                {
+                    _buttonOverflow.Menu.Closed -= Menu_Closed;
+                    _buttonOverflow.Menu = null;
+                }
+
+                _buttonOverflow.Click -= ButtonOverflow_Click;
+            }
+
+            if (_buttonScrollLeft != null) _buttonScrollLeft.Click -= ButtonScrollLeft_Click;
+            if (_buttonScrollRight != null) _buttonScrollRight.Click -= ButtonScrollRight_Click;
+
             base.OnApplyTemplate();
-            _headerPanel = Template.FindName(HeaderPanelKey, this) as TabPanel;
+            _headerPanel = GetTemplateChild(HeaderPanelKey) as TabPanel;
 
             if (IsEnableTabFill) return;
 
-            _buttonOverflow = Template.FindName(OverflowButtonKey, this) as ContextMenuToggleButton;
+            _buttonOverflow = GetTemplateChild(OverflowButtonKey) as ContextMenuToggleButton;
+            _scrollviewerOverflow = GetTemplateChild(OverflowScrollviewer) as ScrollViewer;
+            _buttonScrollLeft = GetTemplateChild(ScrollButtonLeft) as Button;
+            _buttonScrollRight = GetTemplateChild(ScrollButtonRight) as Button;
+
+            if (_buttonScrollLeft != null) _buttonScrollLeft.Click += ButtonScrollLeft_Click;
+            if (_buttonScrollRight != null) _buttonScrollRight.Click += ButtonScrollRight_Click;
+
             if (_buttonOverflow != null)
             {
                 _itemShowCount = (int)(ActualWidth / TabItemWidth);
@@ -179,49 +231,68 @@ namespace HandyControl.Controls
                     Placement = PlacementMode.Bottom,
                     PlacementTarget = _buttonOverflow
                 };
-                menu.Closed += (s, e) => _buttonOverflow.IsChecked = false;
+                menu.Closed += Menu_Closed;
                 _buttonOverflow.Menu = menu;
-                _buttonOverflow.Click += (s, e) =>
-                {
-                    if (_buttonOverflow.IsChecked == true)
-                    {
-                        _buttonOverflow.Menu.Items.Clear();
-                        foreach (TabItem item in Items)
-                        {
-                            var menuItem = new MenuItem
-                            {
-                                Header = item.Header,
-                                Width = TabItemWidth,
-                                IsChecked = item.IsSelected,
-                                IsCheckable = true
-                            };
-                            menuItem.Click += delegate
-                            {
-                                _buttonOverflow.IsChecked = false;
-                                var index = Items.IndexOf(item);
-                                if (index >= _itemShowCount)
-                                {
-                                    Items.Remove(item);
-                                    Items.Insert(0, item);
-                                    if (IsEnableAnimation)
-                                    {
-                                        _headerPanel.ClearValue(TabPanel.FluidMoveDurationProperty);
-                                    }
-                                    else
-                                    {
-                                        _headerPanel.FluidMoveDuration = new Duration(TimeSpan.FromSeconds(0));
-                                    }
-                                    _headerPanel.ForceUpdate = true;
-                                    _headerPanel.Measure(new Size(_headerPanel.DesiredSize.Width, ActualHeight));
-                                    _headerPanel.ForceUpdate = false;
-                                }
-                                item.IsSelected = true;
-                            };
-                            _buttonOverflow.Menu.Items.Add(menuItem);
-                        }
-                    }
-                };
+                _buttonOverflow.Click += ButtonOverflow_Click;
             }
         }
+
+        private void Menu_Closed(object sender, RoutedEventArgs e) => _buttonOverflow.IsChecked = false;
+
+        private void ButtonScrollRight_Click(object sender, RoutedEventArgs e) =>
+            _scrollviewerOverflow.ScrollToHorizontalOffsetInternal(Math.Min(
+                _scrollviewerOverflow.CurrentHorizontalOffset + TabItemWidth, _scrollviewerOverflow.ScrollableWidth));
+
+        private void ButtonScrollLeft_Click(object sender, RoutedEventArgs e) =>
+            _scrollviewerOverflow.ScrollToHorizontalOffsetInternal(Math.Max(
+                _scrollviewerOverflow.CurrentHorizontalOffset - TabItemWidth, 0));
+
+        private void ButtonOverflow_Click(object sender, RoutedEventArgs e)
+        {
+            if (_buttonOverflow.IsChecked == true)
+            {
+                _buttonOverflow.Menu.Items.Clear();
+                foreach (TabItem item in Items)
+                {
+                    var menuItem = new MenuItem
+                    {
+                        Header = item.Header,
+                        Width = TabItemWidth,
+                        IsChecked = item.IsSelected,
+                        IsCheckable = true
+                    };
+                    menuItem.Click += delegate
+                    {
+                        _buttonOverflow.IsChecked = false;
+                        var index = Items.IndexOf(item);
+                        if (index >= _itemShowCount)
+                        {
+                            Items.Remove(item);
+                            Items.Insert(0, item);
+                            if (IsEnableAnimation)
+                            {
+                                _headerPanel.ClearValue(TabPanel.FluidMoveDurationProperty);
+                            }
+                            else
+                            {
+                                _headerPanel.FluidMoveDuration = new Duration(TimeSpan.FromSeconds(0));
+                            }
+                            _headerPanel.ForceUpdate = true;
+                            _headerPanel.Measure(new Size(_headerPanel.DesiredSize.Width, ActualHeight));
+                            _headerPanel.ForceUpdate = false;
+                        }
+                        item.IsSelected = true;
+                    };
+                    _buttonOverflow.Menu.Items.Add(menuItem);
+                }
+            }
+        }
+
+        internal double GetHorizontalOffset() => _scrollviewerOverflow?.CurrentHorizontalOffset ?? 0;
+
+        internal void UpdateScroll() => _scrollviewerOverflow?.RaiseEvent(new MouseWheelEventArgs(Mouse.PrimaryDevice, Environment.TickCount, 0)
+        {
+            RoutedEvent = MouseWheelEvent
+        });
     }
 }

src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs

@@ -87,6 +87,11 @@ namespace HandyControl.Controls
         /// </summary>
         private int _currentIndex;
 
+        /// <summary>
+        ///     标签容器横向滚动距离
+        /// </summary>
+        private double _scrollHorizontalOffset;
+
         /// <summary>
         ///     标签容器
         /// </summary>
@@ -178,17 +183,21 @@ namespace HandyControl.Controls
             base.OnMouseLeftButtonDown(e);
             if (TabControlParent.IsDraggable && !ItemIsDragging && !_isDragging)
             {
+                TabControlParent.UpdateScroll();
                 TabPanel.FluidMoveDuration = new Duration(TimeSpan.FromSeconds(0));
                 _mouseDownOffsetX = RenderTransform.Value.OffsetX;
-                var mx = TranslatePoint(new Point(), TabControlParent).X;
+                _scrollHorizontalOffset = TabControlParent.GetHorizontalOffset();
+                var mx = TranslatePoint(new Point(), TabControlParent).X + _scrollHorizontalOffset;
                 _mouseDownIndex = CalLocationIndex(mx);
-                _maxMoveLeft = -_mouseDownIndex * ItemWidth;
+                var subIndex = _mouseDownIndex - CalLocationIndex(_scrollHorizontalOffset);
+                _maxMoveLeft = -subIndex * ItemWidth;
                 _maxMoveRight = TabControlParent.ActualWidth - ActualWidth + _maxMoveLeft;
 
                 _isDragging = true;
                 ItemIsDragging = true;
                 _isWaiting = true;
                 _dragPoint = e.GetPosition(TabControlParent);
+                _dragPoint = new Point(_dragPoint.X + +_scrollHorizontalOffset, _dragPoint.Y);
                 _mouseDownPoint = _dragPoint;
                 CaptureMouse();
             }
@@ -199,9 +208,10 @@ namespace HandyControl.Controls
             base.OnMouseMove(e);
             if (ItemIsDragging && _isDragging)
             {
-                var subX = TranslatePoint(new Point(), TabControlParent).X;
+                var subX = TranslatePoint(new Point(), TabControlParent).X + _scrollHorizontalOffset;
                 CurrentIndex = CalLocationIndex(subX);
                 var p = e.GetPosition(TabControlParent);
+                p = new Point(p.X + _scrollHorizontalOffset, p.Y);
                 var subLeft = p.X - _dragPoint.X;
                 var totalLeft = p.X - _mouseDownPoint.X;
 
@@ -229,7 +239,7 @@ namespace HandyControl.Controls
             ReleaseMouseCapture();
             if (_isDragged)
             {
-                var subX = TranslatePoint(new Point(), TabControlParent).X;
+                var subX = TranslatePoint(new Point(), TabControlParent).X + _scrollHorizontalOffset;
                 var index = CalLocationIndex(subX);
                 var left = index * ItemWidth;
                 var offsetX = RenderTransform.Value.OffsetX;
@@ -273,7 +283,7 @@ namespace HandyControl.Controls
             animation.Completed += (s1, e1) => AnimationCompleted();
             var f = new TranslateTransform(offsetX, 0);
             RenderTransform = f;
-            f.BeginAnimation(TranslateTransform.XProperty, animation);
+            f.BeginAnimation(TranslateTransform.XProperty, animation, HandoffBehavior.Compose);
         }
 
         /// <summary>

src/Shared/HandyControl_Shared/Controls/Time/Clock/Clock.cs

@@ -6,26 +6,23 @@ using System.Windows.Controls.Primitives;
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Media;
-using HandyControl.Data;
 using HandyControl.Tools;
 
 namespace HandyControl.Controls
 {
     [TemplatePart(Name = ElementButtonAm, Type = typeof(RadioButton))]
     [TemplatePart(Name = ElementButtonPm, Type = typeof(RadioButton))]
-    [TemplatePart(Name = ElementButtonConfirm, Type = typeof(Button))]
     [TemplatePart(Name = ElementCanvas, Type = typeof(Canvas))]
     [TemplatePart(Name = ElementBorderTitle, Type = typeof(Border))]
     [TemplatePart(Name = ElementBorderClock, Type = typeof(Border))]
     [TemplatePart(Name = ElementPanelNum, Type = typeof(CirclePanel))]
     [TemplatePart(Name = ElementTimeStr, Type = typeof(TextBlock))]
-    public class Clock : Control
+    public class Clock : ClockBase
     {
         #region Constants
 
         private const string ElementButtonAm = "PART_ButtonAm";
         private const string ElementButtonPm = "PART_ButtonPm";
-        private const string ElementButtonConfirm = "PART_ButtonConfirm";
         private const string ElementCanvas = "PART_Canvas";
         private const string ElementBorderTitle = "PART_BorderTitle";
         private const string ElementBorderClock = "PART_BorderClock";
@@ -40,8 +37,6 @@ namespace HandyControl.Controls
 
         private RadioButton _buttonPm;
 
-        private Button _buttonConfirm;
-
         private Canvas _canvas;
 
         private Border _borderTitle;
@@ -60,59 +55,10 @@ namespace HandyControl.Controls
 
         private int _secValue;
 
-        private bool _appliedTemplate;
-
         #endregion Data
 
-        #region Public Events
-
-        public static readonly RoutedEvent SelectedTimeChangedEvent =
-            EventManager.RegisterRoutedEvent("SelectedTimeChanged", RoutingStrategy.Direct,
-                typeof(EventHandler<FunctionEventArgs<DateTime?>>), typeof(Clock));
-
-        public event EventHandler<FunctionEventArgs<DateTime?>> SelectedTimeChanged
-        {
-            add => AddHandler(SelectedTimeChangedEvent, value);
-            remove => RemoveHandler(SelectedTimeChangedEvent, value);
-        }
-
-        public event EventHandler<FunctionEventArgs<DateTime>> DisplayTimeChanged;
-
-        public event Action Confirmed;
-
-        #endregion Public Events
-
         #region Public Properties
 
-        public static readonly DependencyProperty SelectedTimeProperty = DependencyProperty.Register(
-            "SelectedTime", typeof(DateTime?), typeof(Clock), new PropertyMetadata(default(DateTime?), OnSelectedTimeChanged));
-
-        private static void OnSelectedTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (Clock)d;
-            var v = (DateTime?)e.NewValue;
-            ctl.DisplayTime = v ?? DateTime.Now;
-            ctl.OnSelectedTimeChanged(new FunctionEventArgs<DateTime?>(SelectedTimeChangedEvent, ctl)
-            {
-                Info = v
-            });
-        }
-
-        public DateTime? SelectedTime
-        {
-            get => (DateTime?) GetValue(SelectedTimeProperty);
-            set => SetValue(SelectedTimeProperty, value);
-        }
-
-        public static readonly DependencyProperty TimeFormatProperty = DependencyProperty.Register(
-            "TimeFormat", typeof(string), typeof(Clock), new PropertyMetadata("HH:mm:ss"));
-
-        public string TimeFormat
-        {
-            get => (string) GetValue(TimeFormatProperty);
-            set => SetValue(TimeFormatProperty, value);
-        }
-
         public static readonly DependencyProperty ClockRadioButtonStyleProperty = DependencyProperty.Register(
             "ClockRadioButtonStyle", typeof(Style), typeof(Clock), new PropertyMetadata(default(Style)));
 
@@ -122,32 +68,6 @@ namespace HandyControl.Controls
             set => SetValue(ClockRadioButtonStyleProperty, value);
         }
 
-        public static readonly DependencyProperty DisplayTimeProperty = DependencyProperty.Register(
-            "DisplayTime", typeof(DateTime), typeof(Clock), new FrameworkPropertyMetadata(DateTime.Now, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnDisplayTimeChanged));
-
-        private static void OnDisplayTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (Clock) d;
-            var v = (DateTime) e.NewValue;
-            ctl.Update(v);
-            ctl.OnDisplayTimeChanged(new FunctionEventArgs<DateTime>(v));
-        }
-
-        public DateTime DisplayTime
-        {
-            get => (DateTime) GetValue(DisplayTimeProperty);
-            set => SetValue(DisplayTimeProperty, value);
-        }
-
-        internal static readonly DependencyProperty ShowConfirmButtonProperty = DependencyProperty.Register(
-            "ShowConfirmButton", typeof(bool), typeof(Clock), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        internal bool ShowConfirmButton
-        {
-            get => (bool)GetValue(ShowConfirmButtonProperty);
-            set => SetValue(ShowConfirmButtonProperty, value);
-        }
-
         private int SecValue
         {
             get => _secValue;
@@ -174,7 +94,7 @@ namespace HandyControl.Controls
 
         public override void OnApplyTemplate()
         {
-            _appliedTemplate = false;
+            AppliedTemplate = false;
             if (_buttonAm != null)
             {
                 _buttonAm.Click -= ButtonAm_OnClick;
@@ -185,9 +105,9 @@ namespace HandyControl.Controls
                 _buttonPm.Click -= ButtonPm_OnClick;
             }
 
-            if (_buttonConfirm != null)
+            if (ButtonConfirm != null)
             {
-                _buttonConfirm.Click -= ButtonConfirm_OnClick;
+                ButtonConfirm.Click -= ButtonConfirm_OnClick;
             }
 
             if (_borderTitle != null)
@@ -206,18 +126,18 @@ namespace HandyControl.Controls
 
             _buttonAm = GetTemplateChild(ElementButtonAm) as RadioButton;
             _buttonPm = GetTemplateChild(ElementButtonPm) as RadioButton;
-            _buttonConfirm = GetTemplateChild(ElementButtonConfirm) as Button;
+            ButtonConfirm = GetTemplateChild(ElementButtonConfirm) as Button;
             _borderTitle = GetTemplateChild(ElementBorderTitle) as Border;
             _canvas = GetTemplateChild(ElementCanvas) as Canvas;
             _borderClock = GetTemplateChild(ElementBorderClock) as Border;
             _circlePanel = GetTemplateChild(ElementPanelNum) as CirclePanel;
             _blockTime = GetTemplateChild(ElementTimeStr) as TextBlock;
 
-            CheckNull();
+            if (!CheckNull()) return;
 
             _buttonAm.Click += ButtonAm_OnClick;
             _buttonPm.Click += ButtonPm_OnClick;
-            _buttonConfirm.Click += ButtonConfirm_OnClick;
+            ButtonConfirm.Click += ButtonConfirm_OnClick;
             _borderTitle.MouseWheel += BorderTitle_OnMouseWheel;
 
             _canvas.MouseWheel += Canvas_OnMouseWheel;
@@ -241,7 +161,7 @@ namespace HandyControl.Controls
                 _circlePanel.Children.Add(button);
             }
 
-            _appliedTemplate = true;
+            AppliedTemplate = true;
             if (SelectedTime.HasValue)
             {
                 Update(SelectedTime.Value);
@@ -255,26 +175,15 @@ namespace HandyControl.Controls
 
         #endregion Public Methods
 
-        #region Protected Methods
-
-        protected virtual void OnSelectedTimeChanged(FunctionEventArgs<DateTime?> e) => RaiseEvent(e);
-
-        protected virtual void OnDisplayTimeChanged(FunctionEventArgs<DateTime> e)
-        {
-            var handler = DisplayTimeChanged;
-            handler?.Invoke(this, e);
-        }
-
-        #endregion Protected Methods
-
         #region Private Methods
 
-        private void CheckNull()
+        private bool CheckNull()
         {
-
-            if (_buttonPm == null || _buttonAm == null || _buttonConfirm == null || _canvas == null ||
+            if (_buttonPm == null || _buttonAm == null || ButtonConfirm == null || _canvas == null ||
                 _borderTitle == null || _borderClock == null || _circlePanel == null ||
-                _blockTime == null) throw new Exception();
+                _blockTime == null) return false;
+
+            return true;
         }
 
         private void BorderTitle_OnMouseWheel(object sender, MouseWheelEventArgs e)
@@ -339,7 +248,7 @@ namespace HandyControl.Controls
 
         private void Update()
         {
-            if (!_appliedTemplate) return;
+            if (!AppliedTemplate) return;
             var hValue = _currentButton.Num;
             if (_buttonPm.IsChecked == true)
             {
@@ -367,9 +276,9 @@ namespace HandyControl.Controls
         ///     更新
         /// </summary>
         /// <param name="time"></param>
-        internal void Update(DateTime time)
+        internal override void Update(DateTime time)
         {
-            if (!_appliedTemplate) return;
+            if (!AppliedTemplate) return;
             var h = time.Hour;
             var m = time.Minute;
 
@@ -396,12 +305,6 @@ namespace HandyControl.Controls
             Update();
         }
 
-        private void ButtonConfirm_OnClick(object sender, RoutedEventArgs e)
-        {
-            SelectedTime = DisplayTime;
-            Confirmed?.Invoke();
-        }
-
         /// <summary>
         ///     获取显示时间
         /// </summary>

src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockBase.cs

@@ -0,0 +1,106 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using HandyControl.Data;
+
+namespace HandyControl.Controls
+{
+    [TemplatePart(Name = ElementButtonConfirm, Type = typeof(Button))]
+    public abstract class ClockBase : Control
+    {
+        protected const string ElementButtonConfirm = "PART_ButtonConfirm";
+
+        protected Button ButtonConfirm;
+
+        protected bool AppliedTemplate;
+
+        public event Action Confirmed;
+
+        public event EventHandler<FunctionEventArgs<DateTime>> DisplayTimeChanged;
+
+        public static readonly RoutedEvent SelectedTimeChangedEvent =
+            EventManager.RegisterRoutedEvent("SelectedTimeChanged", RoutingStrategy.Direct,
+                typeof(EventHandler<FunctionEventArgs<DateTime?>>), typeof(ClockBase));
+
+        public event EventHandler<FunctionEventArgs<DateTime?>> SelectedTimeChanged
+        {
+            add => AddHandler(SelectedTimeChangedEvent, value);
+            remove => RemoveHandler(SelectedTimeChangedEvent, value);
+        }
+
+        public static readonly DependencyProperty TimeFormatProperty = DependencyProperty.Register(
+            "TimeFormat", typeof(string), typeof(ClockBase), new PropertyMetadata("HH:mm:ss"));
+
+        public string TimeFormat
+        {
+            get => (string)GetValue(TimeFormatProperty);
+            set => SetValue(TimeFormatProperty, value);
+        }
+
+        public static readonly DependencyProperty SelectedTimeProperty = DependencyProperty.Register(
+            "SelectedTime", typeof(DateTime?), typeof(ClockBase), new PropertyMetadata(default(DateTime?), OnSelectedTimeChanged));
+
+        private static void OnSelectedTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctl = (ClockBase)d;
+            var v = (DateTime?)e.NewValue;
+            ctl.DisplayTime = v ?? DateTime.Now;
+            ctl.OnSelectedTimeChanged(new FunctionEventArgs<DateTime?>(SelectedTimeChangedEvent, ctl)
+            {
+                Info = v
+            });
+        }
+
+        public DateTime? SelectedTime
+        {
+            get => (DateTime?) GetValue(SelectedTimeProperty);
+            set => SetValue(SelectedTimeProperty, value);
+        }
+
+        public static readonly DependencyProperty DisplayTimeProperty = DependencyProperty.Register(
+            "DisplayTime", typeof(DateTime), typeof(ClockBase),
+            new FrameworkPropertyMetadata(DateTime.Now, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
+                OnDisplayTimeChanged));
+
+        private static void OnDisplayTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctl = (ClockBase)d;
+            var v = (DateTime)e.NewValue;
+            ctl.Update(v);
+            ctl.OnDisplayTimeChanged(new FunctionEventArgs<DateTime>(v));
+        }
+
+        public DateTime DisplayTime
+        {
+            get => (DateTime)GetValue(DisplayTimeProperty);
+            set => SetValue(DisplayTimeProperty, value);
+        }
+
+        internal static readonly DependencyProperty ShowConfirmButtonProperty = DependencyProperty.Register(
+            "ShowConfirmButton", typeof(bool), typeof(ClockBase), new PropertyMetadata(ValueBoxes.FalseBox));
+
+        internal bool ShowConfirmButton
+        {
+            get => (bool) GetValue(ShowConfirmButtonProperty);
+            set => SetValue(ShowConfirmButtonProperty, value);
+        }
+
+        protected virtual void OnSelectedTimeChanged(FunctionEventArgs<DateTime?> e) => RaiseEvent(e);
+
+        protected virtual void OnDisplayTimeChanged(FunctionEventArgs<DateTime> e)
+        {
+            var handler = DisplayTimeChanged;
+            handler?.Invoke(this, e);
+        }
+
+        protected void ButtonConfirm_OnClick(object sender, RoutedEventArgs e)
+        {
+            SelectedTime = DisplayTime;
+            Confirmed?.Invoke();
+        }
+
+        internal abstract void Update(DateTime time);
+
+        protected void Clock_SelectedTimeChanged(object sender, FunctionEventArgs<DateTime?> e) => SelectedTime = e.Info;
+    }
+}

src/Shared/HandyControl_Shared/Controls/Time/Clock/ListClock.cs

@@ -0,0 +1,148 @@
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace HandyControl.Controls
+{
+    [TemplatePart(Name = ElementHourList, Type = typeof(ListBox))]
+    [TemplatePart(Name = ElementMinuteList, Type = typeof(ListBox))]
+    [TemplatePart(Name = ElementSecondList, Type = typeof(ListBox))]
+    public class ListClock : ClockBase
+    {
+        #region Constants
+
+        private const string ElementHourList = "PART_HourList";
+        private const string ElementMinuteList = "PART_MinuteList";
+        private const string ElementSecondList = "PART_SecondList";
+
+        #endregion Constants
+
+        #region Data
+
+        private ListBox _hourList;
+
+        private ListBox _minuteList;
+
+        private ListBox _secondList;
+
+        #endregion Data
+
+        public override void OnApplyTemplate()
+        {
+            AppliedTemplate = false;
+            if (ButtonConfirm != null)
+            {
+                ButtonConfirm.Click -= ButtonConfirm_OnClick;
+            }
+
+            if (_hourList != null)
+            {
+                _hourList.SelectionChanged -= HourList_SelectionChanged;
+            }
+
+            if (_minuteList != null)
+            {
+                _minuteList.SelectionChanged -= MinuteList_SelectionChanged;
+            }
+
+            if (_secondList != null)
+            {
+                _secondList.SelectionChanged -= SecondList_SelectionChanged;
+            }
+
+            base.OnApplyTemplate();
+
+            _hourList = GetTemplateChild(ElementHourList) as ListBox;
+            if (_hourList != null)
+            {
+                CreateItemsSource(_hourList, 24);
+                _hourList.SelectionChanged += HourList_SelectionChanged;
+            }
+
+            _minuteList = GetTemplateChild(ElementMinuteList) as ListBox;
+            if (_minuteList != null)
+            {
+                CreateItemsSource(_minuteList, 60);
+                _minuteList.SelectionChanged += MinuteList_SelectionChanged;
+            }
+
+            _secondList = GetTemplateChild(ElementSecondList) as ListBox;
+            if (_secondList != null)
+            {
+                CreateItemsSource(_secondList, 60);
+                _secondList.SelectionChanged += SecondList_SelectionChanged;
+            }
+
+            ButtonConfirm = GetTemplateChild(ElementButtonConfirm) as Button;
+
+            if (ButtonConfirm != null)
+            {
+                ButtonConfirm.Click += ButtonConfirm_OnClick;
+            }
+
+            AppliedTemplate = true;
+            if (SelectedTime.HasValue)
+            {
+                Update(SelectedTime.Value);
+            }
+            else
+            {
+                DisplayTime = DateTime.Now;
+                Update(DisplayTime);
+            }
+        }
+
+        private void HourList_SelectionChanged(object sender, SelectionChangedEventArgs e) => Update();
+
+        private void MinuteList_SelectionChanged(object sender, SelectionChangedEventArgs e) => Update();
+
+        private void SecondList_SelectionChanged(object sender, SelectionChangedEventArgs e) => Update();
+
+        private void CreateItemsSource(ItemsControl selector, int count)
+        {
+            var list = new List<string>();
+            for (int i = 0; i < count; i++)
+            {
+                list.Add(i.ToString("#00"));
+            }
+
+            selector.ItemsSource = list;
+        }
+
+        private void Update()
+        {
+            if (_hourList.SelectedIndex >= 0 && _hourList.SelectedIndex < 24 &&
+                _minuteList.SelectedIndex >= 0 && _minuteList.SelectedIndex < 60 &&
+                _secondList.SelectedIndex >= 0 && _secondList.SelectedIndex < 60)
+            {
+                var now = DateTime.Now;
+                DisplayTime = new DateTime(now.Year, now.Month, now.Day, _hourList.SelectedIndex,
+                    _minuteList.SelectedIndex, _secondList.SelectedIndex);
+            }
+        }
+
+        /// <summary>
+        ///     更新
+        /// </summary>
+        /// <param name="time"></param>
+        internal override void Update(DateTime time)
+        {
+            if (!AppliedTemplate) return;
+
+            var h = time.Hour;
+            var m = time.Minute;
+            var s = time.Second;
+
+            _hourList.SelectedIndex = h;
+            _minuteList.SelectedIndex = m;
+            _secondList.SelectedIndex = s;
+
+            _hourList.ScrollIntoView(_hourList.SelectedItem);
+            _minuteList.ScrollIntoView(_minuteList.SelectedItem);
+            _secondList.ScrollIntoView(_secondList.SelectedItem);
+
+            DisplayTime = time;
+        }
+    }
+}

src/Shared/HandyControl_Shared/Controls/Transfer/Transfer.cs

@@ -30,6 +30,10 @@ namespace HandyControl.Controls
 
         private IEnumerable _itemsSourceInternal;
 
+        private IEnumerable _initEnumerable;
+
+        private NotifyCollectionChangedEventArgs _initArgs;
+
         public static readonly RoutedEvent SelectionChangedEvent =
             EventManager.RegisterRoutedEvent("SelectionChanged", RoutingStrategy.Bubble,
                 typeof(SelectionChangedEventHandler), typeof(Transfer));
@@ -71,7 +75,22 @@ namespace HandyControl.Controls
             _itemsOrigin = GetTemplateChild(ElementItemsOrigin) as SimpleItemsControl;
             _itemsSelected = GetTemplateChild(ElementItemsSelected) as SimpleItemsControl;
 
-            Refresh();
+            if (_itemsOrigin != null && _itemsSelected != null)
+            {
+                if (_initEnumerable != null)
+                {
+                    OnItemsSourceChanged(null, _itemsSourceInternal);
+                    _itemsSourceInternal = null;
+                }
+
+                if (_initArgs != null)
+                {
+                    InternalCollectionChanged(null, _initArgs);
+                    _initArgs = null;
+                }
+
+                Refresh();
+            }
         }
 
         private void AddItem(object item)
@@ -114,6 +133,12 @@ namespace HandyControl.Controls
 
         protected override void OnItemsSourceChanged(IEnumerable oldValue, IEnumerable newValue)
         {
+            if (_itemsOrigin == null || _itemsSelected == null)
+            {
+                _initEnumerable = newValue;
+                return;
+            }
+
             if (_itemsSourceInternal != null)
             {
                 if (_itemsSourceInternal is INotifyCollectionChanged s)
@@ -139,6 +164,12 @@ namespace HandyControl.Controls
 
         private void InternalCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
+            if (_itemsOrigin == null || _itemsSelected == null)
+            {
+                _initArgs = e;
+                return;
+            }
+
             if (e.OldItems != null)
             {
                 foreach (var item in e.OldItems)

src/Shared/HandyControl_Shared/Controls/Window/Window.cs

@@ -64,7 +64,7 @@ namespace HandyControl.Controls
 
         public static readonly DependencyProperty NonClientAreaHeightProperty = DependencyProperty.Register(
             "NonClientAreaHeight", typeof(double), typeof(Window),
-            new PropertyMetadata(28.0));
+            new PropertyMetadata(26.0));
 
         public static readonly DependencyProperty ShowNonClientAreaProperty = DependencyProperty.Register(
             "ShowNonClientArea", typeof(bool), typeof(Window),
@@ -288,19 +288,25 @@ namespace HandyControl.Controls
             if (WindowState == WindowState.Maximized)
             {
                 BorderThickness = new Thickness();
+                _tempNonClientAreaHeight = NonClientAreaHeight;
+                NonClientAreaHeight += 8;
             }
             else if (WindowState == WindowState.Normal)
             {
                 BorderThickness = _actualBorderThickness;
+                NonClientAreaHeight = _tempNonClientAreaHeight;
             }
         }
 
         protected void OnLoaded(RoutedEventArgs args)
         {
             _actualBorderThickness = BorderThickness;
+            _tempNonClientAreaHeight = NonClientAreaHeight;
+
             if (WindowState == WindowState.Maximized)
             {
                 BorderThickness = new Thickness();
+                _tempNonClientAreaHeight += 8;
             }
 
             CommandBindings.Add(new CommandBinding(SystemCommands.MinimizeWindowCommand,
@@ -312,7 +318,6 @@ namespace HandyControl.Controls
             CommandBindings.Add(new CommandBinding(SystemCommands.CloseWindowCommand, (s, e) => Close()));
             CommandBindings.Add(new CommandBinding(SystemCommands.ShowSystemMenuCommand, ShowSystemMenu));
 
-            _tempNonClientAreaHeight = NonClientAreaHeight;
             _tempWindowState = WindowState;
             _tempWindowStyle = WindowStyle;
             _tempResizeMode = ResizeMode;
@@ -320,6 +325,11 @@ namespace HandyControl.Controls
             SwitchIsFullScreen(_isFullScreen);
             SwitchShowNonClientArea(_showNonClientArea);
 
+            if (WindowState == WindowState.Maximized)
+            {
+                _tempNonClientAreaHeight -= 8;
+            }
+
             if (SizeToContent != SizeToContent.WidthAndHeight)
                 return;
 

src/Shared/HandyControl_Shared/Data/Enum/ColLayoutStatus.cs

@@ -0,0 +1,12 @@
+namespace HandyControl.Data
+{
+    public enum ColLayoutStatus
+    {
+        Xs,
+        Sm,
+        Md,
+        Lg,
+        Xl,
+        Xxl,
+    }
+}

src/Shared/HandyControl_Shared/Data/Enum/ExpandMode.cs

@@ -0,0 +1,25 @@
+namespace HandyControl.Data
+{
+    public enum ExpandMode
+    {
+        /// <summary>
+        ///     最多只能显示一项，且不可折叠
+        /// </summary>
+        ShowOne,
+
+        /// <summary>
+        ///     显示所有项，且不可折叠
+        /// </summary>
+        ShowAll,
+
+        /// <summary>
+        ///     类似ShowOne，但是控件的尺寸不随项的数量而改变
+        /// </summary>
+        Accordion,
+
+        /// <summary>
+        ///     没有任何限制
+        /// </summary>
+        Freedom
+    }
+}

src/Shared/HandyControl_Shared/Data/Enum/SideMenuItemRole.cs

@@ -0,0 +1,8 @@
+namespace HandyControl.Data
+{
+    public enum SideMenuItemRole
+    {
+        Header,
+        Item
+    }
+}

src/Shared/HandyControl_Shared/Data/Gif/GifImageInfo.cs

@@ -1,5 +1,6 @@
 using System;
 using HandyControl.Controls;
+using HandyControl.Tools;
 
 namespace HandyControl.Data
 {

src/Shared/HandyControl_Shared/Data/HandyControlConfig.cs

@@ -0,0 +1,9 @@
+namespace HandyControl.Data
+{
+    public class HandyControlConfig
+    {
+        public SystemVersionInfo SystemVersionInfo { get; set; }
+
+        public string Lang { get; set; }
+    }
+}