From 0ab014f81dc1aa897a1f7a0ee66ce6bd29c57b47 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 15 Jan 2020 22:25:07 +0800
Subject: [PATCH 1/2] add some styles

add Separator and StatusBar style
---
 .../HandyControl_Shared.projitems                | 16 ++++++++++++++++
 .../Themes/Styles/Base/SeparatorBaseStyle.xaml   |  8 ++++++++
 .../Themes/Styles/Base/StatusBarBaseStyle.xaml   | 16 ++++++++++++++++
 .../Themes/Styles/Separator.xaml                 |  9 +++++++++
 .../Themes/Styles/StatusBar.xaml                 |  9 +++++++++
 .../HandyControl_Shared/Themes/Styles/Style.xaml |  2 ++
 6 files changed, 60 insertions(+)
 create mode 100644 src/Shared/HandyControl_Shared/Themes/Styles/Base/SeparatorBaseStyle.xaml
 create mode 100644 src/Shared/HandyControl_Shared/Themes/Styles/Base/StatusBarBaseStyle.xaml
 create mode 100644 src/Shared/HandyControl_Shared/Themes/Styles/Separator.xaml
 create mode 100644 src/Shared/HandyControl_Shared/Themes/Styles/StatusBar.xaml

diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index 32cab771..95008f3d 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -394,6 +394,22 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\StatusBar.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\Separator.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\Base\SeparatorBaseStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\Base\StatusBarBaseStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\PinBox.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/SeparatorBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/SeparatorBaseStyle.xaml
new file mode 100644
index 00000000..2b9f91b0
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/SeparatorBaseStyle.xaml
@@ -0,0 +1,8 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="SeparatorBaseStyle" TargetType="Separator">
+        <Setter Property="Background" Value="{DynamicResource BorderBrush}"/>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/StatusBarBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/StatusBarBaseStyle.xaml
new file mode 100644
index 00000000..1da267ba
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/StatusBarBaseStyle.xaml
@@ -0,0 +1,16 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="SeparatorBaseStyle.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style x:Key="{x:Static StatusBar.SeparatorStyleKey}" BasedOn="{StaticResource SeparatorBaseStyle}" TargetType="Separator"/>
+
+    <Style x:Key="StatusBarBaseStyle" TargetType="StatusBar">
+        <Setter Property="BorderThickness" Value="0,1,0,0"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Separator.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Separator.xaml
new file mode 100644
index 00000000..f50f2ab3
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Separator.xaml
@@ -0,0 +1,9 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Base/SeparatorBaseStyle.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style BasedOn="{StaticResource SeparatorBaseStyle}" TargetType="Separator"/>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/StatusBar.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/StatusBar.xaml
new file mode 100644
index 00000000..9f2a27b3
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/StatusBar.xaml
@@ -0,0 +1,9 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Base/StatusBarBaseStyle.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style BasedOn="{StaticResource StatusBarBaseStyle}" TargetType="StatusBar"/>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml
index 308b65d4..063d9132 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml
@@ -79,6 +79,8 @@
         <ResourceDictionary Source="Poptip.xaml"/>
         <ResourceDictionary Source="Drawer.xaml"/>
         <ResourceDictionary Source="PinBox.xaml"/>
+        <ResourceDictionary Source="Separator.xaml"/>
+        <ResourceDictionary Source="StatusBar.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>
\ No newline at end of file

From 8a6fc358738dfbc58a2195171d2ca2213912ecf8 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 15 Jan 2020 22:32:14 +0800
Subject: [PATCH 2/2] Update TransitioningContentControl.xaml

---
 .../Themes/Styles/TransitioningContentControl.xaml         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/TransitioningContentControl.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/TransitioningContentControl.xaml
index 8d7d7d4a..b9b21f96 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/TransitioningContentControl.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/TransitioningContentControl.xaml
@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:HandyControl.Controls">
 
     <Storyboard x:Key="Right2LeftTransition" x:Shared="False">
         <DoubleAnimation From="50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
@@ -73,4 +74,8 @@
         <DoubleAnimation From="0" To="1" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.Opacity)"/>
     </Storyboard>
 
+    <Style TargetType="controls:TransitioningContentControl">
+        <Setter Property="Focusable" Value="False"/>
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file