tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Moved stuff around a bit. 

Windows specific stuff into Windows directory, Perspex.Windows ->
Perspex.Win32 as WinRT might be supported in the future and that is
still Windows.
pull/5/head
Steven Kirk 12 years ago
parent
3dbd669f7b
commit
6644676b03
39 changed files with 65 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      Perspex.sln
  2. 4
      TestApplication/App.cs
  3. 2
      TestApplication/Program.cs
  4. 4
      TestApplication/TestApplication.csproj
  5. 0
      Windows/Perspex.Direct2D1.RenderTests/Controls/BorderTests.cs
  6. 0
      Windows/Perspex.Direct2D1.RenderTests/Controls/ImageTests.cs
  7. 18
      Windows/Perspex.Direct2D1.RenderTests/Perspex.Direct2D1.RenderTests.csproj
  8. 0
      Windows/Perspex.Direct2D1.RenderTests/Properties/AssemblyInfo.cs
  9. 0
      Windows/Perspex.Direct2D1.RenderTests/Shapes/PathTests.cs
  10. 0
      Windows/Perspex.Direct2D1.RenderTests/Shapes/RectangleTests.cs
  11. 0
      Windows/Perspex.Direct2D1.RenderTests/TestBase.cs
  12. 0
      Windows/Perspex.Direct2D1.RenderTests/app.config
  13. 0
      Windows/Perspex.Direct2D1.RenderTests/packages.config
  14. 0
      Windows/Perspex.Direct2D1/Direct2D1Platform.cs
  15. 0
      Windows/Perspex.Direct2D1/Media/DrawingContext.cs
  16. 0
      Windows/Perspex.Direct2D1/Media/GeometryImpl.cs
  17. 0
      Windows/Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs
  18. 0
      Windows/Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs
  19. 0
      Windows/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs
  20. 0
      Windows/Perspex.Direct2D1/Media/StreamGeometryImpl.cs
  21. 16
      Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj
  22. 0
      Windows/Perspex.Direct2D1/PrimitiveExtensions.cs
  23. 0
      Windows/Perspex.Direct2D1/Properties/AssemblyInfo.cs
  24. 0
      Windows/Perspex.Direct2D1/Renderer.cs
  25. 0
      Windows/Perspex.Direct2D1/TextService.cs
  26. 0
      Windows/Perspex.Direct2D1/app.config
  27. 0
      Windows/Perspex.Direct2D1/packages.config
  28. 4
      Windows/Perspex.Win32/Input/KeyInterop.cs
  29. 4
      Windows/Perspex.Win32/Input/WindowsKeyboardDevice.cs
  30. 4
      Windows/Perspex.Win32/Input/WindowsMouseDevice.cs
  31. 2
      Windows/Perspex.Win32/Interop/UnmanagedMethods.cs
  32. 38
      Windows/Perspex.Win32/Perspex.Win32.csproj
  33. 4
      Windows/Perspex.Win32/Properties/AssemblyInfo.cs
  34. 0
      Windows/Perspex.Win32/Settings.StyleCop
  35. 4
      Windows/Perspex.Win32/Threading/WindowsDispatcher.cs
  36. 12
      Windows/Perspex.Win32/Win32Platform.cs
  37. 8
      Windows/Perspex.Win32/Window.cs
  38. 0
      Windows/Perspex.Win32/app.config
  39. 0
      Windows/Perspex.Win32/packages.config

6
Perspex.sln
View File

