From 187d14c018fa0d730a0e65c665b4307f0357bda1 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 24 Oct 2015 02:57:24 +0200
Subject: [PATCH] Added ScrollViewer XAML style.

ScrollBar not yet working.
---
 samples/XamlTestApplicationPcl/ScrollBar.paml | 23 ++++++++++++++++
 .../XamlTestApplicationPcl/ScrollViewer.paml  | 27 +++++++++++++++++++
 .../XamlTestApplicationPcl/XamlTestApp.paml   |  2 ++
 .../XamlTestApplicationPcl.csproj             |  6 +++++
 src/Perspex.Controls/Primitives/Track.cs      |  2 ++
 5 files changed, 60 insertions(+)
 create mode 100644 samples/XamlTestApplicationPcl/ScrollBar.paml
 create mode 100644 samples/XamlTestApplicationPcl/ScrollViewer.paml

diff --git a/samples/XamlTestApplicationPcl/ScrollBar.paml b/samples/XamlTestApplicationPcl/ScrollBar.paml
new file mode 100644
index 0000000000..d6a4e3f38b
--- /dev/null
+++ b/samples/XamlTestApplicationPcl/ScrollBar.paml
@@ -0,0 +1,23 @@
+<Styles xmlns="https://github.com/perspex">
+  <Style Selector="ScrollBar">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="Silver">
+          <Track Minimum="{TemplateBinding Minimum}"
+                 Maximum="{TemplateBinding Maximum}"
+                 Value="{TemplateBinding Path=Value, Mode=TwoWay}"
+                 ViewportSize="{TemplateBinding ViewportSize}"
+                 Orientation="{TemplateBinding Orientation}">
+            <Thumb Width="10" Height="10">
+              <Thumb.Template>
+                <ControlTemplate>
+                  <Border Background="Gray"/>
+                </ControlTemplate>
+              </Thumb.Template>
+            </Thumb>
+          </Track>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+</Styles>
\ No newline at end of file
diff --git a/samples/XamlTestApplicationPcl/ScrollViewer.paml b/samples/XamlTestApplicationPcl/ScrollViewer.paml
new file mode 100644
index 0000000000..c12ba0fa30
--- /dev/null
+++ b/samples/XamlTestApplicationPcl/ScrollViewer.paml
@@ -0,0 +1,27 @@
+<Style xmlns="https://github.com/perspex" Selector="ScrollViewer">
+  <Setter Property="Template">
+    <ControlTemplate>
+      <Grid ColumnDefinitions="*,Auto" RowDefinitions="*,Auto">
+        <ScrollContentPresenter Content="{TemplateBinding Content}"
+                                Extent="{TemplateBinding Path=Extent, Mode=TwoWay}"
+                                Offset="{TemplateBinding Path=Offset, Mode=TwoWay}"
+                                Viewport="{TemplateBinding Path=Viewport, Mode=TwoWay}"
+                                CanScrollHorizontally="{TemplateBinding CanScrollHorizontally}"/>
+        <ScrollBar Name="horizontalScrollBar"
+                   Orientation="Horizontal"
+                   Maximum="{TemplateBinding HorizontalScrollBarMaximum}"
+                   Value="{TemplateBinding Path=HorizontalScrollBarValue, Mode=TwoWay}"
+                   ViewportSize="{TemplateBinding HorizontalScrollBarViewportSize}"
+                   Visibility="{TemplateBinding HorizontalScrollBarVisibility}"
+                   Grid.Row="1"/>
+        <ScrollBar Name="verticalScrollBar"
+                   Orientation="Vertical"
+                   Maximum="{TemplateBinding VerticalScrollBarMaximum}"
+                   Value="{TemplateBinding Path=VerticalScrollBarValue, Mode=TwoWay}"
+                   ViewportSize="{TemplateBinding VerticalScrollBarViewportSize}"
+                   Visibility="{TemplateBinding VerticalScrollBarVisibility}"
+                   Grid.Column="1"/>
+      </Grid>
+    </ControlTemplate>
+  </Setter>
+</Style>
\ No newline at end of file
diff --git a/samples/XamlTestApplicationPcl/XamlTestApp.paml b/samples/XamlTestApplicationPcl/XamlTestApp.paml
index f47d7dd482..38398334a7 100644
--- a/samples/XamlTestApplicationPcl/XamlTestApp.paml
+++ b/samples/XamlTestApplicationPcl/XamlTestApp.paml
@@ -5,6 +5,8 @@
     <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.Button.paml"/>
     <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.Carousel.paml"/>
     <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.CheckBox.paml"/>
+    <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.ScrollBar.paml"/>
+    <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.ScrollViewer.paml"/>
     <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.TabControl.paml"/>
     <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.TabItem.paml"/>
     <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.TabStrip.paml"/>
diff --git a/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj b/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj
index 4c39faac88..ae3acc3a73 100644
--- a/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj
+++ b/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj
@@ -135,6 +135,12 @@
     <EmbeddedResource Include="TabStrip.paml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="ScrollViewer.paml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ScrollBar.paml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <None Include="packages.config" />
     <EmbeddedResource Include="Button.paml">
       <SubType>Designer</SubType>
diff --git a/src/Perspex.Controls/Primitives/Track.cs b/src/Perspex.Controls/Primitives/Track.cs
index e01816fddc..ae9a8d1c4a 100644
--- a/src/Perspex.Controls/Primitives/Track.cs
+++ b/src/Perspex.Controls/Primitives/Track.cs
@@ -4,6 +4,7 @@
 using System;
 using Perspex.Input;
 using Perspex.Interactivity;
+using Perspex.Metadata;
 
 namespace Perspex.Controls.Primitives
 {
@@ -84,6 +85,7 @@ namespace Perspex.Controls.Primitives
             set { SetValue(OrientationProperty, value); }
         }
 
+        [Content]
         public Thumb Thumb
         {
             get { return GetValue(ThumbProperty); }