Skip to content
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
cec5bd6
Added the Win2d Path Geometry parser.
ratishphilip Sep 26, 2020
298d22f
Merge branch 'master' into feature/win2dparser
ratishphilip Sep 29, 2020
36c5617
Merge branch 'master' into feature/win2dparser
ratishphilip Oct 15, 2020
34306d7
Merge branch 'master' into feature/win2dparser
ratishphilip Oct 21, 2020
d6d39de
Added unit test cases for Geometry Helpers.
ratishphilip Dec 16, 2020
983a3ce
Merge branch 'feature/win2dparser' of https://github.com/ratishphilip…
ratishphilip Dec 16, 2020
609e249
updated SampleApp.csproj file to resolve conflict
ratishphilip Dec 16, 2020
7f8162a
Merge branch 'master' into feature/win2dparser
ratishphilip Dec 16, 2020
0daee1e
Updated headers.
ratishphilip Dec 16, 2020
d8e1753
Merge branch 'feature/win2dparser' of https://github.com/ratishphilip…
ratishphilip Dec 16, 2020
1ec440a
Fixed build errors. Removed unused usings.
ratishphilip Dec 16, 2020
16db83d
Merge branch 'master' into feature/win2dparser
ratishphilip Dec 18, 2020
155dc64
Merge branch 'master' into feature/win2dparser
ratishphilip Dec 18, 2020
874579c
Merge branch 'master' into feature/win2dparser
ratishphilip Jan 3, 2021
7360ed9
Merge branch 'master' into feature/win2dparser
ratishphilip Jan 7, 2021
d82454d
Merge branch 'master' into feature/win2dparser
ratishphilip Jan 9, 2021
46e88b1
Merge branch 'master' into feature/win2dparser
ratishphilip Jan 12, 2021
b61a631
Implemented changes based on Sergio's review comments.
ratishphilip Jan 17, 2021
78720bc
Merge branch 'master' into feature/win2dparser
ratishphilip Jan 17, 2021
d26c3ec
Fixed build errors. (Added default option for switch case)
ratishphilip Jan 17, 2021
3b69aed
Merge branch 'feature/win2dparser' of https://github.com/ratishphilip…
ratishphilip Jan 17, 2021
cba88e9
Removed ThrowHelper.ThrowNullReferenceException which I had added.
ratishphilip Jan 18, 2021
f419f2c
Using ThrowHelper.ThrowArgument exception instead of ThrowHelper.Thro…
ratishphilip Jan 18, 2021
31eeae1
Implemented Xamllama's severl code review comments.
ratishphilip Jan 18, 2021
8a195a1
Merge branch 'master' into feature/win2dparser
ratishphilip Jan 19, 2021
42f9b5c
Added more TestCases as per code review comments.
ratishphilip Jan 20, 2021
693ddf7
Merge branch 'feature/win2dparser' of https://github.com/ratishphilip…
ratishphilip Jan 20, 2021
16fb788
Merge branch 'master' into feature/win2dparser
ratishphilip Jan 20, 2021
30a5040
Removed logger from CanvasPathGeometry. Using ICanvasPathReceiver in …
ratishphilip Jan 22, 2021
c3a31f3
Merge branch 'feature/win2dparser' of https://github.com/ratishphilip…
ratishphilip Jan 22, 2021
530e722
Merge branch 'master' into feature/win2dparser
ratishphilip Jan 22, 2021
37a70ef
Parsing CanvasGeometry on Input change.
ratishphilip Jan 22, 2021
d61d202
Csproj fixes
ratishphilip Jan 22, 2021
eb7d40d
SampleApp.csproj build failure fix.
ratishphilip Jan 22, 2021
7d756c5
Build error fix.
ratishphilip Jan 22, 2021
6c63198
Merge branch 'master' into feature/win2dparser
michael-hawker Jan 22, 2021
e618fc7
CanvasGeometry path parse error now more descriptive in the Sample App.
ratishphilip Jan 22, 2021
b7a9fed
Merge branch 'feature/win2dparser' of https://github.com/ratishphilip…
ratishphilip Jan 22, 2021
be42cc5
Merge branch 'master' into feature/win2dparser
ratishphilip Jan 27, 2021
ef27c15
Merge branch 'master' into feature/win2dparser
ratishphilip Jan 28, 2021
46d93c0
Merge branch 'master' into feature/win2dparser
ratishphilip Jan 29, 2021
3e55f52
Sample app now switches to Commands List pivot item to show the parsi…
ratishphilip Jan 30, 2021
2f6f192
Merge branch 'feature/win2dparser' of https://github.com/ratishphilip…
ratishphilip Jan 30, 2021
90f1cb7
Merge branch 'master' into feature/win2dparser
ratishphilip Feb 2, 2021
67e3842
Merge branch 'master' into feature/win2dparser
Sergio0694 Feb 4, 2021
4bafb55
Refactored removed Diagnostics dependency
Sergio0694 Feb 4, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@
<Content Include="SamplePages\Eyedropper\Eyedropper.png" />
<Content Include="SamplePages\OnDevice\OnDevice.png" />
<Content Include="SamplePages\AcrylicBrush\AcrylicBrush.png" />
<Content Include="SamplePages\CanvasPathGeometry\CanvasPathGeometry.png" />
<Content Include="SamplePages\PipelineBrush\PipelineBrush.png" />
<Content Include="SamplePages\RemoteDeviceHelper\RemoteDeviceHelper.png" />
<Content Include="SamplePages\ImageCropper\ImageCropper.png" />
Expand Down Expand Up @@ -516,6 +517,9 @@
<Compile Include="SamplePages\EnumValuesExtension\EnumValuesExtensionPage.xaml.cs">
<DependentUpon>EnumValuesExtensionPage.xaml</DependentUpon>
</Compile>
<Compile Include="SamplePages\CanvasPathGeometry\CanvasPathGeometryPage.xaml.cs">
<DependentUpon>CanvasPathGeometryPage.xaml</DependentUpon>
</Compile>
<Compile Include="SamplePages\FocusBehavior\FocusBehaviorPage.xaml.cs">
<DependentUpon>FocusBehaviorPage.xaml</DependentUpon>
</Compile>
Expand Down Expand Up @@ -997,6 +1001,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="SamplePages\CanvasPathGeometry\CanvasPathGeometryPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="SamplePages\TilesBrush\TilesBrushPage.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.CanvasPathGeometryPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:xaml="using:Microsoft.Graphics.Canvas.UI.Xaml"
mc:Ignorable="d">