@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013 # Visual Studio 2013
VisualStudioVersion = 12.0.30723.0 VisualStudioVersion = 12.0.30723.0
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Windows", "Perspex.Windows\Perspex.Windows.csproj", "{811A76CF-1CF6-440F-963B-BBE31BD72A82}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Windows", "Windows\Perspex.Win32\Perspex.Win32.csproj", "{811A76CF-1CF6-440F-963B-BBE31BD72A82}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApplication", "TestApplication\TestApplication.csproj", "{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApplication", "TestApplication\TestApplication.csproj", "{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.UnitTests", "Perspex.UnitTests\Perspex.UnitTests.csproj", "{2905FF23-53FB-45E6-AA49-6AF47A172056}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.UnitTests", "Perspex.UnitTests\Perspex.UnitTests.csproj", "{2905FF23-53FB-45E6-AA49-6AF47A172056}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1", "Perspex.Direct2D1\Perspex.Direct2D1.csproj", "{3E908F67-5543-4879-A1DC-08EACE79B3CD}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1", "Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj", "{3E908F67-5543-4879-A1DC-08EACE79B3CD}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1.RenderTests", "Perspex.Direct2D1.RenderTests\Perspex.Direct2D1.RenderTests.csproj", "{DABFD304-D6A4-4752-8123-C2CCF7AC7831}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1.RenderTests", "Windows\Perspex.Direct2D1.RenderTests\Perspex.Direct2D1.RenderTests.csproj", "{DABFD304-D6A4-4752-8123-C2CCF7AC7831}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Base", "Perspex.Base\Perspex.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Base", "Perspex.Base\Perspex.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
EndProject EndProject

4
TestApplication/App.cs
View File

@ -3,7 +3,7 @@
using Perspex; using Perspex;
using Perspex.Direct2D1; using Perspex.Direct2D1;
using Perspex.Themes.Default; using Perspex.Themes.Default;
using Perspex.Windows; using Perspex.Win32;
public class App : Application public class App : Application
{ {
@ -12,7 +12,7 @@
{ {
this.RegisterServices(); this.RegisterServices();
Direct2D1Platform.Initialize(); Direct2D1Platform.Initialize();
WindowsPlatform.Initialize(); Win32Platform.Initialize();
} }
} }
} }

2
TestApplication/Program.cs
View File

@ -6,7 +6,7 @@ using Perspex.Diagnostics;
using Perspex.Layout; using Perspex.Layout;
using Perspex.Media; using Perspex.Media;
using Perspex.Media.Imaging; using Perspex.Media.Imaging;
using Perspex.Windows; using Perspex.Win32;
using Splat; using Splat;
namespace TestApplication namespace TestApplication

4
TestApplication/TestApplication.csproj
View File

@ -112,7 +112,7 @@
<Project>{7062ae20-5dcc-4442-9645-8195bdece63e}</Project> <Project>{7062ae20-5dcc-4442-9645-8195bdece63e}</Project>
<Name>Perspex.Diagnostics</Name> <Name>Perspex.Diagnostics</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Perspex.Direct2D1\Perspex.Direct2D1.csproj"> <ProjectReference Include="..\Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj">
<Project>{3e908f67-5543-4879-a1dc-08eace79b3cd}</Project> <Project>{3e908f67-5543-4879-a1dc-08eace79b3cd}</Project>
<Name>Perspex.Direct2D1</Name> <Name>Perspex.Direct2D1</Name>
</ProjectReference> </ProjectReference>
@ -140,7 +140,7 @@
<Project>{3e10a5fa-e8da-48b1-ad44-6a5b6cb7750f}</Project> <Project>{3e10a5fa-e8da-48b1-ad44-6a5b6cb7750f}</Project>
<Name>Perspex.Themes.Default</Name> <Name>Perspex.Themes.Default</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Perspex.Windows\Perspex.Windows.csproj"> <ProjectReference Include="..\Windows\Perspex.Win32\Perspex.Win32.csproj">
<Project>{811a76cf-1cf6-440f-963b-bbe31bd72a82}</Project> <Project>{811a76cf-1cf6-440f-963b-bbe31bd72a82}</Project>
<Name>Perspex.Windows</Name> <Name>Perspex.Windows</Name>
</ProjectReference> </ProjectReference>

0
Perspex.Direct2D1.RenderTests/Controls/BorderTests.cs → Windows/Perspex.Direct2D1.RenderTests/Controls/BorderTests.cs
View File

0
Perspex.Direct2D1.RenderTests/Controls/ImageTests.cs → Windows/Perspex.Direct2D1.RenderTests/Controls/ImageTests.cs
View File

18
Perspex.Direct2D1.RenderTests/Perspex.Direct2D1.RenderTests.csproj → Windows/Perspex.Direct2D1.RenderTests/Perspex.Direct2D1.RenderTests.csproj
View File

