From 37de675f5ad2d19ce48b27e460c9f32264dd64e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Sun, 28 Feb 2016 21:34:34 +0100 Subject: [PATCH] Added PseudoClass for OrientationProperty --- src/Perspex.Controls/GridSplitter.cs | 9 ++++----- src/Perspex.Controls/Primitives/ScrollBar.cs | 9 +++++++++ src/Perspex.Controls/Slider.cs | 3 ++- src/Perspex.Themes.Default/ScrollBar.paml | 8 ++++---- src/Perspex.Themes.Default/Slider.paml | 4 ++-- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/Perspex.Controls/GridSplitter.cs b/src/Perspex.Controls/GridSplitter.cs index efb50c3e72..35c118de81 100644 --- a/src/Perspex.Controls/GridSplitter.cs +++ b/src/Perspex.Controls/GridSplitter.cs @@ -4,8 +4,6 @@ using System; using System.Collections.Generic; using System.Linq; - -using Perspex.Collections; using Perspex.Controls.Primitives; using Perspex.Input; using Perspex.VisualTree; @@ -32,8 +30,6 @@ namespace Perspex.Controls private DefinitionBase _nextDefinition; - private bool _isResizingColumns; - private List _definitions; /// @@ -52,7 +48,10 @@ namespace Perspex.Controls SetValue(OrientationProperty, value); } } - + + /// + /// Initializes static members of the class. + /// static GridSplitter() { PseudoClass(OrientationProperty, o => o == Perspex.Controls.Orientation.Vertical, ":vertical"); diff --git a/src/Perspex.Controls/Primitives/ScrollBar.cs b/src/Perspex.Controls/Primitives/ScrollBar.cs index 8e26275fe8..9b079bfa4c 100644 --- a/src/Perspex.Controls/Primitives/ScrollBar.cs +++ b/src/Perspex.Controls/Primitives/ScrollBar.cs @@ -31,6 +31,15 @@ namespace Perspex.Controls.Primitives public static readonly StyledProperty OrientationProperty = PerspexProperty.Register(nameof(Orientation)); + /// + /// Initializes static members of the class. + /// + static ScrollBar() + { + PseudoClass(OrientationProperty, o => o == Perspex.Controls.Orientation.Vertical, ":vertical"); + PseudoClass(OrientationProperty, o => o == Perspex.Controls.Orientation.Horizontal, ":horizontal"); + } + /// /// Initializes a new instance of the class. /// diff --git a/src/Perspex.Controls/Slider.cs b/src/Perspex.Controls/Slider.cs index 575690af74..30b498e80f 100644 --- a/src/Perspex.Controls/Slider.cs +++ b/src/Perspex.Controls/Slider.cs @@ -3,7 +3,6 @@ using System; using Perspex.Controls.Primitives; -using Perspex.Controls.Templates; using Perspex.Input; using Perspex.Interactivity; @@ -40,6 +39,8 @@ namespace Perspex.Controls /// static Slider() { + PseudoClass(OrientationProperty, o => o == Perspex.Controls.Orientation.Vertical, ":vertical"); + PseudoClass(OrientationProperty, o => o == Perspex.Controls.Orientation.Horizontal, ":horizontal"); Thumb.DragStartedEvent.AddClassHandler(x => x.OnThumbDragStarted, RoutingStrategies.Bubble); Thumb.DragDeltaEvent.AddClassHandler(x => x.OnThumbDragDelta, RoutingStrategies.Bubble); Thumb.DragCompletedEvent.AddClassHandler(x => x.OnThumbDragCompleted, RoutingStrategies.Bubble); diff --git a/src/Perspex.Themes.Default/ScrollBar.paml b/src/Perspex.Themes.Default/ScrollBar.paml index de0aa2fd4c..fa1f1d9d18 100644 --- a/src/Perspex.Themes.Default/ScrollBar.paml +++ b/src/Perspex.Themes.Default/ScrollBar.paml @@ -20,16 +20,16 @@ - - - - \ No newline at end of file diff --git a/src/Perspex.Themes.Default/Slider.paml b/src/Perspex.Themes.Default/Slider.paml index 8d8ef0ce18..dbdc96aaec 100644 --- a/src/Perspex.Themes.Default/Slider.paml +++ b/src/Perspex.Themes.Default/Slider.paml @@ -1,5 +1,5 @@  - -