Stylecop fixes.

Cairo/Perspex.Cairo/CairoExtensions.cs

@@ -37,22 +37,34 @@ namespace Perspex.Cairo
         public static Pango.Weight ToCairo(this Perspex.Media.FontWeight weight)
         {
             if (weight == Perspex.Media.FontWeight.Light)
+            {
                 return Pango.Weight.Light;
+            }
 
             if (weight == Perspex.Media.FontWeight.Normal || weight == Perspex.Media.FontWeight.Regular)
+            {
                 return Pango.Weight.Normal;
+            }
 
             if (weight == Perspex.Media.FontWeight.DemiBold || weight == Perspex.Media.FontWeight.Medium)
+            {
                 return Pango.Weight.Semibold;
+            }
 
             if (weight == Perspex.Media.FontWeight.Bold)
+            {
                 return Pango.Weight.Bold;
+            }
 
             if (weight == Perspex.Media.FontWeight.UltraBold || weight == Perspex.Media.FontWeight.ExtraBold)
+            {
                 return Pango.Weight.Ultrabold;
+            }
 
             if (weight == Perspex.Media.FontWeight.Black || weight == Perspex.Media.FontWeight.Heavy || weight == Perspex.Media.FontWeight.UltraBlack)
+            {
                 return Pango.Weight.Heavy;
+            }
 
             return Pango.Weight.Ultralight;
         }
@@ -60,10 +72,14 @@ namespace Perspex.Cairo
         public static Pango.Alignment ToCairo(this Perspex.Media.TextAlignment alignment)
         {
             if (alignment == Perspex.Media.TextAlignment.Left)
+            {
                 return Pango.Alignment.Left;
+            }
 
             if (alignment == Perspex.Media.TextAlignment.Centered)
+            {
                 return Pango.Alignment.Center;
+            }
 
             return Pango.Alignment.Right;
         }

Cairo/Perspex.Cairo/Media/FormattedTextImpl.cs

@@ -46,7 +46,6 @@ namespace Perspex.Cairo.Media
 
             set
             {
-
                 this.Layout.Width = Pango.Units.FromDouble(value.Width);
             }
         }

Cairo/Perspex.Cairo/Media/Imaging/RenderTargetBitmapImpl.cs

@@ -12,7 +12,6 @@ namespace Perspex.Cairo.Media.Imaging
 
     public class RenderTargetBitmapImpl : BitmapImpl, IRenderTargetBitmapImpl
     {
-
         public RenderTargetBitmapImpl(
             Cairo.ImageSurface surface)
             : base(surface)

Cairo/Perspex.Cairo/Renderer.cs

@@ -20,6 +20,8 @@ namespace Perspex.Cairo
     /// </summary>
     public class Renderer : RendererBase
     {
+        private ImageSurface surface;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Renderer"/> class.
         /// </summary>
@@ -30,7 +32,6 @@ namespace Perspex.Cairo
         {
         }
 
-        private ImageSurface surface;
         public Renderer(ImageSurface surface)
         {
             this.surface = surface;

Gtk/Perspex.Gtk/Input/GtkKeyboardDevice.cs

@@ -22,7 +22,7 @@ namespace Perspex.Gtk
         {
         }
 
-        public static GtkKeyboardDevice Instance
+        public static new GtkKeyboardDevice Instance
         {
             get { return instance; }
         }

Gtk/Perspex.Gtk/Input/GtkMouseDevice.cs

@@ -22,7 +22,7 @@ namespace Perspex.Gtk
         {
         }
 
-        public static GtkMouseDevice Instance
+        public static new GtkMouseDevice Instance
         {
             get { return instance; }
         }

Perspex.Base/Collections/IPerspexReadOnlyList.cs

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

Perspex.Base/Collections/PerspexReadOnlyListView.cs

@@ -32,10 +32,9 @@ namespace Perspex.Collections
             }
         }
 
-        public T this[int index]
+        public event NotifyCollectionChangedEventHandler CollectionChanged;
-        {
+
-            get { return this.source[index]; }
+        public event PropertyChangedEventHandler PropertyChanged;
-        }
 
         public int Count
         {
@@ -83,9 +82,10 @@ namespace Perspex.Collections
             }
         }
 