@ -37,11 +37,11 @@
<ItemGroup> <ItemGroup>
<Reference Include="Magick.NET-x86, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=x86"> <Reference Include="Magick.NET-x86, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Magick.NET-Q16-x86.7.0.0.0007\lib\net40-client\Magick.NET-x86.dll</HintPath> <HintPath>..\..\packages\Magick.NET-Q16-x86.7.0.0.0007\lib\net40-client\Magick.NET-x86.dll</HintPath>
</Reference> </Reference>
<Reference Include="Splat, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Splat, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Splat.1.5.1\lib\Net45\Splat.dll</HintPath> <HintPath>..\..\packages\Splat.1.5.1\lib\Net45\Splat.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
@ -67,11 +67,11 @@
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Perspex.Base\Perspex.Base.csproj"> <ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
<Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project> <Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
<Name>Perspex.Base</Name> <Name>Perspex.Base</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Perspex.Controls\Perspex.Controls.csproj"> <ProjectReference Include="..\..\Perspex.Controls\Perspex.Controls.csproj">
<Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project> <Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
<Name>Perspex.Controls</Name> <Name>Perspex.Controls</Name>
</ProjectReference> </ProjectReference>
@ -79,23 +79,23 @@
<Project>{3e908f67-5543-4879-a1dc-08eace79b3cd}</Project> <Project>{3e908f67-5543-4879-a1dc-08eace79b3cd}</Project>
<Name>Perspex.Direct2D1</Name> <Name>Perspex.Direct2D1</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Perspex.Input\Perspex.Input.csproj"> <ProjectReference Include="..\..\Perspex.Input\Perspex.Input.csproj">
<Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project> <Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
<Name>Perspex.Input</Name> <Name>Perspex.Input</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Perspex.Interactivity\Perspex.Interactivity.csproj"> <ProjectReference Include="..\..\Perspex.Interactivity\Perspex.Interactivity.csproj">
<Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project> <Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
<Name>Perspex.Interactivity</Name> <Name>Perspex.Interactivity</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Perspex.Layout\Perspex.Layout.csproj"> <ProjectReference Include="..\..\Perspex.Layout\Perspex.Layout.csproj">
<Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project> <Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
<Name>Perspex.Layout</Name> <Name>Perspex.Layout</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Perspex.SceneGraph\Perspex.SceneGraph.csproj"> <ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
<Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project> <Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
<Name>Perspex.SceneGraph</Name> <Name>Perspex.SceneGraph</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Perspex.Styling\Perspex.Styling.csproj"> <ProjectReference Include="..\..\Perspex.Styling\Perspex.Styling.csproj">
<Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project> <Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
<Name>Perspex.Styling</Name> <Name>Perspex.Styling</Name>
</ProjectReference> </ProjectReference>

0
Perspex.Direct2D1.RenderTests/Properties/AssemblyInfo.cs → Windows/Perspex.Direct2D1.RenderTests/Properties/AssemblyInfo.cs
View File

0
Perspex.Direct2D1.RenderTests/Shapes/PathTests.cs → Windows/Perspex.Direct2D1.RenderTests/Shapes/PathTests.cs
View File

0
Perspex.Direct2D1.RenderTests/Shapes/RectangleTests.cs → Windows/Perspex.Direct2D1.RenderTests/Shapes/RectangleTests.cs
View File

0
Perspex.Direct2D1.RenderTests/TestBase.cs → Windows/Perspex.Direct2D1.RenderTests/TestBase.cs
View File

0
Perspex.Direct2D1.RenderTests/app.config → Windows/Perspex.Direct2D1.RenderTests/app.config
View File

0
Perspex.Direct2D1.RenderTests/packages.config → Windows/Perspex.Direct2D1.RenderTests/packages.config
View File

0
Perspex.Direct2D1/Direct2D1Platform.cs → Windows/Perspex.Direct2D1/Direct2D1Platform.cs
View File

0
Perspex.Direct2D1/Media/DrawingContext.cs → Windows/Perspex.Direct2D1/Media/DrawingContext.cs
View File

0
Perspex.Direct2D1/Media/GeometryImpl.cs → Windows/Perspex.Direct2D1/Media/GeometryImpl.cs
View File

0
Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs → Windows/Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs
View File

0
Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs → Windows/Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs
View File

0
Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs → Windows/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs
View File

0
Perspex.Direct2D1/Media/StreamGeometryImpl.cs → Windows/Perspex.Direct2D1/Media/StreamGeometryImpl.cs
View File

16
Perspex.Direct2D1/Perspex.Direct2D1.csproj → Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj
View File

