From 44756e27e10f172f94032032574f72c2f9e5ad29 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Fri, 13 Jun 2014 02:50:50 +0200 Subject: [PATCH] Moved platform interfaces into Platform namespace. --- Perspex.Direct2D1/Media/GeometryImpl.cs | 5 +---- Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs | 2 +- Perspex.Direct2D1/Media/StreamGeometryImpl.cs | 1 + Perspex.Direct2D1/TextService.cs | 1 + Perspex/Controls/TextBlock.cs | 1 + Perspex/Media/Geometry.cs | 2 ++ Perspex/Media/RectangleGeometry.cs | 2 +- Perspex/Media/StreamGeometry.cs | 2 +- Perspex/Media/StreamGeometryContext.cs | 2 +- Perspex/Perspex.csproj | 8 ++++---- Perspex/{Media => Platform}/IGeometryImpl.cs | 2 +- Perspex/{Media => Platform}/IStreamGeometryContextImpl.cs | 2 +- Perspex/{Media => Platform}/IStreamGeometryImpl.cs | 2 +- Perspex/{Media => Platform}/ITextService.cs | 4 +++- 14 files changed, 20 insertions(+), 16 deletions(-) rename Perspex/{Media => Platform}/IGeometryImpl.cs (93%) rename Perspex/{Media => Platform}/IStreamGeometryContextImpl.cs (95%) rename Perspex/{Media => Platform}/IStreamGeometryImpl.cs (93%) rename Perspex/{Media => Platform}/ITextService.cs (88%) diff --git a/Perspex.Direct2D1/Media/GeometryImpl.cs b/Perspex.Direct2D1/Media/GeometryImpl.cs index 26d7502f1e..e732afdc96 100644 --- a/Perspex.Direct2D1/Media/GeometryImpl.cs +++ b/Perspex.Direct2D1/Media/GeometryImpl.cs @@ -6,10 +6,7 @@ namespace Perspex.Direct2D1.Media { - using System; - using Perspex.Media; - using SharpDX.Direct2D1; - using Splat; + using Perspex.Platform; public abstract class GeometryImpl : IGeometryImpl { diff --git a/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs b/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs index 6d5d5fb9f5..bacb55ab66 100644 --- a/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs +++ b/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs @@ -6,7 +6,7 @@ namespace Perspex.Direct2D1.Media { - using Perspex.Media; + using Perspex.Platform; using SharpDX.Direct2D1; public class StreamGeometryContextImpl : IStreamGeometryContextImpl diff --git a/Perspex.Direct2D1/Media/StreamGeometryImpl.cs b/Perspex.Direct2D1/Media/StreamGeometryImpl.cs index efa8724f8c..05d43b2fee 100644 --- a/Perspex.Direct2D1/Media/StreamGeometryImpl.cs +++ b/Perspex.Direct2D1/Media/StreamGeometryImpl.cs @@ -8,6 +8,7 @@ namespace Perspex.Direct2D1.Media { using System; using Perspex.Media; + using Perspex.Platform; using SharpDX.Direct2D1; using Splat; diff --git a/Perspex.Direct2D1/TextService.cs b/Perspex.Direct2D1/TextService.cs index 5d5b2ed209..fc03940292 100644 --- a/Perspex.Direct2D1/TextService.cs +++ b/Perspex.Direct2D1/TextService.cs @@ -7,6 +7,7 @@ namespace Perspex.Direct2D1 { using Perspex.Media; + using Perspex.Platform; using SharpDX.DirectWrite; public class TextService : ITextService diff --git a/Perspex/Controls/TextBlock.cs b/Perspex/Controls/TextBlock.cs index b82fefe2f3..93758091f1 100644 --- a/Perspex/Controls/TextBlock.cs +++ b/Perspex/Controls/TextBlock.cs @@ -8,6 +8,7 @@ namespace Perspex.Controls { using System; using Perspex.Media; + using Perspex.Platform; using Splat; public class TextBlock : Control diff --git a/Perspex/Media/Geometry.cs b/Perspex/Media/Geometry.cs index e6386590a1..bd3798cc5b 100644 --- a/Perspex/Media/Geometry.cs +++ b/Perspex/Media/Geometry.cs @@ -6,6 +6,8 @@ namespace Perspex.Media { + using Perspex.Platform; + public abstract class Geometry { public abstract Rect Bounds diff --git a/Perspex/Media/RectangleGeometry.cs b/Perspex/Media/RectangleGeometry.cs index f04db66b36..d4f13d56a8 100644 --- a/Perspex/Media/RectangleGeometry.cs +++ b/Perspex/Media/RectangleGeometry.cs @@ -6,7 +6,7 @@ namespace Perspex.Media { - using System; + using Perspex.Platform; using Splat; public class RectangleGeometry : Geometry diff --git a/Perspex/Media/StreamGeometry.cs b/Perspex/Media/StreamGeometry.cs index 2ff2f52846..8e114f049d 100644 --- a/Perspex/Media/StreamGeometry.cs +++ b/Perspex/Media/StreamGeometry.cs @@ -6,7 +6,7 @@ namespace Perspex.Media { - using System; + using Perspex.Platform; using Splat; public class StreamGeometry : Geometry diff --git a/Perspex/Media/StreamGeometryContext.cs b/Perspex/Media/StreamGeometryContext.cs index f9c605f1ef..c7641ee4e9 100644 --- a/Perspex/Media/StreamGeometryContext.cs +++ b/Perspex/Media/StreamGeometryContext.cs @@ -7,7 +7,7 @@ namespace Perspex.Media { using System; - using Splat; + using Perspex.Platform; public class StreamGeometryContext : IDisposable { diff --git a/Perspex/Perspex.csproj b/Perspex/Perspex.csproj index 9e72398fab..80527bacfd 100644 --- a/Perspex/Perspex.csproj +++ b/Perspex/Perspex.csproj @@ -90,9 +90,9 @@ - - - + + + @@ -135,7 +135,7 @@ - + diff --git a/Perspex/Media/IGeometryImpl.cs b/Perspex/Platform/IGeometryImpl.cs similarity index 93% rename from Perspex/Media/IGeometryImpl.cs rename to Perspex/Platform/IGeometryImpl.cs index 1553e3fbf1..764d3f6c4d 100644 --- a/Perspex/Media/IGeometryImpl.cs +++ b/Perspex/Platform/IGeometryImpl.cs @@ -4,7 +4,7 @@ // // ----------------------------------------------------------------------- -namespace Perspex.Media +namespace Perspex.Platform { public interface IGeometryImpl { diff --git a/Perspex/Media/IStreamGeometryContextImpl.cs b/Perspex/Platform/IStreamGeometryContextImpl.cs similarity index 95% rename from Perspex/Media/IStreamGeometryContextImpl.cs rename to Perspex/Platform/IStreamGeometryContextImpl.cs index d38a9299a5..cb58199f72 100644 --- a/Perspex/Media/IStreamGeometryContextImpl.cs +++ b/Perspex/Platform/IStreamGeometryContextImpl.cs @@ -4,7 +4,7 @@ // // ----------------------------------------------------------------------- -namespace Perspex.Media +namespace Perspex.Platform { using System; diff --git a/Perspex/Media/IStreamGeometryImpl.cs b/Perspex/Platform/IStreamGeometryImpl.cs similarity index 93% rename from Perspex/Media/IStreamGeometryImpl.cs rename to Perspex/Platform/IStreamGeometryImpl.cs index 5ecf45dbfc..0f7065ff22 100644 --- a/Perspex/Media/IStreamGeometryImpl.cs +++ b/Perspex/Platform/IStreamGeometryImpl.cs @@ -4,7 +4,7 @@ // // ----------------------------------------------------------------------- -namespace Perspex.Media +namespace Perspex.Platform { public interface IStreamGeometryImpl : IGeometryImpl { diff --git a/Perspex/Media/ITextService.cs b/Perspex/Platform/ITextService.cs similarity index 88% rename from Perspex/Media/ITextService.cs rename to Perspex/Platform/ITextService.cs index d3fe50d7da..0e6e36e745 100644 --- a/Perspex/Media/ITextService.cs +++ b/Perspex/Platform/ITextService.cs @@ -4,8 +4,10 @@ // // ----------------------------------------------------------------------- -namespace Perspex.Media +namespace Perspex.Platform { + using Perspex.Media; + public interface ITextService { Size Measure(FormattedText text);