-        public event NotifyCollectionChangedEventHandler CollectionChanged;
+        public T this[int index]
-
+        {
-        public event PropertyChangedEventHandler PropertyChanged;
+            get { return this.source[index]; }
+        }
 
         public void Dispose()
         {
@@ -163,15 +163,9 @@ namespace Perspex.Collections
             }
         }
 
-        public TOut this[int index]
+        public event NotifyCollectionChangedEventHandler CollectionChanged;
-        {
+
-            get
+        public event PropertyChangedEventHandler PropertyChanged;
-            {
-                return (this.convert != null) ?
-                    this.convert(this.source[index]) :
-                    (TOut)(object)this.source[index];
-            }
-        }
 
         public int Count
         {
@@ -219,9 +213,15 @@ namespace Perspex.Collections
             }
         }
 
-        public event NotifyCollectionChangedEventHandler CollectionChanged;
+        public TOut this[int index]
-
+        {
-        public event PropertyChangedEventHandler PropertyChanged;
+            get
+            {
+                return (this.convert != null) ?
+                    this.convert(this.source[index]) :
+                    (TOut)(object)this.source[index];
+            }
+        }
 
         public void Dispose()
         {
@@ -289,5 +289,4 @@ namespace Perspex.Collections
             }
         }
     }
-
 }

Perspex.Base/Collections/PerspexSingleItemList.cs

@@ -1,5 +1,5 @@
 // -----------------------------------------------------------------------
-// <copyright file="PerspexList.cs" company="Steven Kirk">
+// <copyright file="PerspexSingleItemList.cs" company="Steven Kirk">
 // Copyright 2014 MIT Licence. See licence.md for more information.
 // </copyright>
 // -----------------------------------------------------------------------
@@ -36,18 +36,9 @@ namespace Perspex.Collections
             this.item = item;
         }
 
-        public T this[int index]
+        public event NotifyCollectionChangedEventHandler CollectionChanged;
-        {
-            get
-            {
-                if (index < 0 || index >= this.Count)
-                {
-                    throw new ArgumentOutOfRangeException();
-                }
 
-                return item;
+        public event PropertyChangedEventHandler PropertyChanged;
-            }
-        }
 
         public int Count
         {
@@ -96,9 +87,18 @@ namespace Perspex.Collections
             }
         }
 
-        public event NotifyCollectionChangedEventHandler CollectionChanged;
+        public T this[int index]
+        {
+            get
+            {
+                if (index < 0 || index >= this.Count)
+                {
+                    throw new ArgumentOutOfRangeException();
+                }
 
-        public event PropertyChangedEventHandler PropertyChanged;
+                return this.item;
+            }
+        }
 
         public IEnumerator<T> GetEnumerator()
         {

Perspex.Base/PerspexObject.cs

@@ -6,15 +6,15 @@
 
 namespace Perspex
 {
+    using Splat;
     using System;
     using System.Collections.Generic;
     using System.ComponentModel;
     using System.Linq;
+    using System.Reactive.Disposables;
     using System.Reactive.Linq;
     using System.Reflection;
     using Perspex.Diagnostics;
-    using Splat;
-    using System.Reactive.Disposables;
     using Perspex.Reactive;
 
     /// <summary>
@@ -306,25 +306,27 @@ namespace Perspex
         {
             Contract.Requires<NullReferenceException>(property != null);
 
-            return new PerspexObservable<object>(observer =>
+            return new PerspexObservable<object>(
-            {
+                observer =>
-                EventHandler<PerspexPropertyChangedEventArgs> handler = (s, e) =>
                 {
-                    if (e.Property == property)
+                    EventHandler<PerspexPropertyChangedEventArgs> handler = (s, e) =>
                     {
-                        observer.OnNext(e.NewValue);
+                        if (e.Property == property)
-                    }
+                        {
-                };
+                            observer.OnNext(e.NewValue);
+                        }
+                    };
 
-                observer.OnNext(this.GetValue(property));
+                    observer.OnNext(this.GetValue(property));
 
-                this.PropertyChanged += handler;
+                    this.PropertyChanged += handler;
 
-                return Disposable.Create(() =>
+                    return Disposable.Create(() =>
-                {
+                    {
-                    this.PropertyChanged -= handler;
+                        this.PropertyChanged -= handler;
-                });
+                    });
-            }, this.GetObservableDescription(property));
+                }, 
+                this.GetObservableDescription(property));
         }
 
         /// <summary>
