Stylecop fixes.

Also added solution-wide stylecop settings.

Perspex.Application/Application.cs

@@ -76,6 +76,13 @@ public Styles Styles
             private set;
         }
 
+        public void Run(ICloseable closable)
+        {
+            var source = new CancellationTokenSource();
+            closable.Closed += (s, e) => source.Cancel();
+            Dispatcher.UIThread.MainLoop(source.Token);
+        }
+
         protected virtual void RegisterServices()
         {
             Locator.CurrentMutable.Register(() => this, typeof(IGlobalDataTemplates));
@@ -84,12 +91,5 @@ protected virtual void RegisterServices()
             Locator.CurrentMutable.Register(() => this.InputManager, typeof(IInputManager));
             Locator.CurrentMutable.Register(() => this.styler, typeof(IStyler));
         }
-
-        public void Run(ICloseable closable)
-        {
-            var source = new CancellationTokenSource();
-            closable.Closed += (s, e) => source.Cancel();
-            Dispatcher.UIThread.MainLoop(source.Token);
-        }
     }
 }

Perspex.Application/Properties/AssemblyInfo.cs

@@ -1,7 +1,11 @@
-using System.Resources;
+// -----------------------------------------------------------------------
+// <copyright file="AssemblyInfo.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
 using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
+using System.Resources;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information

Perspex.Base/Settings.StyleCop

@@ -0,0 +1 @@
+<StyleCopSettings Version="105" />

Perspex.Controls/Border.cs

