From 142eaa1c7cdce044fa248de06d165d70c90d21d3 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 27 Oct 2015 16:37:12 +0100
Subject: [PATCH] More work on XAML styles.

- Added "Control[Property=Value]" selector handling
- Added hacks for ExpressionObserver not currently handing attached
properties
- Added ContentControl style
- Fixed ScrollBar and TextBox
---
 .../ContentControl.paml                       |  9 ++++
 samples/XamlTestApplicationPcl/ScrollBar.paml | 14 ++++++-
 .../XamlTestApplicationPcl.csproj             |  3 ++
 .../Parsers/SelectorParser.cs                 | 32 +++++++++++++-
 src/Perspex.Base/Utilities/TypeUtilities.cs   | 15 ++++++-
 src/Perspex.Controls/ContentControl.cs        |  7 ++++
 src/Perspex.Controls/ScrollViewer.cs          | 42 +++++++++++++++++++
 src/Perspex.Controls/TextBox.cs               | 21 ++++++++++
 src/Perspex.Styling/Styling/Selectors.cs      | 18 +++++++-
 9 files changed, 156 insertions(+), 5 deletions(-)
 create mode 100644 samples/XamlTestApplicationPcl/ContentControl.paml

diff --git a/samples/XamlTestApplicationPcl/ContentControl.paml b/samples/XamlTestApplicationPcl/ContentControl.paml
new file mode 100644
index 0000000000..a73a844e83
--- /dev/null
+++ b/samples/XamlTestApplicationPcl/ContentControl.paml
@@ -0,0 +1,9 @@
+<Style xmlns="https://github.com/perspex" Selector="ContentControl">
+  <Setter Property="Template">
+    <ControlTemplate>
+      <Border Background="{TemplateBinding Background}">
+        <ContentPresenter Content="{TemplateBinding Content}" Margin="{TemplateBinding Padding}"/>
+      </Border>
+    </ControlTemplate>
+  </Setter>
+</Style>
\ No newline at end of file
diff --git a/samples/XamlTestApplicationPcl/ScrollBar.paml b/samples/XamlTestApplicationPcl/ScrollBar.paml
index ebd01c1511..de0aa2fd4c 100644
--- a/samples/XamlTestApplicationPcl/ScrollBar.paml
+++ b/samples/XamlTestApplicationPcl/ScrollBar.paml
@@ -8,7 +8,7 @@
                  Value="{TemplateBinding Path=Value, Mode=TwoWay}"
                  ViewportSize="{TemplateBinding ViewportSize}"
                  Orientation="{TemplateBinding Orientation}">
-            <Thumb>
+            <Thumb Name="thumb">
               <Thumb.Template>
                 <ControlTemplate>
                   <Border Background="Gray"/>
@@ -20,4 +20,16 @@
       </ControlTemplate>
     </Setter>
   </Style>
+  <Style Selector="ScrollBar[Orientation=Horizontal]">
+    <Setter Property="Height" Value="10"/>
+  </Style>
+  <Style Selector="ScrollBar[Orientation=Horizontal] /template/ Thumb#thumb">
+    <Setter Property="MinWidth" Value="10"/>
+  </Style>
+  <Style Selector="ScrollBar[Orientation=Vertical]">
+    <Setter Property="Width" Value="10"/>
+  </Style>
+  <Style Selector="ScrollBar[Orientation=Vertical] /template/ Thumb#thumb">
+    <Setter Property="MinHeight" Value="10"/>
+  </Style>
 </Styles>
\ No newline at end of file
diff --git a/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj b/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj
index 1e5335cba5..9849e6cde4 100644
--- a/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj
+++ b/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj
@@ -164,6 +164,9 @@
     <EmbeddedResource Include="TextBox.paml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="ContentControl.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/Markup/Perspex.Markup.Xaml/Parsers/SelectorParser.cs b/src/Markup/Perspex.Markup.Xaml/Parsers/SelectorParser.cs
index 23a0421efb..7938336e9e 100644
--- a/src/Markup/Perspex.Markup.Xaml/Parsers/SelectorParser.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Parsers/SelectorParser.cs
@@ -2,7 +2,9 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
+using System.Globalization;
 using Perspex.Styling;
+using Perspex.Utilities;
 using Sprache;
 
 namespace Perspex.Markup.Xaml.Parsers