@@ -348,23 +350,25 @@ namespace Perspex
         /// <returns></returns>
         public IObservable<Tuple<T, T>> GetObservableWithHistory<T>(PerspexProperty<T> property)
         {
-            return new PerspexObservable<Tuple<T, T>>(observer =>
+            return new PerspexObservable<Tuple<T, T>>(
-            {
+                observer =>
-                EventHandler<PerspexPropertyChangedEventArgs> handler = (s, e) =>
                 {
-                    if (e.Property == property)
+                    EventHandler<PerspexPropertyChangedEventArgs> handler = (s, e) =>
                     {
-                        observer.OnNext(Tuple.Create((T)e.OldValue, (T)e.NewValue));
+                        if (e.Property == property)
-                    }
+                        {
-                };
+                            observer.OnNext(Tuple.Create((T)e.OldValue, (T)e.NewValue));
+                        }
+                    };
 
-                this.PropertyChanged += handler;
+                    this.PropertyChanged += handler;
 
-                return Disposable.Create(() =>
+                    return Disposable.Create(() =>
-                {
+                    {
-                    this.PropertyChanged -= handler;
+                        this.PropertyChanged -= handler;
-                });
+                    });
-            }, this.GetObservableDescription(property));
+                }, 
+                this.GetObservableDescription(property));
         }
 
         /// <summary>

Perspex.Base/PriorityBindingEntry.cs

@@ -1,12 +1,11 @@
 // -----------------------------------------------------------------------