@@ -15,8 +15,8 @@ public class Border : Decorator
     {
         static Border()
         {
-            AffectsRender(BackgroundProperty);
-            AffectsRender(BorderBrushProperty);
+            Control.AffectsRender(Border.BackgroundProperty);
+            Control.AffectsRender(Border.BorderBrushProperty);
         }
 
         public override void Render(IDrawingContext context)

Perspex.Controls/Control.cs

@@ -43,9 +43,9 @@ public class Control : InputElement, IStyleable, IStyleHost
 
         static Control()
         {
-            AffectsMeasure(IsVisibleProperty);
-            PseudoClass(IsPointerOverProperty, ":pointerover");
-            PseudoClass(IsFocusedProperty, ":focus");
+            Control.AffectsMeasure(Control.IsVisibleProperty);
+            PseudoClass(Control.IsPointerOverProperty, ":pointerover");
+            PseudoClass(Control.IsFocusedProperty, ":focus");
         }
 
         public Brush Background

Perspex.Controls/Controls.cs

@@ -4,10 +4,10 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-using System.Collections.Generic;
-
 namespace Perspex.Controls
 {
+    using System.Collections.Generic;
+
     public class Controls : PerspexList<Control>
     {
         public Controls()

Perspex.Controls/DataTemplate.cs

@@ -33,25 +33,25 @@ public DataTemplate(Func<object, bool> match, Func<object, Control> build)
             this.Build = build;
         }
 
+        public Func<object, bool> Match { get; private set; }
+
+        public Func<object, Control> Build { get; private set; }
+
         public static bool IsInstance(object o, Type t)
         {
             return t.GetTypeInfo().IsAssignableFrom(o.GetType().GetTypeInfo());
         }
-
-        public Func<object, bool> Match { get; private set; }
-
-        public Func<object, Control> Build { get; private set; }
     }
 
     public class DataTemplate<T> : DataTemplate
     {
         public DataTemplate(Func<T, Control> build)
-            : base(typeof(T), Cast(build))
+            : base(typeof(T), DataTemplate<T>.Cast(build))
         {
         }
 
         public DataTemplate(Func<T, bool> match, Func<T, Control> build)
-            : base(CastMatch(match), Cast(build))
+            : base(CastMatch(match), DataTemplate<T>.Cast(build))
         {
         }
 

Perspex.Controls/Grid.cs

@@ -605,10 +605,10 @@ private void AssignSize(
             // we need to count the number of stars instead.
             for (int i = start; i <= end; i++) 
             {
-				double segmentSize = desiredSize ? (matrix[i, i].DesiredSize) : matrix[i, i].OfferedSize;
+                double segmentSize = desiredSize ? (matrix[i, i].DesiredSize) : matrix[i, i].OfferedSize;
                 if (segmentSize < matrix[i, i].Max)
                 {
-					count += type == GridUnitType.Star ? (matrix[i, i].Stars) : 1;
+                    count += type == GridUnitType.Star ? (matrix[i, i].Stars) : 1;
                 }
             }
 
@@ -620,15 +620,15 @@ private void AssignSize(
 
                 for (int i = start; i <= end; i++) 
                 {
-					double segmentSize = desiredSize ? (matrix[i, i].DesiredSize) : matrix[i, i].OfferedSize;
+                    double segmentSize = desiredSize ? (matrix[i, i].DesiredSize) : matrix[i, i].OfferedSize;
 
                     if (!(matrix[i, i].Type == type && segmentSize < matrix[i, i].Max))
                     {
                         continue;
                     }
 
                     double newsize = segmentSize;
-					newsize += contribution * (type == GridUnitType.Star ? (matrix[i, i].Stars) : 1);
+                    newsize += contribution * (type == GridUnitType.Star ? (matrix[i, i].Stars) : 1);
                     newsize = Math.Min(newsize, matrix[i, i].Max);
                     assigned |= newsize > segmentSize;
                     size -= newsize - segmentSize;

Perspex.Controls/GridSplitter.cs

@@ -18,10 +18,10 @@ protected override void OnDragDelta(VectorEventArgs e)
         {
             int col = this.GetValue(Grid.ColumnProperty);
 
-            if (grid != null && col > 0)
+            if (this.grid != null && col > 0)
             {
-                grid.ColumnDefinitions[col - 1].Width = new GridLength(
-                    grid.ColumnDefinitions[col - 1].ActualWidth + e.Vector.X,
+                this.grid.ColumnDefinitions[col - 1].Width = new GridLength(
+                    this.grid.ColumnDefinitions[col - 1].ActualWidth + e.Vector.X,
                     GridUnitType.Pixel);
             }
         }

Perspex.Controls/Image.cs

@@ -56,30 +56,6 @@ public override void Render(IDrawingContext drawingContext)
             }
         }
 
-        private static Vector CalculateScaling(Size availableSize, Size imageSize, Stretch stretch)
-        {
-            double scaleX = 1;
-            double scaleY = 1;
-
-            if (stretch != Stretch.None)
-            {
-                scaleX = availableSize.Width / imageSize.Width;
-                scaleY = availableSize.Height / imageSize.Height;
-
-                switch (stretch)
-                {
-                    case Stretch.Uniform:
-                        scaleX = scaleY = Math.Min(scaleX, scaleY);
-                        break;
-                    case Stretch.UniformToFill:
-                        scaleX = scaleY = Math.Max(scaleX, scaleY);
-                        break;
-                }
-            }
-
-            return new Vector(scaleX, scaleY);
-        }
-
         protected override Size MeasureOverride(Size availableSize)
         {
             double width = 0;
@@ -111,5 +87,29 @@ protected override Size ArrangeOverride(Size finalSize)
         {
             return finalSize;
         }
+
+        private static Vector CalculateScaling(Size availableSize, Size imageSize, Stretch stretch)
+        {
+            double scaleX = 1;
+            double scaleY = 1;
+
+            if (stretch != Stretch.None)
+            {
+                scaleX = availableSize.Width / imageSize.Width;
+                scaleY = availableSize.Height / imageSize.Height;
+
+                switch (stretch)
+                {
+                    case Stretch.Uniform:
+                        scaleX = scaleY = Math.Min(scaleX, scaleY);
+                        break;
+                    case Stretch.UniformToFill:
+                        scaleX = scaleY = Math.Max(scaleX, scaleY);
+                        break;
+                }
+            }
+
+            return new Vector(scaleX, scaleY);
+        }
     }
 }

Perspex.Controls/ItemsControl.cs

@@ -15,15 +15,15 @@ namespace Perspex.Controls
 
     public class ItemsControl : TemplatedControl
     {
-        private static readonly ItemsPanelTemplate DefaultPanel =
-            new ItemsPanelTemplate(() => new StackPanel { Orientation = Orientation.Vertical });
-
         public static readonly PerspexProperty<IEnumerable> ItemsProperty =
             PerspexProperty.Register<ItemsControl, IEnumerable>("Items");
 
         public static readonly PerspexProperty<ItemsPanelTemplate> ItemsPanelProperty =
             PerspexProperty.Register<ItemsControl, ItemsPanelTemplate>("ItemsPanel", defaultValue: DefaultPanel);
 
+        private static readonly ItemsPanelTemplate DefaultPanel =
+            new ItemsPanelTemplate(() => new StackPanel { Orientation = Orientation.Vertical });
+
         private ItemContainerGenerator itemContainerGenerator;
 
         public ItemsControl()
@@ -44,11 +44,6 @@ public ItemContainerGenerator ItemContainerGenerator
             }
         }
 
-        protected virtual ItemContainerGenerator CreateItemContainerGenerator()
-        {
-            return new ItemContainerGenerator(this);
-        }
-
         public IEnumerable Items
         {
             get { return this.GetValue(ItemsProperty); }
@@ -61,13 +56,18 @@ public ItemsPanelTemplate ItemsPanel
             set { this.SetValue(ItemsPanelProperty, value); }
         }
 
+        protected virtual ItemContainerGenerator CreateItemContainerGenerator()
+        {
+            return new ItemContainerGenerator(this);
+        }
+
         private void ItemsChanged(Tuple<IEnumerable, IEnumerable> value)
         {
             INotifyPropertyChanged inpc = value.Item1 as INotifyPropertyChanged;
 
             if (inpc != null)
             {
-                inpc.PropertyChanged -= ItemsPropertyChanged;
+                inpc.PropertyChanged -= this.ItemsPropertyChanged;
             }
 
             if (value.Item2 == null || !value.Item2.OfType<object>().Any())
@@ -83,7 +83,7 @@ private void ItemsChanged(Tuple<IEnumerable, IEnumerable> value)
 
             if (inpc != null)
             {
-                inpc.PropertyChanged += ItemsPropertyChanged;
+                inpc.PropertyChanged += this.ItemsPropertyChanged;
             }
         }
 

Perspex.Controls/ItemsPanelTemplate.cs

@@ -1,11 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+// -----------------------------------------------------------------------
+// <copyright file="ItemsPanelTemplate.cs" company="Steven Kirk">
+// Copyright 2013 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
 
 namespace Perspex.Controls
 {
+    using System;
+
     public class ItemsPanelTemplate
     {
         public ItemsPanelTemplate(Func<Panel> build)

Perspex.Controls/ListBoxItem.cs

@@ -13,7 +13,7 @@ public class ListBoxItem : ContentControl, ISelectable
 
         static ListBoxItem()
         {
-            PseudoClass(IsSelectedProperty, ":selected");
+            Control.PseudoClass(IsSelectedProperty, ":selected");
         }
 
         public bool IsSelected

Perspex.Controls/Panel.cs

@@ -24,7 +24,7 @@ public Controls Children
                 if (this.children == null)
                 {
                     this.children = new Controls();
-                    this.children.CollectionChanged += ChildrenChanged;
+                    this.children.CollectionChanged += this.ChildrenChanged;
                 }
 
                 return this.children;
@@ -38,15 +38,15 @@ public Controls Children
                 {
                     if (this.children != null)
                     {
-                        this.children.CollectionChanged -= ChildrenChanged;
+                        this.children.CollectionChanged -= this.ChildrenChanged;
                     }
 
                     this.children = value;
                     this.ClearVisualChildren();
 
                     if (this.children != null)
                     {
-                        this.children.CollectionChanged += ChildrenChanged;
+                        this.children.CollectionChanged += this.ChildrenChanged;
                         this.AddVisualChildren(value);
                         this.InvalidateMeasure();
                     }

Perspex.Controls/Presenters/ItemsPresenter.cs

@@ -1,5 +1,5 @@
 // -----------------------------------------------------------------------
-// <copyright file="ItemsControl.cs" company="Steven Kirk">
+// <copyright file="ItemsPresenter.cs" company="Steven Kirk">
 // Copyright 2014 MIT Licence. See licence.md for more information.
 // </copyright>
 // -----------------------------------------------------------------------
@@ -51,8 +51,8 @@ protected override sealed void ApplyTemplate()
 
         protected override Size MeasureOverride(Size availableSize)
         {
-            panel.Measure(availableSize);
-            return panel.DesiredSize.Value;
+            this.panel.Measure(availableSize);
+            return this.panel.DesiredSize.Value;
         }
 
         protected override Size ArrangeOverride(Size finalSize)

Perspex.Controls/Presenters/ScrollContentPresenter.cs

@@ -9,20 +9,20 @@ namespace Perspex.Controls.Presenters
     using System.Linq;
     using Perspex.Layout;
 
-    public class ScrollContentPresenter :  ContentPresenter
+    public class ScrollContentPresenter : ContentPresenter
     {
-        public static PerspexProperty<Size> ExtentProperty =
+        public static readonly PerspexProperty<Size> ExtentProperty =
             ScrollViewer.ExtentProperty.AddOwner<ScrollContentPresenter>();
 
-        public static PerspexProperty<Vector> OffsetProperty =
+        public static readonly PerspexProperty<Vector> OffsetProperty =
             ScrollViewer.OffsetProperty.AddOwner<ScrollContentPresenter>();
 
-        public static PerspexProperty<Size> ViewportProperty =
+        public static readonly PerspexProperty<Size> ViewportProperty =
             ScrollViewer.ViewportProperty.AddOwner<ScrollContentPresenter>();
 
         public ScrollContentPresenter()
         {
-            AffectsRender(OffsetProperty);
+            Control.AffectsRender(OffsetProperty);
         }
 
         public Size Extent

Perspex.Controls/Primitives/HeaderedContentControl.cs

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

Perspex.Controls/Primitives/ScrollBar.cs

@@ -28,8 +28,8 @@ public class ScrollBar : TemplatedControl
 
         static ScrollBar()
         {
-            PseudoClass(OrientationProperty, x => x == Orientation.Horizontal, ":horizontal");
-            PseudoClass(OrientationProperty, x => x == Orientation.Vertical, ":vertical");
+            Control.PseudoClass(OrientationProperty, x => x == Orientation.Horizontal, ":horizontal");
+            Control.PseudoClass(OrientationProperty, x => x == Orientation.Vertical, ":vertical");
         }
 
         public double Minimum