From 467bedb6568cfe1bbac3b4e87f223f7a495f47fa Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 7 May 2019 21:59:07 +0800
Subject: [PATCH] release v1.5.5

---
 .../HandyControlDemo_Core30.csproj                       | 2 +-
 .../HandyControl_Core_30/HandyControl_Core_30.csproj     | 4 ++--
 .../HandyControlDemo_Net_40.csproj                       | 3 +++
 .../HandyControl_Net_40/HandyControl_Net_40.csproj       | 3 +++
 .../HandyControlDemo_Net_GE45.csproj                     | 3 +++
 .../HandyControl_Net_GE45/HandyControl_Net_GE45.csproj   | 3 +++
 .../HandyControlDemo_Shared/Properties/AssemblyInfo.cs   | 2 +-
 .../HandyControl_Shared/Controls/Input/NumericUpDown.cs  | 4 ++--
 src/Shared/HandyControl_Shared/Controls/Panel/Col.cs     | 9 +++++++++
 src/Shared/HandyControl_Shared/Controls/Panel/Row.cs     | 9 +++++++++
 .../HandyControl_Shared/HandyControl_Shared.projitems    | 2 ++
 .../HandyControl_Shared/Properties/AssemblyInfo.cs       | 2 +-
 .../Themes/Styles/Base/TabControlBaseStyle.xaml          | 2 +-
 .../HandyControl_Shared/Themes/Styles/TabControl.xaml    | 5 +++--
 14 files changed, 43 insertions(+), 10 deletions(-)
 create mode 100644 src/Shared/HandyControl_Shared/Controls/Panel/Col.cs
 create mode 100644 src/Shared/HandyControl_Shared/Controls/Panel/Row.cs

diff --git a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj
index 2f019719..fdbd815d 100644
--- a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj
+++ b/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'">
diff --git a/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj b/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj
index 0dcfc447..2ac1874c 100644
--- a/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj
+++ b/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>
diff --git a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
index 3324c055..4e282a0d 100644
--- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
+++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
@@ -69,6 +69,9 @@
       <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>
diff --git a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
index ffb31c73..71a3f961 100644
--- a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
+++ b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
@@ -35,6 +35,9 @@
     <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>
diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
index 4e165a1b..18538671 100644
--- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
@@ -96,6 +96,9 @@
       <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>
diff --git a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
index 30d6ea16..c989b1c4 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
@@ -81,6 +81,9 @@
     <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>
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/AssemblyInfo.cs b/src/Shared/HandyControlDemo_Shared/Properties/AssemblyInfo.cs
index 9c72998a..2cbdb17c 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/AssemblyInfo.cs
+++ b/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
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
index 549f88a5..257c6ef3 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
+++ b/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)
         {
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/Col.cs b/src/Shared/HandyControl_Shared/Controls/Panel/Col.cs
new file mode 100644
index 00000000..bb401174
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/Col.cs
@@ -0,0 +1,9 @@
+using System.Windows.Controls;
+
+namespace HandyControl.Controls
+{
+    public class Col : Panel
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/Row.cs b/src/Shared/HandyControl_Shared/Controls/Panel/Row.cs
new file mode 100644
index 00000000..6e2bc0ac
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/Row.cs
@@ -0,0 +1,9 @@
+using System.Windows.Controls;
+
+namespace HandyControl.Controls
+{
+    public class Row : Panel
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index d2ceb0df..a237c220 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -72,6 +72,8 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\Shield.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\TransitioningContentControl.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Panel\CirclePanel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Panel\Col.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Panel\Row.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Panel\SimplePanel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Panel\WaterfallPanel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ProgressBar\CircleProgressBar.cs" />
diff --git a/src/Shared/HandyControl_Shared/Properties/AssemblyInfo.cs b/src/Shared/HandyControl_Shared/Properties/AssemblyInfo.cs
index d7ea892a..b57f5e1a 100644
--- a/src/Shared/HandyControl_Shared/Properties/AssemblyInfo.cs
+++ b/src/Shared/HandyControl_Shared/Properties/AssemblyInfo.cs
@@ -11,5 +11,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.5.4")]
+[assembly: AssemblyVersion("1.5.5")]
 #endif
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TabControlBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TabControlBaseStyle.xaml
index 33628505..ca832f90 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TabControlBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TabControlBaseStyle.xaml
@@ -133,7 +133,7 @@
 
     <Style x:Key="TabItemCapsuleBaseStyle" TargetType="TabItem">
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="Background" Value="{DynamicResource DefaultBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
index cc018ab0..c0442119 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
@@ -206,9 +206,10 @@
         <Setter Property="controls:BorderElement.CornerRadius" Value="0,0,4,4"/>
     </Style>
 
-    <Style x:Key="TabControlCapsule" TargetType="TabControl">
+    <Style x:Key="TabControlCapsule"  TargetType="TabControl">
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="controls:TitleElement.BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
-        <Setter Property="controls:TitleElement.Background" Value="{DynamicResource DefaultBrush}"/>
+        <Setter Property="controls:TitleElement.Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="controls:TitleElement.Foreground" Value="{DynamicResource PrimaryBrush}"/>
         <Setter Property="ItemContainerStyleSelector">
             <Setter.Value>