From 12a82874e353cf540fd7e1b4c178ee9fb2e6f804 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sat, 17 Oct 2015 07:10:58 +0300 Subject: [PATCH 1/6] nuget --- nuget/template/Perspex.Desktop.nuspec | 1 + nuget/template/Perspex.nuspec | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/nuget/template/Perspex.Desktop.nuspec b/nuget/template/Perspex.Desktop.nuspec index b94e9c54f0..2c78dc9c8c 100644 --- a/nuget/template/Perspex.Desktop.nuspec +++ b/nuget/template/Perspex.Desktop.nuspec @@ -24,6 +24,7 @@ + \ No newline at end of file diff --git a/nuget/template/Perspex.nuspec b/nuget/template/Perspex.nuspec index 7c55e7aaf6..ece9b0db9c 100644 --- a/nuget/template/Perspex.nuspec +++ b/nuget/template/Perspex.nuspec @@ -21,7 +21,6 @@ - \ No newline at end of file From b2ff5f807d016b03334d84ec6040e49294ca4fef Mon Sep 17 00:00:00 2001 From: Darnell Williams Date: Sat, 17 Oct 2015 14:10:50 -0400 Subject: [PATCH 2/6] Corrected Styling Info * Corrected Formatting Issue with Styling info --- docs/styles.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/styles.md b/docs/styles.md index 755f097295..89d5348397 100644 --- a/docs/styles.md +++ b/docs/styles.md @@ -31,9 +31,9 @@ Make all `Button`s in a `StackPanel` have a blue `Background`: This is very similar to WPF, except `TargetType` is replaced by `Selector`. -*Note that currently (as of Alpha 2) you **always** need to specify the fully +_Note that currently (as of Alpha 2) you **always** need to specify the fully qualified property name (i.e. `Button.Background` instead of simply -`Background`). This restriction will be lifted in future.* +`Background`). This restriction will be lifted in future._ ## Style Classes From 3992abded8dc12234027743d076dcd674737421d Mon Sep 17 00:00:00 2001 From: Darnell Williams Date: Sat, 17 Oct 2015 14:20:41 -0400 Subject: [PATCH 3/6] Update intro.md --- docs/intro.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/intro.md b/docs/intro.md index 1022a1af1d..85a457a385 100644 --- a/docs/intro.md +++ b/docs/intro.md @@ -35,7 +35,7 @@ I'm not a big fan of DependencyProperty. My first thought was that I'd rather no like this at all and just use basic INPC but DPs give you two important features: Inheritance and Attached Properties. So the challenge became to improve it. -Delaring a DP in WPF looks something like this: +Declaring a DependencyProperty in WPF looks something like this: ```csharp public static readonly DependencyProperty PropertyDeclaration = @@ -198,7 +198,7 @@ all controls in the the visual tree of type CheckBox*". A more complex selector: new Style(x => x.OfType().Class(":checked").Template().Id("checkMark")) ``` -This selector matches "*all controls with Id == "checkMark" in the template of a CheckBox with the +This selector matches *"all controls with Id == "checkMark" in the template of a CheckBox with the class `:checked`"*. Each control has an Id property, and Ids in templates are considered to be in a separate namespace. @@ -215,7 +215,7 @@ different look-and-feel. ## XAML As you can see, all of the examples here are defined in code - but a XAML implementation is being -worked on. The current progress can be reviewed at https://github.com/SuperJMN/Perspex. +worked on. The current progress can be reviewed at [https://github.com/SuperJMN/Perspex](https://github.com/SuperJMN/Perspex). ## That's all for now 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 4/6] 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"> - - - - - + + + + + + + + + + + + + - - - + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - + + - - - + + + + + + + + + + + - - - - - - -