Merge pull request #2 from Perspex/master

Merge latest commits.
AvaloniaUI · Sep 25, 2015 · 87333eb · 87333eb
2 parents 65a133a + 45e5588
commit 87333eb
Show file tree

Hide file tree

Showing 142 changed files with 981 additions and 1,149 deletions.
diff --git a/Tests/Perspex.Controls.UnitTests/DockPanelTests/AlignerTests.cs b/Tests/Perspex.Controls.UnitTests/DockPanelTests/AlignerTests.cs
diff --git a/Tests/Perspex.Controls.UnitTests/DockPanelTests/LeftDockerTests.cs b/Tests/Perspex.Controls.UnitTests/DockPanelTests/LeftDockerTests.cs
diff --git a/Tests/Perspex.Controls.UnitTests/DockPanelTests/RectAlignerTests.cs b/Tests/Perspex.Controls.UnitTests/DockPanelTests/RectAlignerTests.cs
diff --git a/Tests/Perspex.Controls.UnitTests/DockPanelTests/RightDockerTests.cs b/Tests/Perspex.Controls.UnitTests/DockPanelTests/RightDockerTests.cs
diff --git a/samples/TestApplication/App.config b/samples/TestApplication/App.config
@@ -21,6 +21,10 @@
         <assemblyIdentity name="SharpDX" publicKeyToken="b4dcf0f35e5521f1" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-2.6.3.0" newVersion="2.6.3.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Mono.Cairo" publicKeyToken="0738eb9f132ed756" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/samples/TestApplication/TestApplication.csproj b/samples/TestApplication/TestApplication.csproj
@@ -66,9 +66,6 @@
     <Reference Include="Serilog.FullNetFx, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
       <HintPath>..\..\packages\Serilog.1.5.9\lib\net45\Serilog.FullNetFx.dll</HintPath>
     </Reference>
-    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App.cs" />

diff --git a/samples/TestApplication/packages.config b/samples/TestApplication/packages.config
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Rx-Core" version="2.2.5" targetFramework="net45" userInstalled="true" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" userInstalled="true" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="net45" userInstalled="true" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="net45" userInstalled="true" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" userInstalled="true" />
-  <package id="Rx-XAML" version="2.2.5" targetFramework="net45" userInstalled="true" />
-  <package id="Serilog" version="1.5.9" targetFramework="net45" userInstalled="true" />
-  <package id="Splat" version="1.6.2" targetFramework="net45" userInstalled="true" />
+  <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
+  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
+  <package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
+  <package id="Rx-Main" version="2.2.5" targetFramework="net45" />
+  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
+  <package id="Rx-XAML" version="2.2.5" targetFramework="net45" />
+  <package id="Serilog" version="1.5.9" targetFramework="net45" />
 </packages>
diff --git a/samples/XamlTestApplication/Views/MainWindow.paml b/samples/XamlTestApplication/Views/MainWindow.paml
@@ -3,8 +3,11 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
         Title="Perspex Test Application" Height="350" Width="525" SizeToContent="WidthAndHeight" >
 
-    <Grid RowDefinitions="Auto,*">
-        <TabControl Grid.Row="1">
+    <Grid RowDefinitions="Auto,*,Auto" ColumnDefinitions="*,*">
+        <TabControl Grid.Row="1" Grid.ColumnSpan="2" Padding="5">
+            <TabControl.Transition>
+                <PageSlide Duration="0.25" />
+            </TabControl.Transition>
             <TabItem Header="Buttons">
                 <StackPanel HorizontalAlignment="Center" Width="200" VerticalAlignment="Center">
                     <StackPanel.Styles>

diff --git a/samples/XamlTestApplication/XamlTestApplication.csproj b/samples/XamlTestApplication/XamlTestApplication.csproj
@@ -36,6 +36,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -55,9 +59,6 @@
     <Reference Include="Serilog.FullNetFx, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
       <HintPath>..\..\packages\Serilog.1.5.9\lib\net45\Serilog.FullNetFx.dll</HintPath>
     </Reference>
-    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
-    </Reference>
     <Reference Include="Sprache, Version=2.0.0.47, Culture=neutral, PublicKeyToken=null">
       <HintPath>..\..\packages\Sprache.2.0.0.47\lib\portable-net4+netcore45+win8+wp8+sl5+MonoAndroid1+MonoTouch1\Sprache.dll</HintPath>
     </Reference>

diff --git a/samples/XamlTestApplication/packages.config b/samples/XamlTestApplication/packages.config
@@ -7,6 +7,6 @@
   <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net46" />
   <package id="Rx-XAML" version="2.2.5" targetFramework="net46" />
   <package id="Serilog" version="1.5.9" targetFramework="net46" />
-  <package id="Splat" version="1.6.2" targetFramework="net46" />
+  <package id="Splat" version="1.6.2" targetFramework="net45" />
   <package id="Sprache" version="2.0.0.47" targetFramework="net451" />
 </packages>
