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

Added Cairo and Gtk backends back in. 

Added the to main Perspex.sln - there's no point having a separate Perspex-Mono.sln because things just get out of date immediately.
pull/83/head
Steven Kirk 11 years ago
parent
f08220c599
commit
214fb2b65f
15 changed files with 26 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      Perspex.sln
  2. 2
      samples/XamlTestApplication/XamlTestApplication.csproj
  3. 2
      src/Gtk/Perspex.Cairo/CairoExtensions.cs
  4. 0
      src/Gtk/Perspex.Cairo/CairoPlatform.cs
  5. 1
      src/Gtk/Perspex.Cairo/Media/DrawingContext.cs
  6. 2
      src/Gtk/Perspex.Cairo/Media/FormattedTextImpl.cs
  7. 0
      src/Gtk/Perspex.Cairo/Media/Imaging/BitmapImpl.cs
  8. 0
      src/Gtk/Perspex.Cairo/Media/Imaging/RenderTargetBitmapImpl.cs
  9. 0
      src/Gtk/Perspex.Cairo/Media/StreamGeometryContextImpl.cs
  10. 0
      src/Gtk/Perspex.Cairo/Media/StreamGeometryImpl.cs
  11. 6
      src/Gtk/Perspex.Cairo/Perspex.Cairo.csproj
  12. 0
      src/Gtk/Perspex.Cairo/Properties/AssemblyInfo.cs
  13. 0
      src/Gtk/Perspex.Cairo/Renderer.cs
  14. 0
      src/Gtk/Perspex.Cairo/packages.config
  15. 8
      src/Gtk/Perspex.Gtk/Perspex.Gtk.csproj

16
Perspex.sln
View File

