From cfdad18462c98bea3ac62bf411ec58a3063cd8de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= <wieslaw.soltes@gmail.com>
Date: Mon, 9 Nov 2015 22:43:18 +0100
Subject: [PATCH 1/5] Added Separator control

---
 src/Perspex.Controls/Perspex.Controls.csproj |  1 +
 src/Perspex.Controls/Separator.cs            | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 src/Perspex.Controls/Separator.cs

diff --git a/src/Perspex.Controls/Perspex.Controls.csproj b/src/Perspex.Controls/Perspex.Controls.csproj
index 9fb34fb553..c8b066abd2 100644
--- a/src/Perspex.Controls/Perspex.Controls.csproj
+++ b/src/Perspex.Controls/Perspex.Controls.csproj
@@ -45,6 +45,7 @@
     <Compile Include="HotkeyManager.cs" />
     <Compile Include="Platform\ITopLevelRenderer.cs" />
     <Compile Include="SelectionMode.cs" />
+    <Compile Include="Separator.cs" />
     <Compile Include="SystemDialog.cs" />
     <Compile Include="Generators\ITreeItemContainerGenerator.cs" />
     <Compile Include="Generators\ItemContainers.cs" />
diff --git a/src/Perspex.Controls/Separator.cs b/src/Perspex.Controls/Separator.cs
new file mode 100644
index 0000000000..a75be02b26
--- /dev/null
+++ b/src/Perspex.Controls/Separator.cs
@@ -0,0 +1,19 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Perspex.Controls.Primitives;
+
+namespace Perspex.Controls
+{
+    /// <summary>
+    /// A separator control.
+    /// </summary>
+    public class Separator : TemplatedControl
+    {
+    }
+}

From ca598e15d2bebb2c620af1c619ed623b496a87ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= <wieslaw.soltes@gmail.com>
Date: Mon, 9 Nov 2015 22:43:44 +0100
Subject: [PATCH 2/5] Added Separator style to default theme

---
 src/Perspex.Themes.Default/DefaultTheme.paml             | 1 +
 src/Perspex.Themes.Default/Perspex.Themes.Default.csproj | 3 +++
 src/Perspex.Themes.Default/Separator.paml                | 7 +++++++
 3 files changed, 11 insertions(+)
 create mode 100644 src/Perspex.Themes.Default/Separator.paml

diff --git a/src/Perspex.Themes.Default/DefaultTheme.paml b/src/Perspex.Themes.Default/DefaultTheme.paml
index ca8147b6e8..534dad5a07 100644
--- a/src/Perspex.Themes.Default/DefaultTheme.paml
+++ b/src/Perspex.Themes.Default/DefaultTheme.paml
@@ -15,6 +15,7 @@
   <StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.PopupRoot.paml"/>
   <StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.ProgressBar.paml"/>
   <StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.RadioButton.paml"/>
+  <StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.Separator.paml"/>
   <StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.ScrollBar.paml"/>
   <StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.ScrollViewer.paml"/>
   <StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.TabControl.paml"/>
diff --git a/src/Perspex.Themes.Default/Perspex.Themes.Default.csproj b/src/Perspex.Themes.Default/Perspex.Themes.Default.csproj
index c17244d8ec..cd60cda586 100644
--- a/src/Perspex.Themes.Default/Perspex.Themes.Default.csproj
+++ b/src/Perspex.Themes.Default/Perspex.Themes.Default.csproj
@@ -180,6 +180,9 @@
     <EmbeddedResource Include="DefaultTheme.paml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Separator.paml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Perspex.Themes.Default/Separator.paml b/src/Perspex.Themes.Default/Separator.paml
new file mode 100644
index 0000000000..7e8b4ecc31
--- /dev/null
+++ b/src/Perspex.Themes.Default/Separator.paml
@@ -0,0 +1,7 @@
+<Style xmlns="https://github.com/perspex" Selector="Separator">
+    <Setter Property="Template">
+        <ControlTemplate>
+            <Rectangle Fill="#ffd7d7d7" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsHitTestVisible="False" Height="1" Margin="29,1,0,1"/>
+        </ControlTemplate>
+    </Setter>
+</Style>
\ No newline at end of file

From f39857c7cd55626b52518aa49e664857efa21b8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= <wieslaw.soltes@gmail.com>
Date: Mon, 9 Nov 2015 22:44:09 +0100
Subject: [PATCH 3/5] Added Separator to test application

---
 samples/XamlTestApplicationPcl/Views/MainWindow.paml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/samples/XamlTestApplicationPcl/Views/MainWindow.paml b/samples/XamlTestApplicationPcl/Views/MainWindow.paml
index 64723719fc..576e609610 100644
--- a/samples/XamlTestApplicationPcl/Views/MainWindow.paml
+++ b/samples/XamlTestApplicationPcl/Views/MainWindow.paml
@@ -8,7 +8,12 @@
         <MenuItem Header="_File">
           <MenuItem Header="_Hello">
             <MenuItem Header="_Goodbye"/>
+            <Separator/>
+            <MenuItem Header="_World"/>
           </MenuItem>
+          <Separator/>
+          <MenuItem Header="_Test"/>
+          <Separator/>
           <MenuItem Header="_World"/>
         </MenuItem>
       </Menu>

From db7cee6891b4dd55f391e4050315a7aa4730075e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= <wieslaw.soltes@gmail.com>
Date: Mon, 9 Nov 2015 23:43:55 +0100
Subject: [PATCH 4/5] Added MenuItem selector for Separator

---
 src/Perspex.Themes.Default/Separator.paml | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/Perspex.Themes.Default/Separator.paml b/src/Perspex.Themes.Default/Separator.paml
index 7e8b4ecc31..1d72be8e94 100644
--- a/src/Perspex.Themes.Default/Separator.paml
+++ b/src/Perspex.Themes.Default/Separator.paml
@@ -1,7 +1,17 @@
-<Style xmlns="https://github.com/perspex" Selector="Separator">
+<Styles xmlns="https://github.com/perspex">
+
+  <Style Selector="Separator">
     <Setter Property="Template">
-        <ControlTemplate>
-            <Rectangle Fill="#ffd7d7d7" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsHitTestVisible="False" Height="1" Margin="29,1,0,1"/>
-        </ControlTemplate>
+      <ControlTemplate>
+        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"/>
+      </ControlTemplate>
     </Setter>
-</Style>
\ No newline at end of file
+  </Style>
+
+  <Style Selector="MenuItem > Separator">
+    <Setter Property="Background" Value="#ffd7d7d7"/>
+    <Setter Property="Margin" Value="29,1,0,1"/>
+    <Setter Property="Height" Value="1"/>
+  </Style>
+
+</Styles>
\ No newline at end of file

From b8ec9e3d9d49565a62048b460c57d233764297db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= <wieslaw.soltes@gmail.com>
Date: Mon, 9 Nov 2015 23:44:27 +0100
Subject: [PATCH 5/5] Updated test application to use new template

---
 samples/XamlTestApplicationPcl/Views/MainWindow.paml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/XamlTestApplicationPcl/Views/MainWindow.paml b/samples/XamlTestApplicationPcl/Views/MainWindow.paml
index 576e609610..c7680382d4 100644
--- a/samples/XamlTestApplicationPcl/Views/MainWindow.paml
+++ b/samples/XamlTestApplicationPcl/Views/MainWindow.paml
@@ -11,7 +11,7 @@
             <Separator/>
             <MenuItem Header="_World"/>
           </MenuItem>
-          <Separator/>
+          <Separator Background="Red"/>
           <MenuItem Header="_Test"/>
           <Separator/>
           <MenuItem Header="_World"/>