From 9a994e582ced1edf4367d6dee00d6276f136534f Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Sat, 20 Dec 2014 22:21:12 +0100 Subject: [PATCH] Moved VisualTree extensions into own namespace. So that they don't pollute the whole Perspex namespace - you now need to "opt-in" to the visual tree. --- Perspex.Controls.UnitTests/ContentControlTests.cs | 1 + Perspex.Controls.UnitTests/TemplatedControlTests.cs | 1 + Perspex.Controls/ControlExtensions.cs | 1 + Perspex.Controls/DataTemplateExtensions.cs | 1 + Perspex.Controls/GridSplitter.cs | 1 + Perspex.Controls/Presenters/ScrollContentPresenter.cs | 1 + Perspex.Controls/Presenters/TextPresenter.cs | 1 + Perspex.Controls/Primitives/SelectingItemsControl.cs | 1 + Perspex.Controls/Primitives/TemplatedControl.cs | 1 + Perspex.Controls/RadioButton.cs | 1 + Perspex.Controls/TreeViewItem.cs | 1 + Perspex.Input/FocusManager.cs | 1 + Perspex.Input/InputElement.cs | 1 + Perspex.Input/InputManager.cs | 1 + Perspex.Input/MouseDevice.cs | 1 + Perspex.Interactivity/Interactive.cs | 1 + Perspex.Layout/LayoutManager.cs | 1 + Perspex.Layout/Layoutable.cs | 1 + Perspex.SceneGraph.UnitTests/VisualTests.cs | 1 + Perspex.SceneGraph/Perspex.SceneGraph.csproj | 2 +- Perspex.SceneGraph/Visual.cs | 1 + Perspex.SceneGraph/{ => VisualTree}/VisualExtensions.cs | 2 +- Perspex.Styling/Styler.cs | 1 + 23 files changed, 23 insertions(+), 2 deletions(-) rename Perspex.SceneGraph/{ => VisualTree}/VisualExtensions.cs (99%) diff --git a/Perspex.Controls.UnitTests/ContentControlTests.cs b/Perspex.Controls.UnitTests/ContentControlTests.cs index c7d3351ec8..5731afa76d 100644 --- a/Perspex.Controls.UnitTests/ContentControlTests.cs +++ b/Perspex.Controls.UnitTests/ContentControlTests.cs @@ -16,6 +16,7 @@ namespace Perspex.Controls.UnitTests using Perspex.Layout; using Perspex.Platform; using Perspex.Styling; + using Perspex.VisualTree; using Ploeh.AutoFixture; using Ploeh.AutoFixture.AutoMoq; using Splat; diff --git a/Perspex.Controls.UnitTests/TemplatedControlTests.cs b/Perspex.Controls.UnitTests/TemplatedControlTests.cs index b143b819d1..510b99cf99 100644 --- a/Perspex.Controls.UnitTests/TemplatedControlTests.cs +++ b/Perspex.Controls.UnitTests/TemplatedControlTests.cs @@ -14,6 +14,7 @@ namespace Perspex.Controls.UnitTests using Microsoft.VisualStudio.TestTools.UnitTesting; using Perspex.Controls; using Perspex.Controls.Primitives; + using Perspex.VisualTree; [TestClass] public class TemplatedControlTests diff --git a/Perspex.Controls/ControlExtensions.cs b/Perspex.Controls/ControlExtensions.cs index 437aff1983..e1b400365a 100644 --- a/Perspex.Controls/ControlExtensions.cs +++ b/Perspex.Controls/ControlExtensions.cs @@ -11,6 +11,7 @@ namespace Perspex.Controls using System.Linq; using Perspex.Controls; using Perspex.Styling; + using Perspex.VisualTree; public static class ControlExtensions { diff --git a/Perspex.Controls/DataTemplateExtensions.cs b/Perspex.Controls/DataTemplateExtensions.cs index 48e6c51c82..576aa3beb2 100644 --- a/Perspex.Controls/DataTemplateExtensions.cs +++ b/Perspex.Controls/DataTemplateExtensions.cs @@ -7,6 +7,7 @@ namespace Perspex.Controls { using System.Linq; + using Perspex.VisualTree; using Splat; public static class DataTemplateExtensions diff --git a/Perspex.Controls/GridSplitter.cs b/Perspex.Controls/GridSplitter.cs index 99e713d6d9..07391d8305 100644 --- a/Perspex.Controls/GridSplitter.cs +++ b/Perspex.Controls/GridSplitter.cs @@ -9,6 +9,7 @@ namespace Perspex.Controls using System; using Perspex.Controls.Primitives; using Perspex.Input; + using Perspex.VisualTree; public class GridSplitter : Thumb { diff --git a/Perspex.Controls/Presenters/ScrollContentPresenter.cs b/Perspex.Controls/Presenters/ScrollContentPresenter.cs index 8a795d5199..01f092f0c8 100644 --- a/Perspex.Controls/Presenters/ScrollContentPresenter.cs +++ b/Perspex.Controls/Presenters/ScrollContentPresenter.cs @@ -10,6 +10,7 @@ namespace Perspex.Controls.Presenters using System.Linq; using Perspex.Input; using Perspex.Layout; + using Perspex.VisualTree; public class ScrollContentPresenter : ContentPresenter { diff --git a/Perspex.Controls/Presenters/TextPresenter.cs b/Perspex.Controls/Presenters/TextPresenter.cs index d0abc73530..6a1af946fe 100644 --- a/Perspex.Controls/Presenters/TextPresenter.cs +++ b/Perspex.Controls/Presenters/TextPresenter.cs @@ -15,6 +15,7 @@ namespace Perspex.Controls using Perspex.Input; using Perspex.Media; using Perspex.Threading; + using Perspex.VisualTree; public class TextPresenter : TextBlock { diff --git a/Perspex.Controls/Primitives/SelectingItemsControl.cs b/Perspex.Controls/Primitives/SelectingItemsControl.cs index 6390b17f36..f918fd56f1 100644 --- a/Perspex.Controls/Primitives/SelectingItemsControl.cs +++ b/Perspex.Controls/Primitives/SelectingItemsControl.cs @@ -12,6 +12,7 @@ namespace Perspex.Controls.Primitives using Perspex.Controls.Presenters; using Perspex.Input; using Perspex.Interactivity; + using Perspex.VisualTree; public class SelectingItemsControl : ItemsControl { diff --git a/Perspex.Controls/Primitives/TemplatedControl.cs b/Perspex.Controls/Primitives/TemplatedControl.cs index 29752b7049..ffe27a7471 100644 --- a/Perspex.Controls/Primitives/TemplatedControl.cs +++ b/Perspex.Controls/Primitives/TemplatedControl.cs @@ -10,6 +10,7 @@ namespace Perspex.Controls.Primitives using System.Linq; using Perspex.Media; using Perspex.Styling; + using Perspex.VisualTree; using Splat; public class TemplatedControl : Control, ITemplatedControl diff --git a/Perspex.Controls/RadioButton.cs b/Perspex.Controls/RadioButton.cs index 33c9bfa298..a88c0d5e3e 100644 --- a/Perspex.Controls/RadioButton.cs +++ b/Perspex.Controls/RadioButton.cs @@ -9,6 +9,7 @@ namespace Perspex.Controls using System; using System.Linq; using Perspex.Controls.Primitives; + using Perspex.VisualTree; public class RadioButton : ToggleButton { diff --git a/Perspex.Controls/TreeViewItem.cs b/Perspex.Controls/TreeViewItem.cs index c0c028818f..51d0673f02 100644 --- a/Perspex.Controls/TreeViewItem.cs +++ b/Perspex.Controls/TreeViewItem.cs @@ -10,6 +10,7 @@ namespace Perspex.Controls using System.Linq; using Perspex.Controls.Generators; using Perspex.Controls.Primitives; + using Perspex.VisualTree; public class TreeViewItem : HeaderedItemsControl, ISelectable { diff --git a/Perspex.Input/FocusManager.cs b/Perspex.Input/FocusManager.cs index 1cbb401975..ccf9be29a4 100644 --- a/Perspex.Input/FocusManager.cs +++ b/Perspex.Input/FocusManager.cs @@ -10,6 +10,7 @@ namespace Perspex.Input using System.Collections.Generic; using System.Linq; using Perspex.Interactivity; + using Perspex.VisualTree; using Splat; public class FocusManager : IFocusManager diff --git a/Perspex.Input/InputElement.cs b/Perspex.Input/InputElement.cs index 99b1c1c349..2c3a12c612 100644 --- a/Perspex.Input/InputElement.cs +++ b/Perspex.Input/InputElement.cs @@ -10,6 +10,7 @@ namespace Perspex.Input using System.Linq; using Perspex.Interactivity; using Perspex.Rendering; + using Perspex.VisualTree; public class InputElement : Interactive, IInputElement { diff --git a/Perspex.Input/InputManager.cs b/Perspex.Input/InputManager.cs index 16086d421c..f7e9297ade 100644 --- a/Perspex.Input/InputManager.cs +++ b/Perspex.Input/InputManager.cs @@ -11,6 +11,7 @@ namespace Perspex.Input using System.Linq; using System.Reactive.Subjects; using Perspex.Input.Raw; + using Perspex.VisualTree; public class InputManager : IInputManager { diff --git a/Perspex.Input/MouseDevice.cs b/Perspex.Input/MouseDevice.cs index b0808ca8e4..dd2bc1b1b2 100644 --- a/Perspex.Input/MouseDevice.cs +++ b/Perspex.Input/MouseDevice.cs @@ -12,6 +12,7 @@ namespace Perspex.Input using Perspex.Input.Raw; using Perspex.Interactivity; using Perspex.Platform; + using Perspex.VisualTree; using Splat; public abstract class MouseDevice : IMouseDevice diff --git a/Perspex.Interactivity/Interactive.cs b/Perspex.Interactivity/Interactive.cs index 509ffcedd5..c4bf1762e5 100644 --- a/Perspex.Interactivity/Interactive.cs +++ b/Perspex.Interactivity/Interactive.cs @@ -12,6 +12,7 @@ namespace Perspex.Interactivity using System.Reactive; using System.Reactive.Linq; using Perspex.Layout; + using Perspex.VisualTree; public class Interactive : Layoutable, IInteractive { diff --git a/Perspex.Layout/LayoutManager.cs b/Perspex.Layout/LayoutManager.cs index d02c9edc8a..7fff4cb3a0 100644 --- a/Perspex.Layout/LayoutManager.cs +++ b/Perspex.Layout/LayoutManager.cs @@ -10,6 +10,7 @@ namespace Perspex.Layout using System.Reactive; using System.Reactive.Subjects; using NGenerics.DataStructures.General; + using Perspex.VisualTree; /// /// Manages measuring and arranging of controls. diff --git a/Perspex.Layout/Layoutable.cs b/Perspex.Layout/Layoutable.cs index 69f1277388..f41b07b618 100644 --- a/Perspex.Layout/Layoutable.cs +++ b/Perspex.Layout/Layoutable.cs @@ -8,6 +8,7 @@ namespace Perspex.Layout { using System; using System.Linq; + using Perspex.VisualTree; using Splat; public enum HorizontalAlignment diff --git a/Perspex.SceneGraph.UnitTests/VisualTests.cs b/Perspex.SceneGraph.UnitTests/VisualTests.cs index a7e0755a47..37a307d054 100644 --- a/Perspex.SceneGraph.UnitTests/VisualTests.cs +++ b/Perspex.SceneGraph.UnitTests/VisualTests.cs @@ -8,6 +8,7 @@ namespace Perspex.SceneGraph.UnitTests { using System.Linq; using Microsoft.VisualStudio.TestTools.UnitTesting; + using Perspex.VisualTree; [TestClass] public class VisualTests diff --git a/Perspex.SceneGraph/Perspex.SceneGraph.csproj b/Perspex.SceneGraph/Perspex.SceneGraph.csproj index c3ee00e99c..1cf8facec2 100644 --- a/Perspex.SceneGraph/Perspex.SceneGraph.csproj +++ b/Perspex.SceneGraph/Perspex.SceneGraph.csproj @@ -91,7 +91,7 @@ - + diff --git a/Perspex.SceneGraph/Visual.cs b/Perspex.SceneGraph/Visual.cs index 2f9351fc12..5d9900e010 100644 --- a/Perspex.SceneGraph/Visual.cs +++ b/Perspex.SceneGraph/Visual.cs @@ -15,6 +15,7 @@ namespace Perspex using Perspex.Collections; using Perspex.Media; using Perspex.Rendering; + using Perspex.VisualTree; using Splat; public class Visual : Animatable, IVisual diff --git a/Perspex.SceneGraph/VisualExtensions.cs b/Perspex.SceneGraph/VisualTree/VisualExtensions.cs similarity index 99% rename from Perspex.SceneGraph/VisualExtensions.cs rename to Perspex.SceneGraph/VisualTree/VisualExtensions.cs index d7452ed012..f21bc1ec96 100644 --- a/Perspex.SceneGraph/VisualExtensions.cs +++ b/Perspex.SceneGraph/VisualTree/VisualExtensions.cs @@ -4,7 +4,7 @@ // // ----------------------------------------------------------------------- -namespace Perspex +namespace Perspex.VisualTree { using System; using System.Collections.Generic; diff --git a/Perspex.Styling/Styler.cs b/Perspex.Styling/Styler.cs index 8ededfe417..263cc33d4a 100644 --- a/Perspex.Styling/Styler.cs +++ b/Perspex.Styling/Styler.cs @@ -8,6 +8,7 @@ namespace Perspex.Styling { using System; using System.Linq; + using Perspex.VisualTree; using Splat; public class Styler : IStyler