From 4675ec41d66da2446653961e2fc211181a25384e Mon Sep 17 00:00:00 2001
From: grokys <grokys@gmail.com>
Date: Sat, 1 Feb 2014 23:10:04 +0100
Subject: [PATCH] Add :mouseover pseudoclass.

---
 Perspex.Windows/Window.cs   |  7 ++++++-
 Perspex/Controls/Control.cs | 26 +++++++++++++++++++++++---
 Perspex/Perspex.csproj      |  1 +
 Perspex/PerspexList.cs      | 30 ++++++++++++++++++++++++++++++
 Perspex/Selectors.cs        | 24 ++++++++++++++++++++++++
 Perspex/Visual.cs           |  9 ---------
 TestApplication/Program.cs  |  4 ++--
 7 files changed, 86 insertions(+), 15 deletions(-)
 create mode 100644 Perspex/PerspexList.cs

diff --git a/Perspex.Windows/Window.cs b/Perspex.Windows/Window.cs
index 0c831a20b0..813fd69087 100644
--- a/Perspex.Windows/Window.cs
+++ b/Perspex.Windows/Window.cs
@@ -134,7 +134,12 @@ namespace Perspex.Windows
 
         private void MouseMove(Visual visual, Point p)
         {
-            visual.IsMouseOver = visual.Bounds.Contains(p);
+            Control control = visual as Control;
+
+            if (control != null)
+            {
+                control.IsMouseOver = visual.Bounds.Contains(p);
+            }
 
             foreach (Visual child in visual.VisualChildren)
             {
diff --git a/Perspex/Controls/Control.cs b/Perspex/Controls/Control.cs
index ffa21dd003..2d63583c97 100644
--- a/Perspex/Controls/Control.cs
+++ b/Perspex/Controls/Control.cs
@@ -44,6 +44,9 @@ namespace Perspex.Controls
         public static readonly PerspexProperty<double> BorderThicknessProperty =
             PerspexProperty.Register<Control, double>("BorderThickness");
 
+        public static readonly PerspexProperty<bool> IsMouseOverProperty =
+            PerspexProperty.Register<Visual, bool>("IsMouseOver");
+
         public static readonly PerspexProperty<HorizontalAlignment> HorizontalAlignmentProperty =
             PerspexProperty.Register<Control, HorizontalAlignment>("HorizontalAlignment");
 
@@ -58,10 +61,21 @@ namespace Perspex.Controls
 
         public Control()
         {
-            this.Classes = new ObservableCollection<string>();
-            this.Styles = new ObservableCollection<Style>();
+            this.Classes = new PerspexList<string>();
             this.GetObservableWithHistory(ParentPropertyRW).Subscribe(this.ParentChanged);
 
+            this.GetObservable(IsMouseOverProperty).Subscribe(x =>
+            {
+                if (x)
+                {
+                    this.Classes.Add(":mouseover");
+                }
+                else
+                {
+                    this.Classes.Remove(":mouseover");
+                }
+            });
+
             // Hacky hack hack!
             this.GetObservable(BackgroundProperty).Skip(1).Subscribe(_ => this.InvalidateMeasure());
         }
@@ -84,7 +98,7 @@ namespace Perspex.Controls
             set { this.SetValue(BorderThicknessProperty, value); }
         }
 
-        public ObservableCollection<string> Classes
+        public PerspexList<string> Classes
         {
             get;
             private set;
@@ -102,6 +116,12 @@ namespace Perspex.Controls
             set;
         }
 
+        public bool IsMouseOver
+        {
+            get { return this.GetValue(IsMouseOverProperty); }
+            set { this.SetValue(IsMouseOverProperty, value); }
+        }
+
         public HorizontalAlignment HorizontalAlignment
         {
             get { return this.GetValue(HorizontalAlignmentProperty); }
diff --git a/Perspex/Perspex.csproj b/Perspex/Perspex.csproj
index 0a20c82d06..47c8eb4313 100644
--- a/Perspex/Perspex.csproj
+++ b/Perspex/Perspex.csproj
@@ -87,6 +87,7 @@
     <Compile Include="Media\Matrix.cs" />
     <Compile Include="Media\Pen.cs" />
     <Compile Include="Media\SolidColorBrush.cs" />
+    <Compile Include="PerspexList.cs" />
     <Compile Include="PerspexObject.cs" />
     <Compile Include="PerspexProperty.cs" />
     <Compile Include="PerspexPropertyChangedEventArgs.cs" />
diff --git a/Perspex/PerspexList.cs b/Perspex/PerspexList.cs
new file mode 100644
index 0000000000..4d324bca7a
--- /dev/null
+++ b/Perspex/PerspexList.cs
@@ -0,0 +1,30 @@
+namespace Perspex
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.Collections.Specialized;
+    using System.Linq;
+    using System.Reactive.Linq;
+    using System.Reactive.Subjects;
+    using System.Text;
+    using System.Threading.Tasks;
+
+    public class PerspexList<T> : ObservableCollection<T>
+    {
+        public PerspexList()
+        {
+            this.Changed = Observable.FromEvent<NotifyCollectionChangedEventHandler, NotifyCollectionChangedEventArgs>(
+                handler => (sender, e) => handler(e),
+                handler => this.CollectionChanged += handler,
+                handler => this.CollectionChanged -= handler);
+        }
+
+        public IObservable<NotifyCollectionChangedEventArgs> Changed
+        {
+            get;
+            private set;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Perspex/Selectors.cs b/Perspex/Selectors.cs
index 4317f9bd22..a583acdf08 100644
--- a/Perspex/Selectors.cs
+++ b/Perspex/Selectors.cs
@@ -8,6 +8,7 @@ namespace Perspex
 {
     using System;
     using System.Collections.Generic;
+    using System.Collections.Specialized;
     using System.Diagnostics.Contracts;
     using System.Linq;
     using System.Reactive.Linq;
@@ -34,6 +35,29 @@ namespace Perspex
             }
         }
 
+        public static Match Class(this Match selector, string name)
+        {
+            Contract.Requires<ArgumentNullException>(name != null);
+
+            if (selector != null)
+            {
+                IObservable<bool> match = Observable
+                    .Return(selector.Control.Classes.Contains(name))
+                    .Concat(selector.Control.Classes.Changed.Select(e => selector.Control.Classes.Contains(name)));
+
+                return new Match
+                {
+                    Control = selector.Control,
+                    Observable = match,
+                    Previous = selector,
+                };
+            }
+            else
+            {
+                return null;
+            }
+        }
+
         public static Match PropertyEquals<T>(this Match selector, PerspexProperty<T> property, T value)
         {
             Contract.Requires<ArgumentNullException>(property != null);
diff --git a/Perspex/Visual.cs b/Perspex/Visual.cs
index 427a3d2a0a..8589533fca 100644
--- a/Perspex/Visual.cs
+++ b/Perspex/Visual.cs
@@ -17,9 +17,6 @@ namespace Perspex
         public static readonly ReadOnlyPerspexProperty<Rect> BoundsProperty =
             new ReadOnlyPerspexProperty<Rect>(BoundsPropertyRW);
 
-        public static readonly PerspexProperty<bool> IsMouseOverProperty =
-            PerspexProperty.Register<Visual, bool>("IsMouseOver");
-
         private static readonly PerspexProperty<Rect> BoundsPropertyRW =
             PerspexProperty.Register<Visual, Rect>("Bounds");
 
@@ -31,12 +28,6 @@ namespace Perspex
             protected set { this.SetValue(BoundsPropertyRW, value); }
         }
 
-        public bool IsMouseOver
-        {
-            get { return this.GetValue(IsMouseOverProperty); }
-            set { this.SetValue(IsMouseOverProperty, value); }
-        }
-
         public virtual IEnumerable<Visual> VisualChildren
         {
             get { return Enumerable.Empty<Visual>(); }
diff --git a/TestApplication/Program.cs b/TestApplication/Program.cs
index 62a51f2122..7a81346a92 100644
--- a/TestApplication/Program.cs
+++ b/TestApplication/Program.cs
@@ -22,11 +22,11 @@ namespace TestApplication
 
             Window window = new Window
             {
-                Styles = new ObservableCollection<Style>
+                Styles = new[]
                 {
                     new Style
                     {
-                        Selector = x => x.Select<Button>().PropertyEquals(Visual.IsMouseOverProperty, true),
+                        Selector = x => x.Select<Button>().Class(":mouseover"),
                         Setters = new[]
                         {
                             new Setter