Tidied up a bit.

Perspex.UnitTests/Perspex.UnitTests.csproj

@@ -65,6 +65,7 @@
     <Compile Include="PerspexPropertyTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PerspexObjectTests.cs" />
+    <Compile Include="Style.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Perspex\Perspex.csproj">

Perspex.UnitTests/Style.cs

@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Disposables;
+using System.Reactive.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Perspex.Controls;
+
+namespace Perspex
+{
+    public class Style
+    {
+        private bool applied;
+
+        public Style()
+        {
+            this.Setters = new List<Setter>();
+        }
+
+        public Func<Control, Match> Selector
+        {
+            get;
+            set;
+        }
+
+        public IEnumerable<Setter> Setters
+        {
+            get;
+            set;
+        }
+
+        public void Attach(Control control)
+        {
+            Match match = this.Selector(control);
+
+            if (match != null)
+            {
+                List<IObservable<bool>> o = new List<IObservable<bool>>();
+                
+                while (match != null)
+                {
+                    if (match.Observable != null)
+                    {
+                        o.Add(match.Observable);
+                    }
+
+                    match = match.Previous;
+                }
+
+                Observable.CombineLatest(o).Subscribe(x =>
+                {
+                    if (x.All(y => y))
+                    {
+                        this.Apply(control);
+                    }
+                    else if (this.applied)
+                    {
+                        this.Unapply(control);
+                    }
+                });
+            }
+        }
+        
+        private void Apply(Control control)
+        {
+            if (this.Setters != null)
+            {
+                foreach (Setter setter in this.Setters)
+                {
+                    setter.Apply(control);
+                }
+            }
+
+            this.applied = true;
+        }
+
+        private void Unapply(Control control)
+        {
+            if (this.Setters != null)
+            {
+                foreach (Setter setter in this.Setters)
+                {
+                    setter.Unapply(control);
+                }
+
+                this.applied = false;
+            }
+        }
+    }
+}

Perspex.Windows/DrawingContext.cs

@@ -1,5 +1,5 @@
 // -----------------------------------------------------------------------
-// <copyright file="DrawingContextDirect2D1.cs" company="Steven Kirk">
+// <copyright file="DrawingContext.cs" company="Steven Kirk">
 // Copyright 2013 MIT Licence. See licence.md for more information.
 // </copyright>
 // -----------------------------------------------------------------------

Perspex.Windows/Media/TextService.cs

