From 7333b8c465243b66eaf23207932022c22b7da5a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Nieto=20S=C3=A1nchez?= Date: Sun, 18 Oct 2015 16:36:13 +0200 Subject: [PATCH] Improved XamlTestApplication + new GeometryConverter --- .../XamlTestApplication.csproj | 4 + .../Views/MainWindow.paml | 250 ++++++++++++------ .../XamlTestApplicationPcl.csproj | 3 + samples/XamlTestApplicationPcl/pattern.jpg | Bin 0 -> 136642 bytes .../Context/PerspexWiringContext.cs | 3 +- .../Converters/GeometryTypeConverter.cs | 30 +++ .../Perspex.Markup.Xaml.csproj | 1 + .../Properties/AssemblyInfo.cs | 3 + src/Perspex.SceneGraph/Media/Geometry.cs | 2 +- 9 files changed, 215 insertions(+), 81 deletions(-) create mode 100644 samples/XamlTestApplicationPcl/pattern.jpg create mode 100644 src/Markup/Perspex.Markup.Xaml/Converters/GeometryTypeConverter.cs diff --git a/samples/XamlTestApplication/XamlTestApplication.csproj b/samples/XamlTestApplication/XamlTestApplication.csproj index d384db9372..42aaf4be21 100644 --- a/samples/XamlTestApplication/XamlTestApplication.csproj +++ b/samples/XamlTestApplication/XamlTestApplication.csproj @@ -104,6 +104,10 @@ {7062AE20-5DCC-4442-9645-8195BDECE63E} Perspex.Diagnostics + + {5fb2b005-0a7f-4dad-add4-3ed01444e63d} + Perspex.HtmlRenderer + {62024B2D-53EB-4638-B26B-85EEAA54866E} Perspex.Input diff --git a/samples/XamlTestApplicationPcl/Views/MainWindow.paml b/samples/XamlTestApplicationPcl/Views/MainWindow.paml index 3dfac47f36..1d234dc657 100644 --- a/samples/XamlTestApplicationPcl/Views/MainWindow.paml +++ b/samples/XamlTestApplicationPcl/Views/MainWindow.paml @@ -1,106 +1,198 @@  + Title="Perspex Test Application" Width="800" Height="600"> - - - - - + + + + + + + + + + + + + - - - + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - + + - - - + + + + + + + + + + + - - - - - - -