From 5abf20c1814c3191362dd90e24970077505fbadb Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 27 Oct 2019 22:46:38 +0800
Subject: [PATCH] add Divider

---
 README.md                                     |  8 ++-
 .../UserControl/Controls/DividerDemoCtl.xaml  | 44 +++++++++++---
 .../HandyControl_Shared/Controls/Grid/Col.cs  | 58 +++++++++++--------
 .../HandyControl_Shared/Controls/Grid/Row.cs  |  2 +-
 .../Themes/Styles/Base/DividerBaseStyle.xaml  | 38 ++++++++++--
 5 files changed, 111 insertions(+), 39 deletions(-)

diff --git a/README.md b/README.md
index d15df9f0..8b23f787 100644
--- a/README.md
+++ b/README.md
@@ -65,6 +65,10 @@ Step 4：enjoy coding
 
 ## Latest examples
 
+### Divider
+
+![Divider](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Divider.png)
+
 ### GeometryAnimation
 
 ![GeometryAnimation](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/GeometryAnimation.gif)
@@ -81,6 +85,8 @@ Step 4：enjoy coding
 
 ![HoneycombPanel](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/HoneycombPanel.png)
 
+## History publication
+
 ### RunningBlock
 
 ![RunningBlock](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/RunningBlock.gif)
@@ -91,8 +97,6 @@ Step 4：enjoy coding
 
 ![ImageBlock](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/ImageBlock.png)
 
-## History publication
-
 ### Magnifier
 
 ![Magnifier](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Magnifier.png)
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DividerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DividerDemoCtl.xaml
index 5c273b76..37fb29ea 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DividerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DividerDemoCtl.xaml
@@ -2,14 +2,42 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:hc="https://handyorg.github.io/handycontrol"
-             Background="{DynamicResource RegionBrush}">
+             Background="{DynamicResource RegionBrush}"
+             xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs">
     <hc:TransitioningContentControl>
-        <StackPanel Margin="32" Width="300">
-            <hc:Divider/>
-            <hc:Divider Content="With Text"/>
-            <hc:Divider Content="With Text" Padding="10,0"/>
-            <hc:Divider LineStrokeThickness="2" LineStroke="{DynamicResource DarkPrimaryBrush}"/>
-            <hc:Divider LineStrokeDashArray="2,2"/>
-        </StackPanel>
+        <WrapPanel Margin="16">
+            <StackPanel Margin="16" Width="300">
+                <hc:Divider/>
+                <hc:Divider Content="{x:Static langs:Lang.Title}"/>
+                <hc:Divider Content="{x:Static langs:Lang.Title}" Padding="10,0"/>
+                <hc:Divider LineStrokeThickness="2" LineStroke="{DynamicResource DarkPrimaryBrush}"/>
+                <hc:Divider LineStrokeDashArray="2,2"/>
+            </StackPanel>
+            <StackPanel Margin="16" Width="300">
+                <hc:Divider Content="{x:Static langs:Lang.Title}" HorizontalContentAlignment="Left"/>
+                <hc:Divider Content="{x:Static langs:Lang.Title}" Padding="10,0"  HorizontalContentAlignment="Right"/>
+                <StackPanel Orientation="Horizontal">
+                    <Button Content="{x:Static langs:Lang.Button}"/>
+                    <hc:Divider Orientation="Vertical" MaxHeight="16"/>
+                    <Button Content="{x:Static langs:Lang.Button}"/>
+                    <hc:Divider Orientation="Vertical" MaxHeight="16"/>
+                    <Button Content="{x:Static langs:Lang.Button}"/>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Margin="0,16,0,0">
+                    <Button Content="{x:Static langs:Lang.Button}"/>
+                    <hc:Divider LineStrokeThickness="2" Orientation="Vertical" MaxHeight="16"/>
+                    <Button Content="{x:Static langs:Lang.Button}"/>
+                    <hc:Divider LineStrokeThickness="2" Orientation="Vertical" MaxHeight="16"/>
+                    <Button Content="{x:Static langs:Lang.Button}"/>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Margin="0,16,0,0">
+                    <Button Content="{x:Static langs:Lang.Button}"/>
+                    <hc:Divider LineStrokeThickness="2" LineStroke="{DynamicResource DarkPrimaryBrush}" Orientation="Vertical" MaxHeight="16"/>
+                    <Button Content="{x:Static langs:Lang.Button}"/>
+                    <hc:Divider LineStrokeThickness="2" LineStroke="{DynamicResource DarkPrimaryBrush}" Orientation="Vertical" MaxHeight="16"/>
+                    <Button Content="{x:Static langs:Lang.Button}"/>
+                </StackPanel>
+            </StackPanel>
+        </WrapPanel>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControl_Shared/Controls/Grid/Col.cs b/src/Shared/HandyControl_Shared/Controls/Grid/Col.cs
index 62c8f908..c94cbc43 100644
--- a/src/Shared/HandyControl_Shared/Controls/Grid/Col.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Grid/Col.cs
@@ -41,36 +41,48 @@ namespace HandyControl.Controls
             set => SetValue(SpanProperty, value);
         }
 