@ -70,6 +70,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{A689DE
src\Shared\SharedAssemblyInfo.cs = src\Shared\SharedAssemblyInfo.cs
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Gtk", "Gtk", "{B9894058-278A-46B5-B6ED-AD613FCC03B3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Gtk", "src\Gtk\Perspex.Gtk\Perspex.Gtk.csproj", "{54F237D5-A70A-4752-9656-0C70B1A7B047}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Cairo", "src\Gtk\Perspex.Cairo\Perspex.Cairo.csproj", "{FB05AC90-89BA-4F2F-A924-F37875FB547C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -180,6 +186,14 @@ Global
{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}.Release|Any CPU.Build.0 = Release|Any CPU
{54F237D5-A70A-4752-9656-0C70B1A7B047}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{54F237D5-A70A-4752-9656-0C70B1A7B047}.Debug|Any CPU.Build.0 = Debug|Any CPU
{54F237D5-A70A-4752-9656-0C70B1A7B047}.Release|Any CPU.ActiveCfg = Release|Any CPU
{54F237D5-A70A-4752-9656-0C70B1A7B047}.Release|Any CPU.Build.0 = Release|Any CPU
{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FB05AC90-89BA-4F2F-A924-F37875FB547C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -200,5 +214,7 @@ Global
{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
{3E53A01A-B331-47F3-B828-4A5717E77A24} = {8B6A8209-894F-4BA1-B880-965FD453982C}
{78CAFE33-DBEB-4132-8A28-81CFE8A4933C} = {9B9E3891-2366-4253-A952-D08BCEB71098}
{54F237D5-A70A-4752-9656-0C70B1A7B047} = {B9894058-278A-46B5-B6ED-AD613FCC03B3}
{FB05AC90-89BA-4F2F-A924-F37875FB547C} = {B9894058-278A-46B5-B6ED-AD613FCC03B3}
EndGlobalSection
EndGlobal

2
samples/XamlTestApplication/XamlTestApplication.csproj
View File

@ -179,7 +179,7 @@
</ProjectReference>
<ProjectReference Include="..\..\src\Markup\Perspex.Markup.Xaml\Perspex.Markup.Xaml.csproj">
<Project>{3e53a01a-b331-47f3-b828-4a5717e77a24}</Project>
<Name>Perspex.Xaml</Name>
<Name>Perspex.Markup.Xaml</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj">
<Project>{3e908f67-5543-4879-a1dc-08eace79b3cd}</Project>

2
src/Cairo/Perspex.Cairo/CairoExtensions.cs → src/Gtk/Perspex.Cairo/CairoExtensions.cs
View File

@ -12,7 +12,7 @@ namespace Perspex.Cairo
{
public static Cairo.Matrix ToCairo(this Matrix m)
{
return new Cairo.Matrix(m.M11, m.M12, m.M21, m.M22, m.OffsetX, m.OffsetY);
return new Cairo.Matrix(m.M11, m.M12, m.M21, m.M22, m.M31, m.M32);
}
public static Cairo.PointD ToCairo(this Point p)

0
src/Cairo/Perspex.Cairo/CairoPlatform.cs → src/Gtk/Perspex.Cairo/CairoPlatform.cs
View File

1
src/Cairo/Perspex.Cairo/Media/DrawingContext.cs → src/Gtk/Perspex.Cairo/Media/DrawingContext.cs
View File

@ -15,7 +15,6 @@ namespace Perspex.Cairo.Media
using IBitmap = Perspex.Media.Imaging.IBitmap;
using System.Collections.Generic;
/// <summary>
/// Draws using Direct2D1.
/// </summary>

2
src/Cairo/Perspex.Cairo/Media/FormattedTextImpl.cs → src/Gtk/Perspex.Cairo/Media/FormattedTextImpl.cs
View File

@ -92,7 +92,7 @@ namespace Perspex.Cairo.Media
return this.Layout.IndexToPos(index).ToPerspex();
}
public IEnumerable<Rect> HitTestTextRange(int index, int length, Point origin)
public IEnumerable<Rect> HitTestTextRange(int index, int length)
{
var ranges = new List<Rect>();

0
src/Cairo/Perspex.Cairo/Media/Imaging/BitmapImpl.cs → src/Gtk/Perspex.Cairo/Media/Imaging/BitmapImpl.cs
View File

0
src/Cairo/Perspex.Cairo/Media/Imaging/RenderTargetBitmapImpl.cs → src/Gtk/Perspex.Cairo/Media/Imaging/RenderTargetBitmapImpl.cs
View File

0
src/Cairo/Perspex.Cairo/Media/StreamGeometryContextImpl.cs → src/Gtk/Perspex.Cairo/Media/StreamGeometryContextImpl.cs
View File

0
src/Cairo/Perspex.Cairo/Media/StreamGeometryImpl.cs → src/Gtk/Perspex.Cairo/Media/StreamGeometryImpl.cs
View File

6
src/Cairo/Perspex.Cairo/Perspex.Cairo.csproj → src/Gtk/Perspex.Cairo/Perspex.Cairo.csproj
View File

@ -45,7 +45,7 @@
<Package>gtk-sharp-2.0</Package>
</Reference>
<Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
<HintPath>..\..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@ -57,10 +57,10 @@
<Reference Include="System.Xml" />
<Reference Include="Mono.Cairo" />
<Reference Include="System.Reactive.Core">
<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 Include="System.Reactive.Interfaces">
<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 Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
<Package>gtk-sharp-2.0</Package>

0
src/Cairo/Perspex.Cairo/Properties/AssemblyInfo.cs → src/Gtk/Perspex.Cairo/Properties/AssemblyInfo.cs
View File

0
src/Cairo/Perspex.Cairo/Renderer.cs → src/Gtk/Perspex.Cairo/Renderer.cs
View File

0
src/Cairo/Perspex.Cairo/packages.config → src/Gtk/Perspex.Cairo/packages.config
View File

8
src/Gtk/Perspex.Gtk/Perspex.Gtk.csproj
View File

@ -31,7 +31,7 @@
</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>
<HintPath>..\..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@ -45,13 +45,13 @@
<Package>gtk-sharp-2.0</Package>
</Reference>
<Reference Include="System.Reactive.Interfaces">
<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 Include="System.Reactive.Core">
<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 Include="System.Reactive.Linq">
<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 Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
<Package>glib-sharp-2.0</Package>

Write Preview
Loading…
Cancel
Save