From 491dfa58bd71b3b4eff8c0112f4a1810e41f0d05 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Thu, 2 Oct 2014 21:40:07 +0200 Subject: [PATCH] Move presenters to own namespace. To try and discourage their use outside control templates. --- Perspex.Controls/Perspex.Controls.csproj | 4 ++-- Perspex.Controls/{ => Presenters}/ContentPresenter.cs | 2 +- Perspex.Controls/{ => Presenters}/ItemsPresenter.cs | 2 +- Perspex.Controls/TabStrip.cs | 1 + Perspex.Controls/TreeView.cs | 1 + 5 files changed, 6 insertions(+), 4 deletions(-) rename Perspex.Controls/{ => Presenters}/ContentPresenter.cs (99%) rename Perspex.Controls/{ => Presenters}/ItemsPresenter.cs (99%) diff --git a/Perspex.Controls/Perspex.Controls.csproj b/Perspex.Controls/Perspex.Controls.csproj index 69ed028e0c..73605362bc 100644 --- a/Perspex.Controls/Perspex.Controls.csproj +++ b/Perspex.Controls/Perspex.Controls.csproj @@ -40,7 +40,7 @@ - + @@ -63,7 +63,7 @@ - + diff --git a/Perspex.Controls/ContentPresenter.cs b/Perspex.Controls/Presenters/ContentPresenter.cs similarity index 99% rename from Perspex.Controls/ContentPresenter.cs rename to Perspex.Controls/Presenters/ContentPresenter.cs index c703ebe14a..adb7454d27 100644 --- a/Perspex.Controls/ContentPresenter.cs +++ b/Perspex.Controls/Presenters/ContentPresenter.cs @@ -4,7 +4,7 @@ // // ----------------------------------------------------------------------- -namespace Perspex.Controls +namespace Perspex.Controls.Presenters { using System; using System.Linq; diff --git a/Perspex.Controls/ItemsPresenter.cs b/Perspex.Controls/Presenters/ItemsPresenter.cs similarity index 99% rename from Perspex.Controls/ItemsPresenter.cs rename to Perspex.Controls/Presenters/ItemsPresenter.cs index eedca327fb..4ff0db7ea7 100644 --- a/Perspex.Controls/ItemsPresenter.cs +++ b/Perspex.Controls/Presenters/ItemsPresenter.cs @@ -4,7 +4,7 @@ // // ----------------------------------------------------------------------- -namespace Perspex.Controls +namespace Perspex.Controls.Presenters { using System; using System.Collections; diff --git a/Perspex.Controls/TabStrip.cs b/Perspex.Controls/TabStrip.cs index 3e66396442..0df9812d43 100644 --- a/Perspex.Controls/TabStrip.cs +++ b/Perspex.Controls/TabStrip.cs @@ -10,6 +10,7 @@ namespace Perspex.Controls using System.Collections; using System.Linq; using Perspex.Controls.Generators; + using Perspex.Controls.Presenters; using Perspex.Input; public class TabStrip : SelectingItemsControl diff --git a/Perspex.Controls/TreeView.cs b/Perspex.Controls/TreeView.cs index 48263eca0c..04e0da6aed 100644 --- a/Perspex.Controls/TreeView.cs +++ b/Perspex.Controls/TreeView.cs @@ -11,6 +11,7 @@ namespace Perspex.Controls using System.Linq; using System.Reactive.Linq; using Perspex.Controls.Generators; + using Perspex.Controls.Presenters; using Perspex.Input; public class TreeView : SelectingItemsControl