-// <copyright file="PriorityValue.cs" company="Steven Kirk">
+// <copyright file="PriorityBindingEntry.cs" company="Steven Kirk">
-// Copyright 2014 MIT Licence. See licence.md for more information.
+// Copyright 2015 MIT Licence. See licence.md for more information.
 // </copyright>
 // -----------------------------------------------------------------------
 
 namespace Perspex
 {
-    using Perspex.Diagnostics;
     using System;
 
     /// <summary>

Perspex.Base/PriorityLevel.cs

@@ -1,6 +1,6 @@
 // -----------------------------------------------------------------------
-// <copyright file="PriorityValueTests.cs" company="Steven Kirk">
+// <copyright file="PriorityLevel.cs" company="Steven Kirk">
-// Copyright 2013 MIT Licence. See licence.md for more information.
+// Copyright 2015 MIT Licence. See licence.md for more information.
 // </copyright>
 // -----------------------------------------------------------------------
 

Perspex.Base/PriorityValue.cs

@@ -6,12 +6,12 @@
 
 namespace Perspex
 {
-    using Perspex.Diagnostics;
     using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Reactive.Subjects;
     using System.Reflection;
+    using Perspex.Diagnostics;
 
     /// <summary>
     /// Maintains a list of prioritised bindings together with a current value.

Perspex.Base/Reactive/PerspexObservable.cs

@@ -1,6 +1,6 @@
 // -----------------------------------------------------------------------
-// <copyright file="PerspexObject.cs" company="Steven Kirk">
+// <copyright file="PerspexObservable.cs" company="Steven Kirk">
-// Copyright 2014 MIT Licence. See licence.md for more information.
+// Copyright 2015 MIT Licence. See licence.md for more information.
 // </copyright>
 // -----------------------------------------------------------------------
 
@@ -14,8 +14,6 @@ namespace Perspex.Reactive
     {
         private readonly Func<IObserver<T>, IDisposable> subscribe;
 
-        public string Description { get; }
-
         public PerspexObservable(Func<IObserver<T>, IDisposable> subscribe, string description)
         {
             if (subscribe == null)
@@ -27,6 +25,8 @@ namespace Perspex.Reactive
             this.Description = description;
         }
 
+        public string Description { get; }
+
         protected override IDisposable SubscribeCore(IObserver<T> observer)
         {
             return this.subscribe(observer) ?? Disposable.Empty;

Perspex.Base/Threading/PerspexScheduler.cs

@@ -12,20 +12,17 @@ namespace Perspex.Threading
 
     public class PerspexScheduler : LocalScheduler
     {
-        private static readonly PerspexScheduler instance = new PerspexScheduler();
+        public static readonly PerspexScheduler Instance = new PerspexScheduler();
-
-        public static PerspexScheduler Instance
-        {
-            get { return instance; }
-        }
 
         public override IDisposable Schedule<TState>(TState state, TimeSpan dueTime, Func<IScheduler, TState, IDisposable> action)
         {
-            return DispatcherTimer.Run(() => 
+            return DispatcherTimer.Run(
-            {
+                () => 
-                action(this, state);
+                {
-                return false;
+                    action(this, state);
-            }, dueTime);
+                    return false;
+                }, 
+                dueTime);
         }
     }
 }

Perspex.Controls/Control.cs

@@ -192,6 +192,40 @@ namespace Perspex.Controls
             this.RaiseEvent(ev);
         }
 
+        protected static void PseudoClass(PerspexProperty<bool> property, string className)
+        {
+            PseudoClass(property, x => x, className);
+        }
+
+        protected static void PseudoClass<T>(
+            PerspexProperty<T> property,
+            Func<T, bool> selector,
+            string className)
+        {
+            Contract.Requires<ArgumentNullException>(property != null);
+            Contract.Requires<ArgumentNullException>(selector != null);
+            Contract.Requires<ArgumentNullException>(className != null);
+            Contract.Requires<ArgumentNullException>(property != null);
+
+            if (string.IsNullOrWhiteSpace(className))
+            {
+                throw new ArgumentException("Cannot supply an empty className.");
+            }
+
+            Observable.Merge(property.Changed, property.Initialized)
+                .Subscribe(e =>
+                {
+                    if (selector((T)e.NewValue))
+                    {
+                        ((Control)e.Sender).Classes.Add(className);
+                    }
+                    else
+                    {
+                        ((Control)e.Sender).Classes.Remove(className);
+                    }
+                });
+        }
+
         protected override void OnGotFocus(GotFocusEventArgs e)
         {
             base.OnGotFocus(e);
@@ -233,40 +267,6 @@ namespace Perspex.Controls
             }
         }
 
-        protected static void PseudoClass(PerspexProperty<bool> property, string className)
-        {
-            PseudoClass(property, x => x, className);
-        }
-
-        protected static void PseudoClass<T>(
-            PerspexProperty<T> property, 
-            Func<T, bool> selector, 
-            string className)
-        {
-            Contract.Requires<ArgumentNullException>(property != null);
-            Contract.Requires<ArgumentNullException>(selector != null);
-            Contract.Requires<ArgumentNullException>(className != null);
-            Contract.Requires<ArgumentNullException>(property != null);
-
-            if (string.IsNullOrWhiteSpace(className))
-            {
-                throw new ArgumentException("Cannot supply an empty className.");
-            }
-
-            Observable.Merge(property.Changed, property.Initialized)
-                .Subscribe(e =>
-                {
-                    if (selector((T)e.NewValue))
-                    {
-                        ((Control)e.Sender).Classes.Add(className);
-                    }
-                    else
-                    {
-                        ((Control)e.Sender).Classes.Remove(className);
-                    }
-                });
-        }
-
         protected override void OnAttachedToVisualTree(IRenderRoot root)
         {
             base.OnAttachedToVisualTree(root);

Perspex.Controls/Deck.cs

@@ -7,11 +7,11 @@
 namespace Perspex.Controls
 {
     using System.Collections;
+    using Perspex.Animation;
     using Perspex.Controls.Generators;
     using Perspex.Controls.Primitives;
     using Perspex.Controls.Utils;
     using Perspex.Input;
-    using Perspex.Animation;
 
     /// <summary>
     /// A selecting items control that displays a single item that fills the control.

Perspex.Controls/TabControl.cs

@@ -7,15 +7,12 @@
 namespace Perspex.Controls
 {
     using System;
-    using System.Linq;
     using System.Reactive.Linq;
+    using Perspex.Animation;
     using Perspex.Collections;
-    using Perspex.Controls.Generators;
-    using Perspex.Controls.Presenters;
     using Perspex.Controls.Primitives;
     using Perspex.Controls.Templates;
     using Perspex.Input;
-    using Perspex.Animation;
 
     public class TabControl : SelectingItemsControl, ILogical
     {

Perspex.Controls/TreeView.cs

@@ -7,12 +7,12 @@
 namespace Perspex.Controls
 {
     using System;
-    using Perspex.Controls.Generators;
-    using Perspex.Input;
-    using Perspex.VisualTree;
     using System.Collections;
     using System.Collections.Generic;
     using System.Linq;
+    using Perspex.Controls.Generators;
+    using Perspex.Input;
+    using Perspex.VisualTree;
 
     public class TreeView : ItemsControl
     {

Perspex.Input/IKeyboardNavigation.cs

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

Perspex.SceneGraph/Animation/CrossFade.cs

@@ -52,7 +52,6 @@ namespace Perspex.Animation
                     1,
                     LinearEasing.For<double>(),
                     this.Duration).ToTask());
-
             }
 
             await Task.WhenAll(tasks.ToArray());

Perspex.SceneGraph/Animation/PageSlide.cs

@@ -6,12 +6,12 @@
 
 namespace Perspex.Animation
 {
-    using Perspex.Media;
-    using Perspex.VisualTree;
     using System;
     using System.Collections.Generic;
     using System.Reactive.Threading.Tasks;
     using System.Threading.Tasks;
+    using Perspex.Media;
+    using Perspex.VisualTree;
 
     public class PageSlide : IPageTransition
     {

Perspex.SceneGraph/Media/FontStyle.cs

@@ -12,11 +12,4 @@ namespace Perspex.Media
         Oblique,
         Italic,
     }
-
-    public enum TextAlignment
-    {
-        Left,
-        Centered,
-        Right,
-    }
 }

Perspex.SceneGraph/Media/Imaging/RenderTargetBitmap.cs

@@ -6,9 +6,9 @@
 
 namespace Perspex.Media.Imaging
 {
+    using System;
     using Perspex.Platform;
     using Splat;
-    using System;
 
     public class RenderTargetBitmap : Bitmap, IDisposable
     {
@@ -27,15 +27,15 @@ namespace Perspex.Media.Imaging
             this.PlatformImpl.Render(visual);
         }
 
-        private static IBitmapImpl CreateImpl(int width, int height)
+        public void Dispose()
         {
-            IPlatformRenderInterface factory = Locator.Current.GetService<IPlatformRenderInterface>();
+            this.PlatformImpl.Dispose();
-            return factory.CreateRenderTargetBitmap(width, height);
         }
 
-        public void Dispose()
+        private static IBitmapImpl CreateImpl(int width, int height)
         {
-            this.PlatformImpl.Dispose();
+            IPlatformRenderInterface factory = Locator.Current.GetService<IPlatformRenderInterface>();
+            return factory.CreateRenderTargetBitmap(width, height);
         }
     }
 }

Perspex.SceneGraph/Media/TextAlignment.cs

@@ -0,0 +1,15 @@
+// -----------------------------------------------------------------------
+// <copyright file="TextAlignment.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Perspex.Media
+{
+    public enum TextAlignment
+    {
+        Left,
+        Centered,
+        Right,
+    }
+}

Perspex.SceneGraph/Media/TranslateTransform.cs

@@ -1,6 +1,6 @@
 // -----------------------------------------------------------------------
-// <copyright file="MatrixTransform.cs" company="Steven Kirk">
+// <copyright file="TranslateTransform.cs" company="Steven Kirk">
-// Copyright 2013 MIT Licence. See licence.md for more information.
+// Copyright 2015 MIT Licence. See licence.md for more information.
 // </copyright>
 // -----------------------------------------------------------------------
 

Perspex.SceneGraph/Perspex.SceneGraph.csproj

@@ -53,6 +53,7 @@
     <Compile Include="Media\Brushes.cs" />
     <Compile Include="Media\Color.cs" />
     <Compile Include="Media\Colors.cs" />
+    <Compile Include="Media\TextAlignment.cs" />
     <Compile Include="Media\FontWeight.cs" />
     <Compile Include="Media\FontStyle.cs" />
     <Compile Include="Media\FormattedTextLine.cs" />

Perspex.SceneGraph/Platform/IRenderTargetBitmapImpl.cs

@@ -4,10 +4,10 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-using System;
-
 namespace Perspex.Platform
 {
+    using System;
+
     public interface IRenderTargetBitmapImpl : IBitmapImpl, IDisposable
     {
         void Render(IVisual visual);

Windows/Perspex.Win32/Input/WindowsKeyboardDevice.cs

@@ -17,7 +17,7 @@ namespace Perspex.Win32.Input
 
         private byte[] keyStates = new byte[256];
 
-        public static WindowsKeyboardDevice Instance
+        public static new WindowsKeyboardDevice Instance
         {
             get { return instance; }
         }