@@ -1,4 +1,10 @@
-namespace Perspex.Windows.Media
+// -----------------------------------------------------------------------
+// <copyright file="TextService.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Perspex.Windows.Media
 {
     using Perspex.Media;
     using SharpDX.DirectWrite;

Perspex.Windows/Window.cs

@@ -1,4 +1,10 @@
-namespace Perspex.Windows
+// -----------------------------------------------------------------------
+// <copyright file="Window.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Perspex.Windows
 {
     using System;
     using System.ComponentModel;
@@ -11,7 +17,7 @@
 
     public class Window : ContentControl, ILayoutRoot
     {
-        public static PerspexProperty<double> FontSizeProperty =
+        public static readonly PerspexProperty<double> FontSizeProperty =
             TextBlock.FontSizeProperty.AddOwner<Window>();
 
         private UnmanagedMethods.WndProc wndProcDelegate;
@@ -34,11 +40,13 @@
 
             this.LayoutManager.LayoutNeeded.Subscribe(x => 
             {
-                Dispatcher.CurrentDispatcher.BeginInvoke(DispatcherPriority.Render, () =>
+                Dispatcher.CurrentDispatcher.BeginInvoke(
-                {
+                    DispatcherPriority.Render, 
-                    this.LayoutManager.ExecuteLayoutPass();
+                    () =>
-                    this.renderer.Render(this);
+                    {
-                });
+                        this.LayoutManager.ExecuteLayoutPass();
+                        this.renderer.Render(this);
+                    });
             });
         }
 
@@ -74,7 +82,7 @@
             Border border = new Border();
             border.Background = new Perspex.Media.SolidColorBrush(0xffffffff);
             ContentPresenter contentPresenter = new ContentPresenter();
-            contentPresenter.Bind(ContentPresenter.ContentProperty, this.GetObservable(ContentProperty));
+            contentPresenter.Bind(ContentPresenter.ContentProperty, this.GetObservable(Window.ContentProperty));
             border.Content = contentPresenter;
             return border;
         }

Perspex/Controls/Border.cs

@@ -1,4 +1,10 @@
-namespace Perspex.Controls
+// -----------------------------------------------------------------------
+// <copyright file="Border.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Perspex.Controls
 {
     using System;
     using System.Reactive.Linq;
@@ -14,10 +20,6 @@
 
             if (background != null)
             {
-                System.Diagnostics.Debug.WriteLine(
-                    string.Format("{0} Draw Background={1}",
-                        this.GetHashCode(),
-                        background));
                 context.FillRectange(background, new Rect(this.Bounds.Size));
             }
 

Perspex/Controls/Button.cs

@@ -13,12 +13,12 @@ namespace Perspex.Controls
         protected override Visual DefaultTemplate()
         {
             Border border = new Border();
-            border.Bind(Border.BackgroundProperty, this.GetObservable(BackgroundProperty));
+            border.Bind(Border.BackgroundProperty, this.GetObservable(Button.BackgroundProperty));
-            border.Bind(Border.BorderBrushProperty, this.GetObservable(BorderBrushProperty));
+            border.Bind(Border.BorderBrushProperty, this.GetObservable(Button.BorderBrushProperty));
-            border.Bind(Border.BorderThicknessProperty, this.GetObservable(BorderThicknessProperty));
+            border.Bind(Border.BorderThicknessProperty, this.GetObservable(Button.BorderThicknessProperty));
             border.Padding = new Thickness(3);
             ContentPresenter contentPresenter = new ContentPresenter();
-            contentPresenter.Bind(ContentPresenter.ContentProperty, this.GetObservable(ContentProperty));
+            contentPresenter.Bind(ContentPresenter.ContentProperty, this.GetObservable(Button.ContentProperty));
             border.Content = contentPresenter;
             return border;
         }

Perspex/Controls/ContentControl.cs

@@ -1,4 +1,10 @@
-namespace Perspex.Controls
+// -----------------------------------------------------------------------
+// <copyright file="ContentControl.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Perspex.Controls
 {
     using System;
     using System.Collections.Generic;

Perspex/Controls/ContentPresenter.cs

@@ -1,4 +1,10 @@
-namespace Perspex.Controls
+// -----------------------------------------------------------------------
+// <copyright file="ContentPresenter.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Perspex.Controls
 {
     using System;
     using System.Collections.Generic;

Perspex/Controls/Control.cs

@@ -1,4 +1,10 @@
-namespace Perspex.Controls
+// -----------------------------------------------------------------------
+// <copyright file="Control.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Perspex.Controls
 {
     using System;
     using System.Collections.Generic;
@@ -26,9 +32,6 @@
 
     public abstract class Control : Visual, ILayoutable
     {
-        internal static readonly PerspexProperty<Control> ParentPropertyRW =
-            PerspexProperty.Register<Control, Control>("Parent");
-
         public static readonly ReadOnlyPerspexProperty<Control> ParentProperty =
             new ReadOnlyPerspexProperty<Control>(ParentPropertyRW);
 
@@ -50,6 +53,9 @@
         public static readonly PerspexProperty<Thickness> MarginProperty =
             PerspexProperty.Register<Control, Thickness>("Margin");
 
+        internal static readonly PerspexProperty<Control> ParentPropertyRW =
+            PerspexProperty.Register<Control, Control>("Parent");
+
         public Control()
         {
             this.Classes = new ObservableCollection<string>();
@@ -174,6 +180,8 @@
 
         private void AttachStyles(Control control)
         {
+            Contract.Requires<ArgumentNullException>(control != null);
+
             if (control.Styles != null)
             {
                 foreach (Style style in control.Styles)
@@ -192,9 +200,11 @@
 
         private void ParentChanged(Tuple<Control, Control> values)
         {
+            Contract.Requires<ArgumentNullException>(values != null);
+
             if (values.Item1 != null)
             {
-                //this.DetatchStyles(values.Item1);
+                ////this.DetatchStyles(values.Item1);
             }
 
             if (values.Item2 != null)

Perspex/Controls/Decorator.cs

@@ -1,4 +1,10 @@
-namespace Perspex.Controls
+// -----------------------------------------------------------------------
+// <copyright file="Decorator.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Perspex.Controls
 {
     using System;
     using System.Collections.Generic;

Perspex/Controls/TemplatedControl.cs

@@ -1,4 +1,10 @@
-namespace Perspex.Controls
+// -----------------------------------------------------------------------
+// <copyright file="TemplatedControl.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Perspex.Controls
 {
     using System;
     using System.Collections.Generic;

Perspex/Controls/TextBlock.cs

@@ -1,12 +1,15 @@
-namespace Perspex.Controls
+// -----------------------------------------------------------------------
+// <copyright file="TextBlock.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Perspex.Controls
 {
     using Perspex.Media;
 
     public class TextBlock : Control
     {
-        public static readonly PerspexProperty<Brush> BackgroundProperty =
-            Border.BackgroundProperty.AddOwner<TextBlock>();
-
         public static readonly PerspexProperty<double> FontSizeProperty =
             PerspexProperty.Register<TextBlock, double>(
                 "FontSize",
@@ -21,12 +24,6 @@
         public static readonly PerspexProperty<string> TextProperty =
             PerspexProperty.Register<Border, string>("Text");
 
-        public Brush Background
-        {
-            get { return this.GetValue(BackgroundProperty); }
-            set { this.SetValue(BackgroundProperty, value); }
-        }
-
         public double FontSize
         {
             get { return this.GetValue(FontSizeProperty); }

Perspex/Layout/LayoutManager.cs

@@ -1,4 +1,10 @@
-namespace Perspex.Layout
+// -----------------------------------------------------------------------
+// <copyright file="LayoutManager.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Perspex.Layout
 {
     using System;
     using System.Collections.Generic;
@@ -24,13 +30,13 @@
 
         public void ExecuteLayoutPass()
         {
-            if (root != null)
+            if (this.root != null)
             {
-                root.Measure(root.ClientSize);
+                this.root.Measure(this.root.ClientSize);
-                root.Arrange(new Rect(root.ClientSize));
+                this.root.Arrange(new Rect(this.root.ClientSize));
             }
 
-            root = null;
+            this.root = null;
         }
 
         public void InvalidateMeasure(ILayoutable item)

Perspex/Match.cs

@@ -1,12 +1,14 @@
-using System;
+// -----------------------------------------------------------------------
-using System.Collections.Generic;
+// <copyright file="Match.cs" company="Steven Kirk">
-using System.Linq;
+// Copyright 2014 MIT Licence. See licence.md for more information.
-using System.Text;
+// </copyright>
-using System.Threading.Tasks;
+// -----------------------------------------------------------------------
-using Perspex.Controls;
 
 namespace Perspex
 {
+    using System;
+    using Perspex.Controls;
+
     public class Match
     {
         public Control Control

Perspex/Media/IDrawingContext.cs

@@ -4,9 +4,10 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-using System;
 namespace Perspex.Media
 {
+    using System;
+
     /// <summary>
     /// Defines the interface through which drawing occurs.
     /// </summary>

Perspex/Media/ITextService.cs

@@ -1,4 +1,10 @@
-namespace Perspex.Media
+// -----------------------------------------------------------------------
+// <copyright file="ITextService.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Perspex.Media
 {
     public interface ITextService
     {

Perspex/PerspexObject.cs

@@ -159,7 +159,6 @@ namespace Perspex
         /// <typeparam name="T">The type of the property.</typeparam>
         /// <param name="target">The target property.</param>
         /// <param name="source">The observable.</param>
-        /// <returns>A disposable binding.</returns>
         public void Bind<T>(PerspexProperty<T> target, IObservable<T> source)
         {
             Contract.Requires<NullReferenceException>(target != null);
@@ -384,6 +383,8 @@ namespace Perspex
         /// </remarks>
         private void ParentPropertyChanged(object sender, PerspexPropertyChangedEventArgs e)
         {
+            Contract.Requires<ArgumentNullException>(e != null);
+
             if (e.Property.Inherits && !this.IsSet(e.Property))
             {
                 this.RaisePropertyChanged(e.Property, e.OldValue, e.NewValue);
@@ -408,7 +409,7 @@ namespace Perspex
             }
         }
 
-        public void SetValueImpl(PerspexProperty property, object value)
+        private void SetValueImpl(PerspexProperty property, object value)
         {
             Contract.Requires<NullReferenceException>(property != null);
 

Perspex/PerspexProperty.cs

@@ -1,4 +1,10 @@
-namespace Perspex
+// -----------------------------------------------------------------------
+// <copyright file="PerspexProperty.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Perspex
 {
     using System;
     using System.Collections.Generic;
@@ -48,22 +54,22 @@
         }
 
         /// <summary>
-        /// The name of the property.
+        /// Gets the name of the property.
         /// </summary>
         public string Name { get; private set; }
 
         /// <summary>
-        /// The type of the property's value.
+        /// Gets the type of the property's value.
         /// </summary>
         public Type ValueType { get; private set; }
 
         /// <summary>
-        /// The type of the class that registers the property.
+        /// Gets the type of the class that registers the property.
         /// </summary>
         public Type OwnerType { get; private set; }
 
         /// <summary>
-        /// Whether the property inherits its value.
+        /// Gets a value indicating whether the property inherits its value.
         /// </summary>
         public bool Inherits { get; private set; }
 

Perspex/Point.cs

@@ -1,4 +1,10 @@
-namespace Perspex
+// -----------------------------------------------------------------------
+// <copyright file="Point.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Perspex
 {
     using System.Globalization;
 
@@ -44,6 +50,11 @@
             get { return this.y; }
         }
 
+        public static Point operator -(Point a, Point b)
+        {
+            return new Point(a.x - b.x, a.y - b.y);
+        }
+
         /// <summary>
         /// Returns the string representation of the point.
         /// </summary>
@@ -52,10 +63,5 @@
         {
             return string.Format(CultureInfo.InvariantCulture, "{0}, {1}", this.x, this.y);
         }
-
-        public static Point operator-(Point a, Point b)
-        {
-            return new Point(a.x - b.x, a.y - b.y);
-        }
     }
 }

Perspex/ReadOnlyPerspexProperty.cs

@@ -1,4 +1,10 @@
-namespace Perspex
+// -----------------------------------------------------------------------
+// <copyright file="ReadOnlyPerspexProperty.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Perspex
 {
     public class ReadOnlyPerspexProperty<T>
     {

Perspex/Rect.cs

@@ -1,4 +1,10 @@
-namespace Perspex
+// -----------------------------------------------------------------------
+// <copyright file="Rect.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Perspex
 {
     using System;
     using System.Globalization;

Perspex/Selectors.cs

@@ -1,4 +1,10 @@
-namespace Perspex
+// -----------------------------------------------------------------------
+// <copyright file="Selectors.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Perspex
 {
     using System;
     using System.Collections.Generic;

Perspex/ServiceLocator.cs

@@ -1,11 +1,14 @@
-using System;
+// -----------------------------------------------------------------------
-using System.Collections.Generic;
+// <copyright file="ServiceLocator.cs" company="Steven Kirk">
-using System.Linq;
+// Copyright 2014 MIT Licence. See licence.md for more information.
-using System.Text;
+// </copyright>
-using System.Threading.Tasks;
+// -----------------------------------------------------------------------
 
 namespace Perspex
 {
+    using System;
+    using System.Collections.Generic;
+
     public static class ServiceLocator
     {
         private static Dictionary<Type, Func<object>> services =

Perspex/Setter.cs

@@ -1,4 +1,10 @@
-namespace Perspex
+// -----------------------------------------------------------------------
+// <copyright file="Setter.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Perspex
 {
     using System;
     using System.Diagnostics.Contracts;
@@ -26,13 +32,6 @@
 
             this.oldValue = control.GetValue(this.Property);
             control.SetValue(this.Property, this.Value);
-
-            System.Diagnostics.Debug.WriteLine(
-                string.Format("{0} Style Set {1}.{2}={3}",
-                control.GetHashCode(),
-                control.GetType().Name,
-                this.Property.Name,
-                this.Value));
         }
 
         public void Unapply(Control control)
@@ -40,13 +39,6 @@
             Contract.Requires<NullReferenceException>(control != null);
 
             control.SetValue(this.Property, this.oldValue);
-            
-            System.Diagnostics.Debug.WriteLine(
-                string.Format("{0} Style Unset {1}.{2}={3}",
-                control.GetHashCode(),
-                control.GetType().Name,
-                this.Property.Name,
-                oldValue));
         }
     }
 }

Perspex/Size.cs

@@ -1,4 +1,10 @@
-namespace Perspex
+// -----------------------------------------------------------------------
+// <copyright file="Size.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Perspex
 {
     using System;
     using System.Globalization;

Perspex/Style.cs

@@ -1,14 +1,17 @@
-using System;
+// -----------------------------------------------------------------------
-using System.Collections.Generic;
+// <copyright file="Style.cs" company="Tricycle">
-using System.Linq;
+// Copyright 2014 Tricycle. All rights reserved.
-using System.Reactive.Disposables;
+// </copyright>
-using System.Reactive.Linq;
+// -----------------------------------------------------------------------
-using System.Text;
-using System.Threading.Tasks;
-using Perspex.Controls;
 
 namespace Perspex
 {
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Reactive.Linq;
+    using Perspex.Controls;
+
     public class Style
     {
         private bool applied;

Perspex/Thickness.cs

@@ -1,4 +1,10 @@
-namespace Perspex
+// -----------------------------------------------------------------------
+// <copyright file="Thickness.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Perspex
 {
     using System;
     using System.Diagnostics.Contracts;

Perspex/Visual.cs

@@ -1,4 +1,10 @@
-namespace Perspex
+// -----------------------------------------------------------------------
+// <copyright file="Visual.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Perspex
 {
     using System;
     using System.Collections.Generic;
@@ -11,12 +17,12 @@
         public static readonly ReadOnlyPerspexProperty<Rect> BoundsProperty =
             new ReadOnlyPerspexProperty<Rect>(BoundsPropertyRW);
 
-        private static readonly PerspexProperty<Rect> BoundsPropertyRW =
-            PerspexProperty.Register<Visual, Rect>("Bounds");
-
         public static readonly PerspexProperty<bool> IsMouseOverProperty =
             PerspexProperty.Register<Visual, bool>("IsMouseOver");
 
+        private static readonly PerspexProperty<Rect> BoundsPropertyRW =
+            PerspexProperty.Register<Visual, Rect>("Bounds");
+
         private Visual visualParent;
 
         public Rect Bounds