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

Fix DrawingPage

pull/8732/head
Takoooooo 4 years ago
parent
00c08235cc
commit
f6c506b865
1 changed files with 136 additions and 129 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. 265
      samples/RenderDemo/Pages/DrawingPage.xaml

265
samples/RenderDemo/Pages/DrawingPage.xaml
View File

@ -1,134 +1,141 @@
<UserControl <UserControl
xmlns="https://github.com/avaloniaui" xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="RenderDemo.Pages.DrawingPage"> x:Class="RenderDemo.Pages.DrawingPage">
<UserControl.Styles> <UserControl.Styles>
<Style> <Style>
<Style.Resources> <Style.Resources>
<DrawingGroup x:Key="Bulb"> <DrawingGroup x:Key="Bulb">
<DrawingGroup.Transform> <DrawingGroup.Transform>
<MatrixTransform Matrix="1,0,0,1,0,-1028.4" /> <MatrixTransform Matrix="1,0,0,1,0,-1028.4" />
</DrawingGroup.Transform> </DrawingGroup.Transform>
<DrawingGroup> <DrawingGroup>
<DrawingGroup.Transform> <DrawingGroup.Transform>
<MatrixTransform Matrix="1,0,0,1.25,-10,1031.4" /> <MatrixTransform Matrix="1,0,0,1.25,-10,1031.4" />
</DrawingGroup.Transform> </DrawingGroup.Transform>
<GeometryDrawing Brush="#FF7F8C8D" <GeometryDrawing Brush="#FF7F8C8D"
Geometry="F1 M24,14 A2,2,0,1,1,20,14 A2,2,0,1,1,24,14 z" /> Geometry="F1 M24,14 A2,2,0,1,1,20,14 A2,2,0,1,1,24,14 z" />
</DrawingGroup> </DrawingGroup>
<GeometryDrawing Brush="#FFF39C12" <GeometryDrawing Brush="#FFF39C12"
Geometry="F1 M12,1030.4 C8.134,1030.4 5,1033.6 5,1037.6 5,1040.7 8.125,1043.5 9,1045.4 9.875,1047.2 9,1050.4 9,1050.4 L12,1049.9 15,1050.4 C15,1050.4 14.125,1047.2 15,1045.4 15.875,1043.5 19,1040.7 19,1037.6 19,1033.6 15.866,1030.4 12,1030.4 z" /> Geometry="F1 M12,1030.4 C8.134,1030.4 5,1033.6 5,1037.6 5,1040.7 8.125,1043.5 9,1045.4 9.875,1047.2 9,1050.4 9,1050.4 L12,1049.9 15,1050.4 C15,1050.4 14.125,1047.2 15,1045.4 15.875,1043.5 19,1040.7 19,1037.6 19,1033.6 15.866,1030.4 12,1030.4 z" />
<GeometryDrawing Brush="#FFF1C40F" <GeometryDrawing Brush="#FFF1C40F"
Geometry="F1 M12,1030.4 C15.866,1030.4 19,1033.6 19,1037.6 19,1040.7 15.875,1043.5 15,1045.4 14.125,1047.2 15,1050.4 15,1050.4 L12,1049.9 12,1030.4 z" /> Geometry="F1 M12,1030.4 C15.866,1030.4 19,1033.6 19,1037.6 19,1040.7 15.875,1043.5 15,1045.4 14.125,1047.2 15,1050.4 15,1050.4 L12,1049.9 12,1030.4 z" />
<GeometryDrawing Brush="#FFE67E22" <GeometryDrawing Brush="#FFE67E22"
Geometry="F1 M9,1036.4 L8,1037.4 12,1049.4 16,1037.4 15,1036.4 14,1037.4 13,1036.4 12,1037.4 11,1036.4 10,1037.4 9,1036.4 z M9,1037.4 L10,1038.4 10.5,1037.9 11,1037.4 11.5,1037.9 12,1038.4 12.5,1037.9 13,1037.4 13.5,1037.9 14,1038.4 15,1037.4 15.438,1037.8 12,1048.1 8.5625,1037.8 9,1037.4 z" /> Geometry="F1 M9,1036.4 L8,1037.4 12,1049.4 16,1037.4 15,1036.4 14,1037.4 13,1036.4 12,1037.4 11,1036.4 10,1037.4 9,1036.4 z M9,1037.4 L10,1038.4 10.5,1037.9 11,1037.4 11.5,1037.9 12,1038.4 12.5,1037.9 13,1037.4 13.5,1037.9 14,1038.4 15,1037.4 15.438,1037.8 12,1048.1 8.5625,1037.8 9,1037.4 z" />
<DrawingGroup> <DrawingGroup>
<DrawingGroup.Transform> <DrawingGroup.Transform>
<MatrixTransform Matrix="1,0,0,1,9,1045.4" /> <MatrixTransform Matrix="1,0,0,1,9,1045.4" />
</DrawingGroup.Transform> </DrawingGroup.Transform>
<GeometryDrawing Brush="#FFBDC3C7"> <GeometryDrawing Brush="#FFBDC3C7">
<GeometryDrawing.Geometry> <GeometryDrawing.Geometry>
<RectangleGeometry Rect="0,0,6,5" /> <RectangleGeometry Rect="0,0,6,5" />
</GeometryDrawing.Geometry> </GeometryDrawing.Geometry>
</GeometryDrawing> </GeometryDrawing>
</DrawingGroup> </DrawingGroup>
<GeometryDrawing Brush="#FF95A5A6" <GeometryDrawing Brush="#FF95A5A6"
Geometry="F1 M9,1045.4 L9,1050.4 12,1050.4 12,1049.4 15,1049.4 15,1048.4 12,1048.4 12,1047.4 15,1047.4 15,1046.4 12,1046.4 12,1045.4 9,1045.4 z" /> Geometry="F1 M9,1045.4 L9,1050.4 12,1050.4 12,1049.4 15,1049.4 15,1048.4 12,1048.4 12,1047.4 15,1047.4 15,1046.4 12,1046.4 12,1045.4 9,1045.4 z" />
<GeometryDrawing Brush="#FF7F8C8D" <GeometryDrawing Brush="#FF7F8C8D"
Geometry="F1 M9,1046.4 L9,1047.4 12,1047.4 12,1046.4 9,1046.4 z M9,1048.4 L9,1049.4 12,1049.4 12,1048.4 9,1048.4 z" /> Geometry="F1 M9,1046.4 L9,1047.4 12,1047.4 12,1046.4 9,1046.4 z M9,1048.4 L9,1049.4 12,1049.4 12,1048.4 9,1048.4 z" />
</DrawingGroup> </DrawingGroup>
</Style.Resources> </Style.Resources>
</Style> </Style>
</UserControl.Styles> </UserControl.Styles>
<Grid RowDefinitions="Auto,Auto,Auto" <Grid RowDefinitions="Auto,Auto,Auto"
ColumnDefinitions="Auto,Auto,Auto,Auto"> ColumnDefinitions="Auto,Auto,Auto,Auto">
<TextBlock Text="None" <TextBlock Text="None"
Margin="3" /> Margin="3" />
<Border Grid.Column="0" <Border Grid.Column="0"
Grid.Row="1" Grid.Row="1"
VerticalAlignment="Top" VerticalAlignment="Top"
HorizontalAlignment="Left" HorizontalAlignment="Left"
BorderThickness="1" BorderThickness="1"
BorderBrush="Gray" BorderBrush="Gray"
Margin="5"> Margin="5">
<DrawingPresenter Drawing="{DynamicResource Bulb}" /> <Image>
</Border> <Image.Source>
<TextBlock Text="Fill" <DrawingImage Drawing="{DynamicResource Bulb}" />
Margin="3" </Image.Source>
Grid.Column="1" /> </Image>
<Border Grid.Column="1" </Border>
Grid.Row="1" <TextBlock Text="Fill"
VerticalAlignment="Top" Margin="3"
HorizontalAlignment="Left" Grid.Column="1" />
BorderThickness="1" <Border Grid.Column="1"
BorderBrush="Gray" Grid.Row="1"
Margin="5"> VerticalAlignment="Top"
<DrawingPresenter Drawing="{DynamicResource Bulb}" HorizontalAlignment="Left"
Width="100" BorderThickness="1"
Height="50" BorderBrush="Gray"
Stretch="Fill" /> Margin="5">
</Border> <Image Width="100" Height="50" Stretch="Fill">
<TextBlock Text="Uniform" <Image.Source>
Margin="3" <DrawingImage Drawing="{DynamicResource Bulb}" />
Grid.Column="2" /> </Image.Source>
<Border Grid.Column="2" </Image>
Grid.Row="1" </Border>
VerticalAlignment="Top" <TextBlock Text="Uniform"
HorizontalAlignment="Left" Margin="3"
BorderThickness="1" Grid.Column="2" />
BorderBrush="Gray" <Border Grid.Column="2"
Margin="5"> Grid.Row="1"
<DrawingPresenter Drawing="{DynamicResource Bulb}" VerticalAlignment="Top"
Width="100" HorizontalAlignment="Left"
Height="50" BorderThickness="1"
Stretch="Uniform" /> BorderBrush="Gray"
</Border> Margin="5">
<TextBlock Text="UniformToFill" <Image Width="100" Height="50" Stretch="Uniform">
Margin="3" <Image.Source>
Grid.Column="3" /> <DrawingImage Drawing="{DynamicResource Bulb}" />
<Border Grid.Column="3" </Image.Source>
Grid.Row="1" </Image>
VerticalAlignment="Top" </Border>
HorizontalAlignment="Left" <TextBlock Text="UniformToFill"
BorderThickness="1" Margin="3"
BorderBrush="Gray" Grid.Column="3" />
Margin="5"> <Border Grid.Column="3"
<DrawingPresenter Drawing="{DynamicResource Bulb}" Grid.Row="1"
Width="100" VerticalAlignment="Top"
Height="50" HorizontalAlignment="Left"
Stretch="UniformToFill" /> BorderThickness="1"
</Border> BorderBrush="Gray"
Margin="5">
<Image Width="100" Height="50" Stretch="UniformToFill">
<Image.Source>
<DrawingImage Drawing="{DynamicResource Bulb}" />
</Image.Source>
</Image>
</Border>
<!-- For comparison --> <!-- For comparison -->
<Ellipse Grid.Row="2" <Ellipse Grid.Row="2"
Grid.Column="0" Grid.Column="0"
Width="100" Width="100"
Height="50" Height="50"
Stretch="None" Stretch="None"
Fill="Blue" Fill="Blue"
Margin="5"/> Margin="5"/>
<Ellipse Grid.Row="2" <Ellipse Grid.Row="2"
Grid.Column="1" Grid.Column="1"
Width="100" Width="100"
Height="50" Height="50"
Stretch="Fill" Stretch="Fill"
Fill="Blue" Fill="Blue"
Margin="5" /> Margin="5" />
<Ellipse Grid.Row="2" <Ellipse Grid.Row="2"
Grid.Column="2" Grid.Column="2"
Width="100" Width="100"
Height="50" Height="50"
Stretch="Uniform" Stretch="Uniform"
Fill="Blue" Fill="Blue"
Margin="5" /> Margin="5" />
<Ellipse Grid.Row="2" <Ellipse Grid.Row="2"
Grid.Column="3" Grid.Column="3"
Width="100" Width="100"
Height="50" Height="50"
Stretch="UniformToFill" Stretch="UniformToFill"
Fill="Blue" Fill="Blue"
Margin="5" /> Margin="5" />
</Grid> </Grid>
</UserControl> </UserControl>

Write Preview
Loading…
Cancel
Save