From 59f2e168d84bf83b49efbd3a9dc3b71d27a4fc40 Mon Sep 17 00:00:00 2001
From: grokys <grokys@gmail.com>
Date: Sun, 2 Feb 2014 20:26:11 +0100
Subject: [PATCH] Don't think bounds needs to be a PP.

---
 Perspex/IStyle.cs                      | 15 ++++++++++
 Perspex/Perspex.csproj                 |  3 ++
 Perspex/PerspexList.cs                 |  8 ++++++
 Perspex/Style.cs                       |  2 +-
 Perspex/Styles.cs                      |  4 +--
 Perspex/Themes/Default/ButtonStyle.cs  | 38 ++++++++++++++++++++++++++
 Perspex/Themes/Default/DefaultTheme.cs | 16 +++++++++++
 Perspex/Visual.cs                      | 10 ++-----
 TestApplication/Program.cs             | 20 ++------------
 9 files changed, 87 insertions(+), 29 deletions(-)
 create mode 100644 Perspex/IStyle.cs
 create mode 100644 Perspex/Themes/Default/ButtonStyle.cs
 create mode 100644 Perspex/Themes/Default/DefaultTheme.cs

diff --git a/Perspex/IStyle.cs b/Perspex/IStyle.cs
new file mode 100644
index 0000000000..08b971511f
--- /dev/null
+++ b/Perspex/IStyle.cs
@@ -0,0 +1,15 @@
+// -----------------------------------------------------------------------
+// <copyright file="IStyle.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Perspex
+{
+    using Perspex.Controls;
+
+    public interface IStyle
+    {
+        void Attach(Control control);
+    }
+}
diff --git a/Perspex/Perspex.csproj b/Perspex/Perspex.csproj
index e2c4e172ca..c191f1bc6a 100644
--- a/Perspex/Perspex.csproj
+++ b/Perspex/Perspex.csproj
@@ -77,6 +77,7 @@
     <Compile Include="Controls\Control.cs" />
     <Compile Include="Controls\TextBlock.cs" />
     <Compile Include="IBindingDescription.cs" />
+    <Compile Include="IStyle.cs" />
     <Compile Include="Layout\ILayoutable.cs" />
     <Compile Include="Layout\ILayoutManager.cs" />
     <Compile Include="Layout\ILayoutRoot.cs" />
@@ -104,6 +105,8 @@
     <Compile Include="Controls\TemplatedControl.cs" />
     <Compile Include="Style.cs" />
     <Compile Include="Styles.cs" />
+    <Compile Include="Themes\Default\ButtonStyle.cs" />
+    <Compile Include="Themes\Default\DefaultTheme.cs" />
     <Compile Include="Thickness.cs" />
     <Compile Include="Visual.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/Perspex/PerspexList.cs b/Perspex/PerspexList.cs
index 4d324bca7a..376f510e66 100644
--- a/Perspex/PerspexList.cs
+++ b/Perspex/PerspexList.cs
@@ -26,5 +26,13 @@
             get;
             private set;
         }
