From d4733c53328d17bdabad46f0492e934fe8bce44a Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Sun, 14 Dec 2014 12:27:37 +0100 Subject: [PATCH] Moved a bit of stuff around. --- Perspex.Controls/ScrollViewer.cs | 12 ++++++------ Perspex.Controls/TextBlock.cs | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Perspex.Controls/ScrollViewer.cs b/Perspex.Controls/ScrollViewer.cs index 9cedfc2442..213aa1eb4b 100644 --- a/Perspex.Controls/ScrollViewer.cs +++ b/Perspex.Controls/ScrollViewer.cs @@ -22,9 +22,6 @@ namespace Perspex.Controls public static readonly PerspexProperty ViewportProperty = PerspexProperty.Register("Viewport"); - public static readonly PerspexProperty CanScrollHorizontallyProperty = - PerspexProperty.RegisterAttached("CanScrollHorizontally", false); - public static readonly PerspexProperty HorizontalScrollBarMaximumProperty = PerspexProperty.Register("HorizontalScrollBarMaximum"); @@ -34,9 +31,6 @@ namespace Perspex.Controls public static readonly PerspexProperty HorizontalScrollBarViewportSizeProperty = PerspexProperty.Register("HorizontalScrollBarViewportSize"); - public static readonly PerspexProperty HorizontalScrollBarVisibilityProperty = - PerspexProperty.RegisterAttached("HorizontalScrollBarVisibility", ScrollBarVisibility.Auto); - public static readonly PerspexProperty VerticalScrollBarMaximumProperty = PerspexProperty.Register("VerticalScrollBarMaximum"); @@ -46,6 +40,12 @@ namespace Perspex.Controls public static readonly PerspexProperty VerticalScrollBarViewportSizeProperty = PerspexProperty.Register("VerticalScrollBarViewportSize"); + public static readonly PerspexProperty CanScrollHorizontallyProperty = + PerspexProperty.RegisterAttached("CanScrollHorizontally", false); + + public static readonly PerspexProperty HorizontalScrollBarVisibilityProperty = + PerspexProperty.RegisterAttached("HorizontalScrollBarVisibility", ScrollBarVisibility.Auto); + public static readonly PerspexProperty VerticalScrollBarVisibilityProperty = PerspexProperty.RegisterAttached("VerticalScrollBarVisibility", ScrollBarVisibility.Auto); diff --git a/Perspex.Controls/TextBlock.cs b/Perspex.Controls/TextBlock.cs index 5143320d87..a62a55e1d7 100644 --- a/Perspex.Controls/TextBlock.cs +++ b/Perspex.Controls/TextBlock.cs @@ -10,8 +10,6 @@ namespace Perspex.Controls using System.Reactive; using System.Reactive.Linq; using Perspex.Media; - using Perspex.Platform; - using Splat; public class TextBlock : Control {