diff --git a/src/Gtk/Perspex.Cairo/CairoPlatform.cs b/src/Gtk/Perspex.Cairo/CairoPlatform.cs
@@ -6,7 +6,6 @@
 using Perspex.Cairo.Media.Imaging;
 using Perspex.Media;
 using Perspex.Platform;
-using Splat;
 
 namespace Perspex.Cairo
 {
@@ -19,11 +18,7 @@ public class CairoPlatform : IPlatformRenderInterface
 
         private static Pango.Context s_pangoContext = CreatePangoContext();
 
-        public static void Initialize()
-        {
-            var locator = Locator.CurrentMutable;
-            locator.Register(() => s_instance, typeof(IPlatformRenderInterface));
-        }
+        public static void Initialize() => PerspexLocator.CurrentMutable.Bind<IPlatformRenderInterface>().ToConstant(s_instance);
 
         public IBitmapImpl CreateBitmap(int width, int height)
         {

diff --git a/src/Gtk/Perspex.Cairo/Media/FormattedTextImpl.cs b/src/Gtk/Perspex.Cairo/Media/FormattedTextImpl.cs
@@ -7,7 +7,6 @@
 using System.Text;
 using Perspex.Media;
 using Perspex.Platform;
-using Splat;
 
 namespace Perspex.Cairo.Media
 {

diff --git a/src/Gtk/Perspex.Cairo/Media/StreamGeometryImpl.cs b/src/Gtk/Perspex.Cairo/Media/StreamGeometryImpl.cs
@@ -4,7 +4,6 @@
 using System;
 using Perspex.Media;
 using Perspex.Platform;
-using Splat;
 using System.Collections.Generic;
 
 namespace Perspex.Cairo.Media

diff --git a/src/Gtk/Perspex.Cairo/Perspex.Cairo.csproj b/src/Gtk/Perspex.Cairo/Perspex.Cairo.csproj
@@ -51,9 +51,6 @@
       <HintPath>..\..\..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CairoPlatform.cs" />

diff --git a/src/Gtk/Perspex.Cairo/packages.config b/src/Gtk/Perspex.Cairo/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Rx-Core" version="2.2.5" targetFramework="net45" userInstalled="true" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" userInstalled="true" />
-  <package id="Splat" version="1.6.2" targetFramework="net45" userInstalled="true" />
-</packages>
+  <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
+  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
+</packages>
diff --git a/src/Gtk/Perspex.Gtk/GtkPlatform.cs b/src/Gtk/Perspex.Gtk/GtkPlatform.cs
@@ -8,7 +8,6 @@
 using Perspex.Input;
 using Perspex.Platform;
 using Perspex.Shared.PlatformSupport;
-using Splat;
 
 namespace Perspex.Gtk
 {
@@ -29,15 +28,16 @@ public GtkPlatform()
 
         public static void Initialize()
         {
-            var locator = Locator.CurrentMutable;
-            locator.Register(() => new WindowImpl(), typeof(IWindowImpl));
-            locator.Register(() => new PopupImpl(), typeof(IPopupImpl));
-            locator.Register(() => new ClipboardImpl(), typeof(IClipboard));
-            locator.Register(() => CursorFactory.Instance, typeof(IStandardCursorFactory));
-            locator.Register(() => GtkKeyboardDevice.Instance, typeof(IKeyboardDevice));
-            locator.Register(() => s_instance, typeof(IPlatformSettings));
-            locator.Register(() => s_instance, typeof(IPlatformThreadingInterface));
-            locator.Register(() => new SystemDialogImpl(), typeof (ISystemDialogImpl));
+            PerspexLocator.CurrentMutable
+                .Bind<IWindowImpl>().ToTransient<WindowImpl>()
+                .Bind<IPopupImpl>().ToTransient<PopupImpl>()
+                .Bind<IClipboard>().ToSingleton<ClipboardImpl>()
+                .Bind<IStandardCursorFactory>().ToConstant(CursorFactory.Instance)
+                .Bind<IKeyboardDevice>().ToConstant(GtkKeyboardDevice.Instance)
+                .Bind<IMouseDevice>().ToConstant(GtkMouseDevice.Instance)
+                .Bind<IPlatformSettings>().ToConstant(s_instance)
+                .Bind<IPlatformThreadingInterface>().ToConstant(s_instance)
+                .Bind<ISystemDialogImpl>().ToSingleton<SystemDialogImpl>();
             SharedPlatform.Register();
         }
 

diff --git a/src/Gtk/Perspex.Gtk/Perspex.Gtk.csproj b/src/Gtk/Perspex.Gtk/Perspex.Gtk.csproj
@@ -44,9 +44,6 @@
       <HintPath>..\..\..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
     </Reference>
     <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ClipboardImpl.cs" />