+
+        public void AddRange(IEnumerable<T> items)
+        {
+            foreach (T item in items)
+            {
+                this.Add(item);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Perspex/Style.cs b/Perspex/Style.cs
index 699941db0c..e18b852560 100644
--- a/Perspex/Style.cs
+++ b/Perspex/Style.cs
@@ -13,7 +13,7 @@ namespace Perspex
     using System.Reactive.Subjects;
     using Perspex.Controls;
 
-    public class Style
+    public class Style : IStyle
     {
         public Style()
         {
diff --git a/Perspex/Styles.cs b/Perspex/Styles.cs
index cbf431e408..d7bd74dd0c 100644
--- a/Perspex/Styles.cs
+++ b/Perspex/Styles.cs
@@ -8,11 +8,11 @@ namespace Perspex
 {
     using Perspex.Controls;
 
-    public class Styles : PerspexList<Style>
+    public class Styles : PerspexList<IStyle>, IStyle
     {
         public void Attach(Control control)
         {
-            foreach (Style style in this)
+            foreach (IStyle style in this)
             {
                 style.Attach(control);
             }
diff --git a/Perspex/Themes/Default/ButtonStyle.cs b/Perspex/Themes/Default/ButtonStyle.cs
new file mode 100644
index 0000000000..7cb4cdd6e8
--- /dev/null
+++ b/Perspex/Themes/Default/ButtonStyle.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Perspex.Controls;
+using Perspex.Media;
+
+namespace Perspex.Themes.Default
+{
+    public class ButtonStyle : Styles
+    {
+        public ButtonStyle()
+        {
+            this.AddRange(new[]
+            {
+                new Style(x => x.Select<Button>())
+                {
+                    Setters = new[]
+                    {
+                        new Setter(Button.BackgroundProperty, new SolidColorBrush(0xffdddddd)),
+                        new Setter(Button.BorderBrushProperty, new SolidColorBrush(0xff707070)),
+                        new Setter(Button.BorderThicknessProperty, 2.0),
+                        new Setter(Button.ForegroundProperty, new SolidColorBrush(0xff000000)),
+                    },
+                },
+                new Style(x => x.Select<Button>().Class(":mouseover"))
+                {
+                    Setters = new[]
+                    {
+                        new Setter (Button.BackgroundProperty, new SolidColorBrush(0xffbee6fd)),
+                        new Setter (Button.BorderBrushProperty, new SolidColorBrush(0xff3c7fb1)),
+                    },
+                }
+            });
+        }
+    }
+}
diff --git a/Perspex/Themes/Default/DefaultTheme.cs b/Perspex/Themes/Default/DefaultTheme.cs
new file mode 100644
index 0000000000..a287d90871
--- /dev/null
+++ b/Perspex/Themes/Default/DefaultTheme.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Perspex.Themes.Default
+{
+    public class DefaultTheme : Styles
+    {
+        public DefaultTheme()
+        {
+            this.Add(new ButtonStyle());
+        }
+    }
+}
diff --git a/Perspex/Visual.cs b/Perspex/Visual.cs
index 8589533fca..8099ac262f 100644
--- a/Perspex/Visual.cs
+++ b/Perspex/Visual.cs
@@ -14,18 +14,12 @@ namespace Perspex
 
     public abstract class Visual : PerspexObject
     {
-        public static readonly ReadOnlyPerspexProperty<Rect> BoundsProperty =
-            new ReadOnlyPerspexProperty<Rect>(BoundsPropertyRW);
-
-        private static readonly PerspexProperty<Rect> BoundsPropertyRW =
-            PerspexProperty.Register<Visual, Rect>("Bounds");
-
         private Visual visualParent;
 
         public Rect Bounds
         {
-            get { return this.GetValue(BoundsPropertyRW); }
-            protected set { this.SetValue(BoundsPropertyRW, value); }
+            get;
+            protected set;
         }
 
         public virtual IEnumerable<Visual> VisualChildren
diff --git a/TestApplication/Program.cs b/TestApplication/Program.cs
index 26e7eed7cb..7969b26b06 100644
--- a/TestApplication/Program.cs
+++ b/TestApplication/Program.cs
@@ -8,6 +8,7 @@ using System.Threading.Tasks;
 using Perspex;
 using Perspex.Controls;
 using Perspex.Media;
+using Perspex.Themes.Default;
 using Perspex.Windows;
 using Perspex.Windows.Media;
 using Perspex.Windows.Threading;
@@ -42,24 +43,7 @@ namespace TestApplication
             {
                 Styles = new Styles 
                 {
-                    new Style(x => x.Select<Button>())
-                    {
-                        Setters = new[]
-                        {
-                            new Setter(Button.BackgroundProperty, new SolidColorBrush(0xffdddddd)),
-                            new Setter(Button.BorderBrushProperty, new SolidColorBrush(0xff707070)),
-                            new Setter(Button.BorderThicknessProperty, 2.0),
-                            new Setter(Button.ForegroundProperty, new SolidColorBrush(0xff000000)),
-                        },
-                    },
-                    new Style(x => x.Select<Button>().Class(":mouseover"))
-                    {
-                        Setters = new[]
-                        {
-                            new Setter (Button.BackgroundProperty, new SolidColorBrush(0xffbee6fd)),
-                            new Setter (Button.BorderBrushProperty, new SolidColorBrush(0xff3c7fb1)),
-                        },
-                    }
+                    new DefaultTheme(),
                 }
             };