From 839cf9c14153ef308b041cf5cf081c16c1f5e926 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 27 May 2015 14:47:23 +0200
Subject: [PATCH] Moved ILogical to Perspex.Styling.

As that's the lowest level it's needed.
---
 Perspex.SceneGraph/Perspex.SceneGraph.csproj  |  2 -
 .../ILogical.cs                               |  0
 .../LogicalTree/LogicalExtensions.cs          |  0
 Perspex.Styling/Perspex.Styling.csproj        | 38 ++++++++++---------
 Perspex.Styling/{ => Styling}/Classes.cs      |  0
 .../{ => Styling}/IGlobalStyles.cs            |  0
 Perspex.Styling/{ => Styling}/IStyle.cs       |  0
 Perspex.Styling/{ => Styling}/IStyleHost.cs   |  0
 Perspex.Styling/{ => Styling}/IStyleable.cs   |  0
 Perspex.Styling/{ => Styling}/IStyler.cs      |  0
 .../{ => Styling}/ITemplatedControl.cs        |  0
 Perspex.Styling/{ => Styling}/Selector.cs     |  0
 .../{ => Styling}/SelectorMatch.cs            |  0
 Perspex.Styling/{ => Styling}/Selectors.cs    |  0
 Perspex.Styling/{ => Styling}/Setter.cs       |  0
 Perspex.Styling/{ => Styling}/Style.cs        |  0
 .../{ => Styling}/StyleActivator.cs           |  0
 Perspex.Styling/{ => Styling}/StyleBinding.cs |  0
 Perspex.Styling/{ => Styling}/Styler.cs       |  0
 Perspex.Styling/{ => Styling}/Styles.cs       |  0
 Perspex.Styling/{ => Styling}/packages.config |  0
 21 files changed, 20 insertions(+), 20 deletions(-)
 rename {Perspex.SceneGraph => Perspex.Styling}/ILogical.cs (100%)
 rename {Perspex.SceneGraph => Perspex.Styling}/LogicalTree/LogicalExtensions.cs (100%)
 rename Perspex.Styling/{ => Styling}/Classes.cs (100%)
 rename Perspex.Styling/{ => Styling}/IGlobalStyles.cs (100%)
 rename Perspex.Styling/{ => Styling}/IStyle.cs (100%)
 rename Perspex.Styling/{ => Styling}/IStyleHost.cs (100%)
 rename Perspex.Styling/{ => Styling}/IStyleable.cs (100%)
 rename Perspex.Styling/{ => Styling}/IStyler.cs (100%)
 rename Perspex.Styling/{ => Styling}/ITemplatedControl.cs (100%)
 rename Perspex.Styling/{ => Styling}/Selector.cs (100%)
 rename Perspex.Styling/{ => Styling}/SelectorMatch.cs (100%)
 rename Perspex.Styling/{ => Styling}/Selectors.cs (100%)
 rename Perspex.Styling/{ => Styling}/Setter.cs (100%)
 rename Perspex.Styling/{ => Styling}/Style.cs (100%)
 rename Perspex.Styling/{ => Styling}/StyleActivator.cs (100%)
 rename Perspex.Styling/{ => Styling}/StyleBinding.cs (100%)
 rename Perspex.Styling/{ => Styling}/Styler.cs (100%)
 rename Perspex.Styling/{ => Styling}/Styles.cs (100%)
 rename Perspex.Styling/{ => Styling}/packages.config (100%)

diff --git a/Perspex.SceneGraph/Perspex.SceneGraph.csproj b/Perspex.SceneGraph/Perspex.SceneGraph.csproj
index ced7573ee8..d425a31055 100644
--- a/Perspex.SceneGraph/Perspex.SceneGraph.csproj
+++ b/Perspex.SceneGraph/Perspex.SceneGraph.csproj
@@ -50,7 +50,6 @@
     <Compile Include="Animation\PageSlide.cs" />
     <Compile Include="Animation\CrossFade.cs" />
     <Compile Include="Animation\IPageTransition.cs" />