@@ -61,7 +63,35 @@ namespace Perspex.Markup.Xaml.Parsers
                 }
                 else if (property != null)
                 {
-                    throw new NotImplementedException();
+                    var type = result.TargetType;
+
+                    if (type == null)
+                    {
+                        throw new InvalidOperationException("Property selectors must be applied to a type.");
+                    }
+
+                    var targetProperty = PerspexPropertyRegistry.Instance.FindRegistered(type, property.Property);
+
+                    if (targetProperty == null)
+                    {
+                        throw new InvalidOperationException($"Cannot find '{property.Property}' on '{type}");
+                    }
+
+                    object typedValue;
+
+                    if (TypeUtilities.TryConvert(
+                            targetProperty.PropertyType, 
+                            property.Value, 
+                            CultureInfo.InvariantCulture,
+                            out typedValue))
+                    {
+                        result = result.PropertyEquals(targetProperty, typedValue);
+                    }
+                    else
+                    {
+                        throw new InvalidOperationException(
+                            $"Could not convert '{property.Value}' to '{targetProperty.PropertyType}");
+                    }
                 }
                 else if (child != null)
                 {
diff --git a/src/Perspex.Base/Utilities/TypeUtilities.cs b/src/Perspex.Base/Utilities/TypeUtilities.cs
index d9186afbb5..a8a5ec4d18 100644
--- a/src/Perspex.Base/Utilities/TypeUtilities.cs
+++ b/src/Perspex.Base/Utilities/TypeUtilities.cs
@@ -91,7 +91,7 @@ namespace Perspex.Utilities
 
         /// <summary>
         /// Try to convert a value to a type, using <see cref="System.Convert"/> if possible,
-        /// otherwise using <see cref="TryCast(Type, object, out object, bool)"/>.
+        /// otherwise using <see cref="TryCast(Type, object, out object)"/>.
         /// </summary>
         /// <param name="to">The type to cast to.</param>
         /// <param name="value">The value to cast.</param>
@@ -100,7 +100,18 @@ namespace Perspex.Utilities
         /// <returns>True if the cast was sucessful, otherwise false.</returns>
         public static bool TryConvert(Type to, object value, CultureInfo culture, out object result)
         {
-            if ((value.GetType() == typeof(string) && Conversions.ContainsKey(to)) ||
+            var valueType = value.GetType();
+
+            if (to.GetTypeInfo().IsEnum && valueType == typeof(string))
+            {
+                if (Enum.IsDefined(to, (string)value))
+                {
+                    result = Enum.Parse(to, (string)value);
+                    return true;
+                }
+            }
+
+            if ((valueType == typeof(string) && Conversions.ContainsKey(to)) ||
                 (to == typeof(string) && Conversions.ContainsKey(value.GetType())))
             {
                 try
diff --git a/src/Perspex.Controls/ContentControl.cs b/src/Perspex.Controls/ContentControl.cs
index f051b31f65..1640853391 100644
--- a/src/Perspex.Controls/ContentControl.cs
+++ b/src/Perspex.Controls/ContentControl.cs
@@ -34,6 +34,13 @@ namespace Perspex.Controls
         public static readonly PerspexProperty<VerticalAlignment> VerticalContentAlignmentProperty =
             PerspexProperty.Register<ContentControl, VerticalAlignment>(nameof(VerticalContentAlignment));
 
+        /// <summary>
+        /// Initializes static members of the <see cref="Button"/> class.
+        /// </summary>
+        static ContentControl()
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ContentControl"/> class.
         /// </summary>
diff --git a/src/Perspex.Controls/ScrollViewer.cs b/src/Perspex.Controls/ScrollViewer.cs
index 4bc46dcb8b..9b73cf73e2 100644
--- a/src/Perspex.Controls/ScrollViewer.cs
+++ b/src/Perspex.Controls/ScrollViewer.cs
@@ -112,12 +112,54 @@ namespace Perspex.Controls
             set { SetValue(CanScrollHorizontallyProperty, value); }
         }
 
+        // HACK: Currently exposed because XAML bindings don't work with attached perspex properties.
+        public double HorizontalScrollBarMaximum
+        {
+            get { return GetValue(HorizontalScrollBarMaximumProperty); }
+            private set { SetValue(HorizontalScrollBarMaximumProperty, value); }
+        }
+
+        // HACK: Currently exposed because XAML bindings don't work with attached perspex properties.
+        public double HorizontalScrollBarValue
+        {
+            get { return GetValue(HorizontalScrollBarValueProperty); }
+            private set { SetValue(HorizontalScrollBarValueProperty, value); }
+        }
+
+        // HACK: Currently exposed because XAML bindings don't work with attached perspex properties.
+        public double HorizontalScrollBarViewportSize
+        {
+            get { return GetValue(HorizontalScrollBarViewportSizeProperty); }
+            set { SetValue(HorizontalScrollBarViewportSizeProperty, value); }
+        }
+
         public ScrollBarVisibility HorizontalScrollBarVisibility
         {
             get { return GetValue(HorizontalScrollBarVisibilityProperty); }
             set { SetValue(HorizontalScrollBarVisibilityProperty, value); }
         }
 
+        // HACK: Currently exposed because XAML bindings don't work with attached perspex properties.
+        public double VerticalScrollBarMaximum
+        {
+            get { return GetValue(VerticalScrollBarMaximumProperty); }
+            private set { SetValue(VerticalScrollBarMaximumProperty, value); }
+        }
+
+        // HACK: Currently exposed because XAML bindings don't work with attached perspex properties.
+        public double VerticalScrollBarValue
+        {
+            get { return GetValue(VerticalScrollBarValueProperty); }
+            private set { SetValue(VerticalScrollBarValueProperty, value); }
+        }
+
+        // HACK: Currently exposed because XAML bindings don't work with attached perspex properties.
+        public double VerticalScrollBarViewportSize
+        {
+            get { return GetValue(VerticalScrollBarViewportSizeProperty); }
+            private set { SetValue(VerticalScrollBarViewportSizeProperty, value); }
+        }
+
         public ScrollBarVisibility VerticalScrollBarVisibility
         {
             get { return GetValue(VerticalScrollBarVisibilityProperty); }
diff --git a/src/Perspex.Controls/TextBox.cs b/src/Perspex.Controls/TextBox.cs
index b7da6d16c3..889c2234cd 100644
--- a/src/Perspex.Controls/TextBox.cs
+++ b/src/Perspex.Controls/TextBox.cs
@@ -127,6 +127,27 @@ namespace Perspex.Controls
             set { SetValue(TextWrappingProperty, value); }
         }
 
+        // HACK: Currently exposed because XAML bindings don't work with attached perspex properties.
+        public bool CanScrollHorizontally
+        {
+            get { return GetValue(ScrollViewer.CanScrollHorizontallyProperty); }
+            set { SetValue(ScrollViewer.CanScrollHorizontallyProperty, value); }
+        }
+
+        // HACK: Currently exposed because XAML bindings don't work with attached perspex properties.
+        public ScrollBarVisibility HorizontalScrollBarVisibility
+        {
+            get { return GetValue(ScrollViewer.HorizontalScrollBarVisibilityProperty); }
+            set { SetValue(ScrollViewer.HorizontalScrollBarVisibilityProperty, value); }
+        }
+
+        // HACK: Currently exposed because XAML bindings don't work with attached perspex properties.
+        public ScrollBarVisibility VerticalScrollBarVisibility
+        {
+            get { return GetValue(ScrollViewer.VerticalScrollBarVisibilityProperty); }
+            set { SetValue(ScrollViewer.VerticalScrollBarVisibilityProperty, value); }
+        }
+
         protected override void OnTemplateApplied()
         {
             _presenter = this.GetTemplateChild<TextPresenter>("PART_TextPresenter");
diff --git a/src/Perspex.Styling/Styling/Selectors.cs b/src/Perspex.Styling/Styling/Selectors.cs
index 3c70ce3002..d291bcd3f9 100644
--- a/src/Perspex.Styling/Styling/Selectors.cs
+++ b/src/Perspex.Styling/Styling/Selectors.cs
@@ -128,6 +128,22 @@ namespace Perspex.Styling
             return new Selector(previous, x => MatchPropertyEquals(x, property, value), $"[{property.Name}={value}]");
         }
 
+        /// <summary>
+        /// Returns a selector which matches a control with the specified property value.
+        /// </summary>
+        /// <typeparam name="T">The property type.</typeparam>
+        /// <param name="previous">The previous selector.</param>
+        /// <param name="property">The property.</param>
+        /// <param name="value">The property value.</param>
+        /// <returns>The selector.</returns>
+        public static Selector PropertyEquals(this Selector previous, PerspexProperty property, object value)
+        {
+            Contract.Requires<ArgumentNullException>(previous != null);
+            Contract.Requires<ArgumentNullException>(property != null);
+
+            return new Selector(previous, x => MatchPropertyEquals(x, property, value), $"[{property.Name}={value}]");
+        }
+
         /// <summary>
         /// Returns a selector which enters a lookless control's template.
         /// </summary>
@@ -216,7 +232,7 @@ namespace Perspex.Styling
             return new SelectorMatch(controlType == type);
         }
 
-        private static SelectorMatch MatchPropertyEquals<T>(IStyleable x, PerspexProperty<T> property, object value)
+        private static SelectorMatch MatchPropertyEquals(IStyleable x, PerspexProperty property, object value)
         {
             if (!x.IsRegistered(property))
             {