<Grid Padding="10">
<Grid.RowDefinitions>
<RowDefinition Height="0.1*" />
<RowDefinition Height="48" />
<RowDefinition Height="0.9*" />
</Grid.RowDefinitions>
<TextBox x:Name="InputData"
Margin="10,3"
FontFamily="Courier New"
FontSize="14"
PlaceholderText="Enter SVG/XAML Path Data and press Parse. (Or select a sample from the Samples list below)"
ScrollViewer.VerticalScrollBarVisibility="Auto"
SelectionHighlightColor="#007aff"
Text="{x:Bind InputText, Mode=TwoWay}"
TextWrapping="Wrap" />
<StackPanel Grid.Row="1"
HorizontalAlignment="Left"
Orientation="Horizontal">
<TextBlock Margin="12,3"
VerticalAlignment="Center"
Text="Samples: " />
<ComboBox x:Name="SampleList"
Width="150"
Height="30"
Margin="0,4,10,4"
VerticalAlignment="Center"
SelectionChanged="{x:Bind OnSampleChanged}" />
</StackPanel>
<Button Grid.Row="1"
Width="120"
Height="36"
Margin="10,3"
HorizontalAlignment="Center"
Click="{x:Bind OnClearCanvas}"
Content="Clear" />
<Button Grid.Row="1"
Width="120"
Height="36"
Margin="10,3"
HorizontalAlignment="Right"
Click="{x:Bind OnParseData}"
Content="Parse" />
<Pivot x:Name="RootPivot"
Grid.Row="2">
<PivotItem Foreground="Black"
Header="Canvas">
<ScrollViewer x:Name="RenderScroll"
HorizontalScrollBarVisibility="Auto"
VerticalScrollBarVisibility="Auto">
<xaml:CanvasControl x:Name="RenderCanvas"
Width="{Binding ElementName=RenderScroll, Path=ActualWidth}"
Height="{Binding ElementName=RenderScroll, Path=ActualHeight}"
MinWidth="1200"
MinHeight="800"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
HorizontalContentAlignment="Stretch"
VerticalContentAlignment="Stretch"
ClearColor="#A7A7A7"
Draw="{x:Bind OnCanvasDraw}" />
</ScrollViewer>
</PivotItem>
<PivotItem Foreground="Black"
Header="Commands">
<ScrollViewer Background="#272727"
HorizontalScrollBarVisibility="Disabled"
VerticalScrollBarVisibility="Auto">
<TextBlock x:Name="CommandsList"
Padding="10"
FontFamily="Courier New"
FontSize="16"
Foreground="White"
IsTextSelectionEnabled="True"
SelectionHighlightColor="#007aff"
TextWrapping="Wrap" />
</ScrollViewer>
</PivotItem>
</Pivot>
<StackPanel Grid.Row="2"
HorizontalAlignment="Right"
VerticalAlignment="Top"
Orientation="Horizontal">
<TextBlock Margin="10,10,5,-10"
Text="StrokeThickness" />
<Slider x:Name="StrokeThickness"
Width="150"
Height="30"
Margin="0,4,10,4"
Background="White"
Foreground="White"
Maximum="10"
Minimum="0"
StepFrequency="0.1"
ValueChanged="{x:Bind OnStrokeThicknessChanged}" />
<TextBlock Margin="10,10,5,-10"
Text="Stroke Color: " />
<ComboBox x:Name="StrokeList"
Width="150"
Height="30"
Margin="0,4,10,4"
SelectionChanged="{x:Bind OnStrokeColorChanged}" />
<TextBlock Margin="10,10,5,-10"
Text="Fill Color: " />
<ComboBox x:Name="FillList"
Width="150"
Height="30"
Margin="0,4,10,4"
SelectionChanged="{x:Bind OnFillColorChanged}" />
</StackPanel>
</Grid>
</Page>
Loading