-    <Compile Include="ILogical.cs" />
     <Compile Include="Media\Brush.cs" />
     <Compile Include="Media\Brushes.cs" />
     <Compile Include="Media\Color.cs" />
@@ -101,7 +100,6 @@
     <Compile Include="Thickness.cs" />
     <Compile Include="Vector.cs" />
     <Compile Include="Visual.cs" />
-    <Compile Include="LogicalTree\LogicalExtensions.cs" />
     <Compile Include="VisualTree\TransformedBounds.cs" />
     <Compile Include="VisualTree\BoundsTracker.cs" />
     <Compile Include="VisualTree\VisualExtensions.cs" />
diff --git a/Perspex.SceneGraph/ILogical.cs b/Perspex.Styling/ILogical.cs
similarity index 100%
rename from Perspex.SceneGraph/ILogical.cs
rename to Perspex.Styling/ILogical.cs
diff --git a/Perspex.SceneGraph/LogicalTree/LogicalExtensions.cs b/Perspex.Styling/LogicalTree/LogicalExtensions.cs
similarity index 100%
rename from Perspex.SceneGraph/LogicalTree/LogicalExtensions.cs
rename to Perspex.Styling/LogicalTree/LogicalExtensions.cs
diff --git a/Perspex.Styling/Perspex.Styling.csproj b/Perspex.Styling/Perspex.Styling.csproj
index 5050b0bd04..8eac6e173b 100644
--- a/Perspex.Styling/Perspex.Styling.csproj
+++ b/Perspex.Styling/Perspex.Styling.csproj
@@ -8,7 +8,7 @@
     <ProjectGuid>{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Perspex.Styling</RootNamespace>
+    <RootNamespace>Perspex</RootNamespace>
     <AssemblyName>Perspex.Styling</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <FileAlignment>512</FileAlignment>
@@ -36,23 +36,25 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="ILogical.cs" />
+    <Compile Include="LogicalTree\LogicalExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Classes.cs" />
-    <Compile Include="IGlobalStyles.cs" />
-    <Compile Include="IStyle.cs" />
-    <Compile Include="IStyleable.cs" />
-    <Compile Include="IStyleHost.cs" />
-    <Compile Include="IStyler.cs" />
-    <Compile Include="ITemplatedControl.cs" />
-    <Compile Include="SelectorMatch.cs" />
-    <Compile Include="Selector.cs" />
-    <Compile Include="Selectors.cs" />
-    <Compile Include="Setter.cs" />
-    <Compile Include="Style.cs" />
-    <Compile Include="StyleActivator.cs" />
-    <Compile Include="StyleBinding.cs" />
-    <Compile Include="Styler.cs" />
-    <Compile Include="Styles.cs" />
+    <Compile Include="Styling\Classes.cs" />
+    <Compile Include="Styling\IGlobalStyles.cs" />
+    <Compile Include="Styling\IStyle.cs" />
+    <Compile Include="Styling\IStyleable.cs" />
+    <Compile Include="Styling\IStyleHost.cs" />
+    <Compile Include="Styling\IStyler.cs" />
+    <Compile Include="Styling\ITemplatedControl.cs" />
+    <Compile Include="Styling\SelectorMatch.cs" />
+    <Compile Include="Styling\Selector.cs" />
+    <Compile Include="Styling\Selectors.cs" />
+    <Compile Include="Styling\Setter.cs" />
+    <Compile Include="Styling\Style.cs" />
+    <Compile Include="Styling\StyleActivator.cs" />
+    <Compile Include="Styling\StyleBinding.cs" />
+    <Compile Include="Styling\Styler.cs" />
+    <Compile Include="Styling\Styles.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
@@ -74,7 +76,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="packages.config" />
+    <None Include="Styling\packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Perspex.Base\Perspex.Base.csproj">
diff --git a/Perspex.Styling/Classes.cs b/Perspex.Styling/Styling/Classes.cs
similarity index 100%
rename from Perspex.Styling/Classes.cs
rename to Perspex.Styling/Styling/Classes.cs
diff --git a/Perspex.Styling/IGlobalStyles.cs b/Perspex.Styling/Styling/IGlobalStyles.cs
similarity index 100%
rename from Perspex.Styling/IGlobalStyles.cs
rename to Perspex.Styling/Styling/IGlobalStyles.cs
diff --git a/Perspex.Styling/IStyle.cs b/Perspex.Styling/Styling/IStyle.cs
similarity index 100%
rename from Perspex.Styling/IStyle.cs
rename to Perspex.Styling/Styling/IStyle.cs
diff --git a/Perspex.Styling/IStyleHost.cs b/Perspex.Styling/Styling/IStyleHost.cs
similarity index 100%
rename from Perspex.Styling/IStyleHost.cs
rename to Perspex.Styling/Styling/IStyleHost.cs
diff --git a/Perspex.Styling/IStyleable.cs b/Perspex.Styling/Styling/IStyleable.cs
similarity index 100%
rename from Perspex.Styling/IStyleable.cs
rename to Perspex.Styling/Styling/IStyleable.cs
diff --git a/Perspex.Styling/IStyler.cs b/Perspex.Styling/Styling/IStyler.cs
similarity index 100%
rename from Perspex.Styling/IStyler.cs
rename to Perspex.Styling/Styling/IStyler.cs
diff --git a/Perspex.Styling/ITemplatedControl.cs b/Perspex.Styling/Styling/ITemplatedControl.cs
similarity index 100%
rename from Perspex.Styling/ITemplatedControl.cs
rename to Perspex.Styling/Styling/ITemplatedControl.cs
diff --git a/Perspex.Styling/Selector.cs b/Perspex.Styling/Styling/Selector.cs
similarity index 100%
rename from Perspex.Styling/Selector.cs
rename to Perspex.Styling/Styling/Selector.cs
diff --git a/Perspex.Styling/SelectorMatch.cs b/Perspex.Styling/Styling/SelectorMatch.cs
similarity index 100%
rename from Perspex.Styling/SelectorMatch.cs
rename to Perspex.Styling/Styling/SelectorMatch.cs
diff --git a/Perspex.Styling/Selectors.cs b/Perspex.Styling/Styling/Selectors.cs
similarity index 100%
rename from Perspex.Styling/Selectors.cs
rename to Perspex.Styling/Styling/Selectors.cs
diff --git a/Perspex.Styling/Setter.cs b/Perspex.Styling/Styling/Setter.cs
similarity index 100%
rename from Perspex.Styling/Setter.cs
rename to Perspex.Styling/Styling/Setter.cs
diff --git a/Perspex.Styling/Style.cs b/Perspex.Styling/Styling/Style.cs
similarity index 100%
rename from Perspex.Styling/Style.cs
rename to Perspex.Styling/Styling/Style.cs
diff --git a/Perspex.Styling/StyleActivator.cs b/Perspex.Styling/Styling/StyleActivator.cs
similarity index 100%
rename from Perspex.Styling/StyleActivator.cs
rename to Perspex.Styling/Styling/StyleActivator.cs
diff --git a/Perspex.Styling/StyleBinding.cs b/Perspex.Styling/Styling/StyleBinding.cs
similarity index 100%
rename from Perspex.Styling/StyleBinding.cs
rename to Perspex.Styling/Styling/StyleBinding.cs
diff --git a/Perspex.Styling/Styler.cs b/Perspex.Styling/Styling/Styler.cs
similarity index 100%
rename from Perspex.Styling/Styler.cs
rename to Perspex.Styling/Styling/Styler.cs
diff --git a/Perspex.Styling/Styles.cs b/Perspex.Styling/Styling/Styles.cs
similarity index 100%
rename from Perspex.Styling/Styles.cs
rename to Perspex.Styling/Styling/Styles.cs
diff --git a/Perspex.Styling/packages.config b/Perspex.Styling/Styling/packages.config
similarity index 100%
rename from Perspex.Styling/packages.config
rename to Perspex.Styling/Styling/packages.config