@ -45,22 +45,22 @@
</Reference> </Reference>
<Reference Include="Splat, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Splat, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Splat.1.5.1\lib\Net45\Splat.dll</HintPath> <HintPath>..\..\packages\Splat.1.5.1\lib\Net45\Splat.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath> <HintPath>..\..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath> <HintPath>..\..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath> <HintPath>..\..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
@ -87,22 +87,22 @@
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Perspex.Base\Perspex.Base.csproj"> <ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
<Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project> <Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
<Name>Perspex.Base</Name> <Name>Perspex.Base</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Perspex.SceneGraph\Perspex.SceneGraph.csproj"> <ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
<Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project> <Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
<Name>Perspex.SceneGraph</Name> <Name>Perspex.SceneGraph</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\SharpDX.2.6.3\build\SharpDX.targets" Condition="Exists('..\packages\SharpDX.2.6.3\build\SharpDX.targets')" /> <Import Project="..\..\packages\SharpDX.2.6.3\build\SharpDX.targets" Condition="Exists('..\..\packages\SharpDX.2.6.3\build\SharpDX.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('..\packages\SharpDX.2.6.3\build\SharpDX.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SharpDX.2.6.3\build\SharpDX.targets'))" /> <Error Condition="!Exists('..\..\packages\SharpDX.2.6.3\build\SharpDX.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SharpDX.2.6.3\build\SharpDX.targets'))" />
</Target> </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

0
Perspex.Direct2D1/PrimitiveExtensions.cs → Windows/Perspex.Direct2D1/PrimitiveExtensions.cs
View File

0
Perspex.Direct2D1/Properties/AssemblyInfo.cs → Windows/Perspex.Direct2D1/Properties/AssemblyInfo.cs
View File

0
Perspex.Direct2D1/Renderer.cs → Windows/Perspex.Direct2D1/Renderer.cs
View File

0
Perspex.Direct2D1/TextService.cs → Windows/Perspex.Direct2D1/TextService.cs
View File

0
Perspex.Direct2D1/app.config → Windows/Perspex.Direct2D1/app.config
View File

0
Perspex.Direct2D1/packages.config → Windows/Perspex.Direct2D1/packages.config
View File

4
Perspex.Windows/Input/KeyInterop.cs → Windows/Perspex.Win32/Input/KeyInterop.cs
View File

@ -4,12 +4,12 @@
// </copyright> // </copyright>
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
namespace Perspex.Windows.Input namespace Perspex.Win32.Input
{ {
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using Perspex.Input; using Perspex.Input;
using Perspex.Windows.Interop; using Perspex.Win32.Interop;
public static class KeyInterop public static class KeyInterop
{ {

4
Perspex.Windows/Input/WindowsKeyboardDevice.cs → Windows/Perspex.Win32/Input/WindowsKeyboardDevice.cs
View File

@ -4,11 +4,11 @@
// </copyright> // </copyright>
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
namespace Perspex.Windows.Input namespace Perspex.Win32.Input
{ {
using System.Text; using System.Text;
using Perspex.Input; using Perspex.Input;
using Perspex.Windows.Interop; using Perspex.Win32.Interop;
public class WindowsKeyboardDevice : KeyboardDevice public class WindowsKeyboardDevice : KeyboardDevice
{ {

4
Perspex.Windows/Input/WindowsMouseDevice.cs → Windows/Perspex.Win32/Input/WindowsMouseDevice.cs
View File

@ -4,11 +4,11 @@
// </copyright> // </copyright>
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
namespace Perspex.Windows.Input namespace Perspex.Win32.Input
{ {
using System; using System;
using Perspex.Input; using Perspex.Input;
using Perspex.Windows.Interop; using Perspex.Win32.Interop;
public class WindowsMouseDevice : MouseDevice public class WindowsMouseDevice : MouseDevice
{ {

2
Perspex.Windows/Interop/UnmanagedMethods.cs → Windows/Perspex.Win32/Interop/UnmanagedMethods.cs
View File

@ -4,7 +4,7 @@
// </copyright> // </copyright>
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
namespace Perspex.Windows.Interop namespace Perspex.Win32.Interop
{ {
using System; using System;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;

38
Perspex.Windows/Perspex.Windows.csproj → Windows/Perspex.Win32/Perspex.Win32.csproj
View File

@ -7,8 +7,8 @@
<ProjectGuid>{811A76CF-1CF6-440F-963B-BBE31BD72A82}</ProjectGuid> <ProjectGuid>{811A76CF-1CF6-440F-963B-BBE31BD72A82}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Perspex.Windows</RootNamespace> <RootNamespace>Perspex.Win32</RootNamespace>
<AssemblyName>Perspex.Windows</AssemblyName> <AssemblyName>Perspex.Win32</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
</PropertyGroup> </PropertyGroup>
@ -32,26 +32,26 @@
<ItemGroup> <ItemGroup>
<Reference Include="Splat, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Splat, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Splat.1.5.1\lib\Net45\Splat.dll</HintPath> <HintPath>..\..\packages\Splat.1.5.1\lib\Net45\Splat.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath> <HintPath>..\..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath> <HintPath>..\..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath> <HintPath>..\..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath> <HintPath>..\..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
@ -68,42 +68,42 @@
<Compile Include="Interop\UnmanagedMethods.cs" /> <Compile Include="Interop\UnmanagedMethods.cs" />
<Compile Include="Window.cs" /> <Compile Include="Window.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="WindowsPlatform.cs" /> <Compile Include="Win32Platform.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config" /> <None Include="app.config" />
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Perspex.Base\Perspex.Base.csproj"> <ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
<Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project> <Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
<Name>Perspex.Base</Name> <Name>Perspex.Base</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Perspex.Controls\Perspex.Controls.csproj"> <ProjectReference Include="..\..\Perspex.Controls\Perspex.Controls.csproj">
<Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project> <Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
<Name>Perspex.Controls</Name> <Name>Perspex.Controls</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Perspex.Diagnostics\Perspex.Diagnostics.csproj"> <ProjectReference Include="..\..\Perspex.Diagnostics\Perspex.Diagnostics.csproj">
<Project>{7062ae20-5dcc-4442-9645-8195bdece63e}</Project> <Project>{7062ae20-5dcc-4442-9645-8195bdece63e}</Project>
<Name>Perspex.Diagnostics</Name> <Name>Perspex.Diagnostics</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Perspex.Input\Perspex.Input.csproj"> <ProjectReference Include="..\..\Perspex.Input\Perspex.Input.csproj">
<Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project> <Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
<Name>Perspex.Input</Name> <Name>Perspex.Input</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Perspex.Interactivity\Perspex.Interactivity.csproj"> <ProjectReference Include="..\..\Perspex.Interactivity\Perspex.Interactivity.csproj">
<Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project> <Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
<Name>Perspex.Interactivity</Name> <Name>Perspex.Interactivity</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Perspex.Layout\Perspex.Layout.csproj"> <ProjectReference Include="..\..\Perspex.Layout\Perspex.Layout.csproj">
<Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project> <Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
<Name>Perspex.Layout</Name> <Name>Perspex.Layout</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Perspex.SceneGraph\Perspex.SceneGraph.csproj"> <ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
<Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project> <Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
<Name>Perspex.SceneGraph</Name> <Name>Perspex.SceneGraph</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Perspex.Styling\Perspex.Styling.csproj"> <ProjectReference Include="..\..\Perspex.Styling\Perspex.Styling.csproj">
<Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project> <Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
<Name>Perspex.Styling</Name> <Name>Perspex.Styling</Name>
</ProjectReference> </ProjectReference>
@ -117,7 +117,7 @@
</Target> </Target>
--> -->
<PropertyGroup> <PropertyGroup>
<StyleCopMSBuildTargetsFile>..\packages\StyleCop.MSBuild.4.7.46.0\tools\StyleCop.targets</StyleCopMSBuildTargetsFile> <StyleCopMSBuildTargetsFile>..\..\packages\StyleCop.MSBuild.4.7.46.0\tools\StyleCop.targets</StyleCopMSBuildTargetsFile>
</PropertyGroup> </PropertyGroup>
<Import Condition="Exists('$(StyleCopMSBuildTargetsFile)')" Project="$(StyleCopMSBuildTargetsFile)" /> <Import Condition="Exists('$(StyleCopMSBuildTargetsFile)')" Project="$(StyleCopMSBuildTargetsFile)" />
<PropertyGroup> <PropertyGroup>
@ -139,11 +139,11 @@
<PropertyGroup> <PropertyGroup>
<PrepareForBuildDependsOn Condition="!Exists('$(StyleCopMSBuildTargetsFile)')">StyleCopMSBuildTargetsNotFound;$(PrepareForBuildDependsOn)</PrepareForBuildDependsOn> <PrepareForBuildDependsOn Condition="!Exists('$(StyleCopMSBuildTargetsFile)')">StyleCopMSBuildTargetsNotFound;$(PrepareForBuildDependsOn)</PrepareForBuildDependsOn>
</PropertyGroup> </PropertyGroup>
<Import Project="..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" /> <Import Project="..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets'))" /> <Error Condition="!Exists('..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets'))" />
</Target> </Target>
</Project> </Project>

4
Perspex.Windows/Properties/AssemblyInfo.cs → Windows/Perspex.Win32/Properties/AssemblyInfo.cs
View File

@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information // set of attributes. Change these attribute values to modify the information
// associated with an assembly. // associated with an assembly.
[assembly: AssemblyTitle("Perspex.Windows")] [assembly: AssemblyTitle("Perspex.Win32")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Perspex.Windows")] [assembly: AssemblyProduct("Perspex.Win32")]
[assembly: AssemblyCopyright("Copyright © 2013")] [assembly: AssemblyCopyright("Copyright © 2013")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]

0
Perspex.Windows/Settings.StyleCop → Windows/Perspex.Win32/Settings.StyleCop
View File

4
Perspex.Windows/Threading/WindowsDispatcher.cs → Windows/Perspex.Win32/Threading/WindowsDispatcher.cs
View File

@ -4,7 +4,7 @@
// </copyright> // </copyright>
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
namespace Perspex.Windows.Threading namespace Perspex.Win32.Threading
{ {
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -12,7 +12,7 @@ namespace Perspex.Windows.Threading
using System.Security; using System.Security;
using System.Threading; using System.Threading;
using Perspex.Threading; using Perspex.Threading;
using Perspex.Windows.Interop; using Perspex.Win32.Interop;
[Flags] [Flags]
internal enum Flags internal enum Flags

12
Perspex.Windows/WindowsPlatform.cs → Windows/Perspex.Win32/Win32Platform.cs
View File

@ -4,21 +4,21 @@
// </copyright> // </copyright>
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
namespace Perspex.Windows namespace Perspex.Win32
{ {
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Perspex.Input; using Perspex.Input;
using Perspex.Platform; using Perspex.Platform;
using Perspex.Threading; using Perspex.Threading;
using Perspex.Windows.Input; using Perspex.Win32.Input;
using Perspex.Windows.Interop; using Perspex.Win32.Interop;
using Perspex.Windows.Threading; using Perspex.Win32.Threading;
using Splat; using Splat;
public class WindowsPlatform : IPlatformThreadingInterface public class Win32Platform : IPlatformThreadingInterface
{ {
private static WindowsPlatform instance = new WindowsPlatform(); private static Win32Platform instance = new Win32Platform();
private Dictionary<IntPtr, UnmanagedMethods.TimerProc> timerCallbacks = private Dictionary<IntPtr, UnmanagedMethods.TimerProc> timerCallbacks =
new Dictionary<IntPtr, UnmanagedMethods.TimerProc>(); new Dictionary<IntPtr, UnmanagedMethods.TimerProc>();

8
Perspex.Windows/Window.cs → Windows/Perspex.Win32/Window.cs
View File

@ -4,7 +4,7 @@
// </copyright> // </copyright>
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
namespace Perspex.Windows namespace Perspex.Win32
{ {
using System; using System;
using System.ComponentModel; using System.ComponentModel;
@ -20,9 +20,9 @@ namespace Perspex.Windows
using Perspex.Platform; using Perspex.Platform;
using Perspex.Rendering; using Perspex.Rendering;
using Perspex.Threading; using Perspex.Threading;
using Perspex.Windows.Input; using Perspex.Win32.Input;
using Perspex.Windows.Interop; using Perspex.Win32.Interop;
using Perspex.Windows.Threading; using Perspex.Win32.Threading;
using Splat; using Splat;
public class Window : ContentControl, ILayoutRoot, IRenderRoot, ICloseable public class Window : ContentControl, ILayoutRoot, IRenderRoot, ICloseable

0
Perspex.Windows/app.config → Windows/Perspex.Win32/app.config
View File

0
Perspex.Windows/packages.config → Windows/Perspex.Win32/packages.config
View File

Write Preview
Loading…
Cancel
Save