diff --git a/Perspex.UnitTests/StyleTests.cs b/Perspex.UnitTests/StyleTests.cs index 3a88ac2849..0c51bb4552 100644 --- a/Perspex.UnitTests/StyleTests.cs +++ b/Perspex.UnitTests/StyleTests.cs @@ -18,7 +18,7 @@ namespace Perspex.UnitTests [TestMethod] public void Style_With_Only_Type_Selector_Should_Update_Value() { - Style style = new Style(new Selector().OfType()) + Style style = new Style(x => x.OfType()) { Setters = new[] { @@ -36,7 +36,7 @@ namespace Perspex.UnitTests [TestMethod] public void Style_With_Class_Selector_Should_Update_And_Restore_Value() { - Style style = new Style(new Selector().OfType().Class("foo")) + Style style = new Style(x => x.OfType().Class("foo")) { Setters = new[] { @@ -57,7 +57,7 @@ namespace Perspex.UnitTests [TestMethod] public void LocalValue_Should_Override_Style() { - Style style = new Style(new Selector().OfType()) + Style style = new Style(x => x.OfType()) { Setters = new[] { @@ -79,7 +79,7 @@ namespace Perspex.UnitTests { Styles styles = new Styles { - new Style(new Selector().OfType().Class("foo")) + new Style(x => x.OfType().Class("foo")) { Setters = new[] { @@ -87,7 +87,7 @@ namespace Perspex.UnitTests }, }, - new Style(new Selector().OfType().Class("foo")) + new Style(x => x.OfType().Class("foo")) { Setters = new[] { diff --git a/Perspex/PerspexObject.cs b/Perspex/PerspexObject.cs index 9b5342f836..b4aaf0d8c7 100644 --- a/Perspex/PerspexObject.cs +++ b/Perspex/PerspexObject.cs @@ -9,9 +9,6 @@ namespace Perspex using System; using System.Collections.Generic; using System.Linq; - using System.Linq.Expressions; - using System.Reactive; - using System.Reactive.Disposables; using System.Reactive.Linq; using System.Reflection; using Splat; diff --git a/Perspex/Styling/Style.cs b/Perspex/Styling/Style.cs index 2ca83ef4b0..772304528c 100644 --- a/Perspex/Styling/Style.cs +++ b/Perspex/Styling/Style.cs @@ -20,10 +20,10 @@ namespace Perspex.Styling this.Setters = new List(); } - public Style(Selector selector) + public Style(Func selector) : this() { - this.Selector = selector; + this.Selector = selector(new Selector()); } public Selector Selector diff --git a/Perspex/Themes/Default/ButtonStyle.cs b/Perspex/Themes/Default/ButtonStyle.cs index 7d42ae6e65..06685285af 100644 --- a/Perspex/Themes/Default/ButtonStyle.cs +++ b/Perspex/Themes/Default/ButtonStyle.cs @@ -15,14 +15,14 @@ namespace Perspex.Themes.Default { this.AddRange(new[] { - new Style(new Selector().OfType