From 3da3d4ab872f687c04a015885397ed6100f30094 Mon Sep 17 00:00:00 2001
From: grokys <grokys@gmail.com>
Date: Sat, 1 Feb 2014 23:26:26 +0100
Subject: [PATCH] Added Styles class.

---
 Perspex/Controls/Control.cs | 27 +++++++++++++++++++--------
 Perspex/Perspex.csproj      |  1 +
 Perspex/Styles.cs           | 12 ++++++++++++
 TestApplication/Program.cs  |  2 +-
 4 files changed, 33 insertions(+), 9 deletions(-)
 create mode 100644 Perspex/Styles.cs

diff --git a/Perspex/Controls/Control.cs b/Perspex/Controls/Control.cs
index 2d63583c97..fe04b8f254 100644
--- a/Perspex/Controls/Control.cs
+++ b/Perspex/Controls/Control.cs
@@ -59,6 +59,8 @@ namespace Perspex.Controls
         internal static readonly PerspexProperty<Control> ParentPropertyRW =
             PerspexProperty.Register<Control, Control>("Parent");
 
+        private Styles styles;
+
         public Control()
         {
             this.Classes = new PerspexList<string>();
@@ -104,10 +106,22 @@ namespace Perspex.Controls
             private set;
         }
 
-        public IEnumerable<Style> Styles
+        public Styles Styles
         {
-            get;
-            set;
+            get 
+            { 
+                if (this.styles == null)
+                {
+                    this.styles = new Styles();
+                }
+
+                return this.styles; 
+            }
+            
+            set
+            {
+                this.styles = value;
+            }
         }
 
         public Size? DesiredSize
@@ -202,12 +216,9 @@ namespace Perspex.Controls
         {
             Contract.Requires<ArgumentNullException>(control != null);
 
-            if (control.Styles != null)
+            foreach (Style style in control.Styles)
             {
-                foreach (Style style in control.Styles)
-                {
-                    style.Attach(this);
-                }
+                style.Attach(this);
             }
 
             Control parent = control.Parent;
diff --git a/Perspex/Perspex.csproj b/Perspex/Perspex.csproj
index 47c8eb4313..396cb188b9 100644
--- a/Perspex/Perspex.csproj
+++ b/Perspex/Perspex.csproj
@@ -101,6 +101,7 @@
     <Compile Include="Rect.cs" />
     <Compile Include="Controls\TemplatedControl.cs" />
     <Compile Include="Style.cs" />
+    <Compile Include="Styles.cs" />
     <Compile Include="Thickness.cs" />
     <Compile Include="Visual.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/Perspex/Styles.cs b/Perspex/Styles.cs
new file mode 100644
index 0000000000..3138db7db8
--- /dev/null
+++ b/Perspex/Styles.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Perspex
+{
+    public class Styles : PerspexList<Style>
+    {
+    }
+}
diff --git a/TestApplication/Program.cs b/TestApplication/Program.cs
index 7a81346a92..2cb9af7762 100644
--- a/TestApplication/Program.cs
+++ b/TestApplication/Program.cs
@@ -22,7 +22,7 @@ namespace TestApplication
 
             Window window = new Window
             {
-                Styles = new[]
+                Styles = new Styles
                 {
                     new Style
                     {