+        public static readonly DependencyProperty IsFixedProperty = DependencyProperty.Register(
+            "IsFixed", typeof(bool), typeof(Col), new PropertyMetadata(ValueBoxes.FalseBox));
+
+        public bool IsFixed
+        {
+            get => (bool) GetValue(IsFixedProperty);
+            set => SetValue(IsFixedProperty, value);
+        }
+
         internal int GetLayoutCellCount(ColLayoutStatus status)
         {
             var result = 0;
 
             if (Layout != null)
             {
-                switch (status)
+                if (!IsFixed)
                 {
-                    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;
-                    case ColLayoutStatus.Auto:
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException(nameof(status), status, 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;
+                        case ColLayoutStatus.Auto:
+                            break;
+                        default:
+                            throw new ArgumentOutOfRangeException(nameof(status), status, null);
+                    }
                 }
             }
             else
diff --git a/src/Shared/HandyControl_Shared/Controls/Grid/Row.cs b/src/Shared/HandyControl_Shared/Controls/Grid/Row.cs
index 36670f02..a166b027 100644
--- a/src/Shared/HandyControl_Shared/Controls/Grid/Row.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Grid/Row.cs
@@ -53,7 +53,7 @@ namespace HandyControl.Controls
                     totalRowCount++;
                 }
 
-                if (cellCount == 0)
+                if (cellCount == 0 || child.IsFixed)
                 {
                     _totalAutoWidth += childDesiredSize.Width;
                 }
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/DividerBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/DividerBaseStyle.xaml
index 1156a56d..1a324b26 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/DividerBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/DividerBaseStyle.xaml
@@ -4,24 +4,42 @@
 
     <Style x:Key="DividerBaseStyle" TargetType="controls:Divider">
         <Setter Property="Focusable" Value="False"/>
-        <Setter Property="Margin" Value="0, 24"/>
-        <Setter Property="Padding" Value="24, 0"/>
+        <Setter Property="Margin" Value="0,24"/>
+        <Setter Property="Padding" Value="24,0"/>
         <Setter Property="LineStroke" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:Divider">
                     <controls:Row>
-                        <controls:Col Layout="12">
+                        <controls:Col Layout="12" x:Name="ColStart">
                             <Line VerticalAlignment="Center" StrokeDashArray="{TemplateBinding LineStrokeDashArray}" Stroke="{TemplateBinding LineStroke}" X2="1" StrokeThickness="{TemplateBinding LineStrokeThickness}" Stretch="Fill" StrokeEndLineCap="Square" StrokeStartLineCap="Square"/>
                         </controls:Col>
                         <controls:Col Layout="0">
-                            <ContentPresenter Margin="{TemplateBinding Padding}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                            <ContentPresenter Margin="{TemplateBinding Padding}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
                         </controls:Col>
-                        <controls:Col Layout="12">
+                        <controls:Col Layout="12" x:Name="ColEnd">
                             <Line VerticalAlignment="Center" StrokeDashArray="{TemplateBinding LineStrokeDashArray}" Stroke="{TemplateBinding LineStroke}" X2="1" StrokeThickness="{TemplateBinding LineStrokeThickness}" Stretch="Fill" StrokeEndLineCap="Square" StrokeStartLineCap="Square"/>
                         </controls:Col>
                     </controls:Row>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="Content" Value="{x:Null}">
+                            <Setter Property="Padding" Value="0"/>
+                        </Trigger>
+                        <Trigger Property="HorizontalContentAlignment" Value="Left">
+                            <Setter TargetName="ColStart" Property="Layout" Value="0"/>
+                            <Setter TargetName="ColStart" Property="IsFixed" Value="True"/>
+                            <Setter TargetName="ColStart" Property="Width" Value="20"/>
+                            <Setter TargetName="ColEnd" Property="Layout" Value="24"/>
+                        </Trigger>
+                        <Trigger Property="HorizontalContentAlignment" Value="Right">
+                            <Setter TargetName="ColEnd" Property="Layout" Value="0"/>
+                            <Setter TargetName="ColEnd" Property="IsFixed" Value="True"/>
+                            <Setter TargetName="ColEnd" Property="Width" Value="20"/>
+                            <Setter TargetName="ColStart" Property="Layout" Value="24"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -29,6 +47,16 @@
             <Trigger Property="Content" Value="{x:Null}">
                 <Setter Property="Padding" Value="0"/>
             </Trigger>
+            <Trigger Property="Orientation" Value="Vertical">
+                <Setter Property="Margin" Value="6,0"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="controls:Divider">
+                            <Line HorizontalAlignment="Center" StrokeDashArray="{TemplateBinding LineStrokeDashArray}" Stroke="{TemplateBinding LineStroke}" Y2="1" StrokeThickness="{TemplateBinding LineStrokeThickness}" Stretch="Fill" StrokeEndLineCap="Square" StrokeStartLineCap="Square"/>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
         </Style.Triggers>
     </Style>