Skip to content

Commit 40e0e0a

Browse files
michael-hawkermichael-hawker
authored
Merge pull request #3819 from chingucoding/dev/fast-pass-rendering
Switch to fast path rendering
2 parents 0428cb2 + f34345a commit 40e0e0a

File tree

21 files changed

+56
-79
lines changed

21 files changed

+56
-79
lines changed

‎Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
Grid.Column="1"
159159
animations:Implicit.Animations="{StaticResource ImplicitOffset}">
160160
<StackPanel>
161-
<TextBlock Style="{StaticResource AboutPageHeader}">Recent Activity</TextBlock>
161+
<TextBlock Style="{StaticResource AboutPageHeader}" Text="Recent Activity"/>
162162

163163
<Grid Margin="0,16,0,0">
164164
<TextBlock FontFamily="Segoe UI"
@@ -195,7 +195,7 @@
195195

196196
<StackPanel x:Name="ReleaseNotesPanel"
197197
animations:Implicit.Animations="{StaticResource ImplicitOffset}">
198-
<TextBlock Style="{StaticResource AboutPageHeader}">Release Notes</TextBlock>
198+
<TextBlock Style="{StaticResource AboutPageHeader}" Text="Release Notes"/>
199199
<ItemsControl Margin="0,16,0,0"
200200
ItemTemplate="{StaticResource ReleaseNoteTemplate}"
201201
ItemsSource="{x:Bind GitHubReleases, Mode=OneWay}" />
@@ -254,7 +254,7 @@
254254
animations:Implicit.Animations="{StaticResource ImplicitOffset}"
255255
NavigateUri="https://go.microsoft.com/fwlink/?LinkId=521839"
256256
Style="{StaticResource AboutHyperlinkButtonStyle}">
257-
<TextBlock>Privacy statement</TextBlock>
257+
<TextBlock Text="Privacy statement"/>
258258
</HyperlinkButton>
259259
</Grid>
260260
</ScrollViewer>

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/CameraHelper/CameraHelperPage.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
<ComboBox x:Name="FrameSourceGroupCombo" Header="Frame Source Group" HorizontalAlignment="Left" Width="Auto">
1818
<ComboBox.ItemTemplate>
1919
<DataTemplate>
20-
<TextBlock Text="{Binding DisplayName}"></TextBlock>
20+
<TextBlock Text="{Binding DisplayName}"/>
2121
</DataTemplate>
2222
</ComboBox.ItemTemplate>
2323
</ComboBox>
24-
<TextBlock x:Name="CameraErrorTextBlock" Style="{StaticResource ErrorMessageStyle}" Margin="0,0,0,10" Visibility="Collapsed"></TextBlock>
24+
<TextBlock x:Name="CameraErrorTextBlock" Style="{StaticResource ErrorMessageStyle}" Margin="0,0,0,10" Visibility="Collapsed"/>
2525
<Button x:Name="CaptureButton" Content="Capture Video Frame" Margin="0,10" Click="CaptureButton_Click"></Button>
2626
<Image x:Name="CurrentFrameImage" MinWidth="300" Width="400" HorizontalAlignment="Left"></Image>
2727
</StackPanel>

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/CameraPreview/CameraPreviewCode.bind‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<StackPanel Orientation="Vertical" Margin="20">
1010
<controls:CameraPreview x:Name="CameraPreviewControl">
1111
</controls:CameraPreview>
12-
<TextBlock x:Name="ErrorMessage"></TextBlock>
12+
<TextBlock x:Name="ErrorMessage"/>
1313
<Image x:Name="CurrentFrameImage" MinWidth="300" Width="400" HorizontalAlignment="Left"></Image>
1414
</StackPanel>
1515
</Page>

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/CameraPreview/CameraPreviewXaml.bind‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<StackPanel Orientation="Vertical" Margin="20">
1515
<controls:CameraPreview x:Name="CameraPreviewControl">
1616
</controls:CameraPreview>
17-
<TextBlock x:Name="ErrorMessage" Style="{StaticResource ErrorMessageStyle}"></TextBlock>
17+
<TextBlock x:Name="ErrorMessage" Style="{StaticResource ErrorMessageStyle}"/>
1818
<Image x:Name="CurrentFrameImage" MinWidth="300" Width="400" HorizontalAlignment="Left"></Image>
1919
</StackPanel>
2020
</Page>

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Connected Animations/ConnectedAnimationsCode.bind‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
MaxWidth="500"
3737
animations:Connected.AnchorElement="{x:Bind HeroElement}">
3838

39-
<TextBlock Text="Header" FontSize="50"></TextBlock>
40-
<TextBlock TextWrapping="WrapWholeWords">Lorem ipsum ...</TextBlock>
39+
<TextBlock Text="Header" FontSize="50"/>
40+
<TextBlock TextWrapping="WrapWholeWords" Text="Lorem ipsum ..."/>
4141
</StackPanel>
4242

4343
</StackPanel>
@@ -77,9 +77,9 @@
7777
animations:Connected.AnchorElement="{x:Bind ItemHeroElement}">
7878

7979
<TextBlock Text="{x:Bind item.Title}"
80-
FontSize="50"></TextBlock>
80+
FontSize="50"/>
8181

82-
<TextBlock TextWrapping="WrapWholeWords">Lorem ipsum ...</TextBlock>
82+
<TextBlock TextWrapping="WrapWholeWords" Text="Lorem ipsum ..."/>
8383

8484
</StackPanel>
8585

@@ -90,7 +90,7 @@
9090
</StackPanel>
9191

9292
<TextBlock Margin="0,40"
93-
TextWrapping="WrapWholeWords">Lorem Ipsum ...</TextBlock>
93+
TextWrapping="WrapWholeWords" Text="Lorem Ipsum ..."/>
9494
</StackPanel>
9595
<!-- /Page -->
9696

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Connected Animations/Pages/FirstPage.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<Grid Padding="20">
1111

12-
<TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center">This is the first page, Click/Tap the box to navigate to the next page</TextBlock>
12+
<TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Text="This is the first page, Click/Tap the box to navigate to the next page"/>
1313

1414
<Border Height="100"
1515
Width="100"

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Connected Animations/Pages/SecondPage.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
animations:Connected.Key="item"></Border>
2424

2525
<StackPanel x:Name="HeroDetailsElement" Margin="20,0" VerticalAlignment="Bottom" MaxWidth="500" animations:Connected.AnchorElement="{x:Bind HeroElement}">
26-
<TextBlock Text="Header" FontSize="50"></TextBlock>
27-
<TextBlock TextWrapping="WrapWholeWords">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce eleifend ex sit amet blandit lobortis. Curabitur ut diam fringilla, interdum massa sit amet, facilisis erat. Donec vulputate sed ex vel pellentesque. In sodales odio non felis interdum viverra. Morbi in mi mollis, ullamcorper nibh sit amet, sagittis ex. Maecenas dapibus commodo venenatis. Donec at egestas est.</TextBlock>
26+
<TextBlock Text="Header" FontSize="50"/>
27+
<TextBlock TextWrapping="WrapWholeWords" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce eleifend ex sit amet blandit lobortis. Curabitur ut diam fringilla, interdum massa sit amet, facilisis erat. Donec vulputate sed ex vel pellentesque. In sodales odio non felis interdum viverra. Morbi in mi mollis, ullamcorper nibh sit amet, sagittis ex. Maecenas dapibus commodo venenatis. Donec at egestas est."/>
2828
</StackPanel>
2929
</StackPanel>
3030

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Connected Animations/Pages/ThirdPage.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
VerticalAlignment="Bottom"
1616
MaxWidth="500"
1717
animations:Connected.AnchorElement="{x:Bind ItemHeroElement}">
18-
<TextBlock Text="{x:Bind item.Title}" FontSize="50"></TextBlock>
19-
<TextBlock TextWrapping="WrapWholeWords">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce eleifend ex sit amet blandit lobortis. Curabitur ut diam fringilla, interdum massa sit amet, facilisis erat. Donec vulputate sed ex vel pellentesque. In sodales odio non felis interdum viverra. Morbi in mi mollis, ullamcorper nibh sit amet, sagittis ex. Maecenas dapibus commodo venenatis. Donec at egestas est.</TextBlock>
18+
<TextBlock Text="{x:Bind item.Title}" FontSize="50"/>
19+
<TextBlock TextWrapping="WrapWholeWords" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce eleifend ex sit amet blandit lobortis. Curabitur ut diam fringilla, interdum massa sit amet, facilisis erat. Donec vulputate sed ex vel pellentesque. In sodales odio non felis interdum viverra. Morbi in mi mollis, ullamcorper nibh sit amet, sagittis ex. Maecenas dapibus commodo venenatis. Donec at egestas est."/>
2020
</StackPanel>
2121
<Image x:Name="ItemHeroElement"
2222
Height="300" Width="300"
2323
Source="{x:Bind item.Thumbnail}"
2424
animations:Connected.Key="listItem"/>
2525
</StackPanel>
2626

27-
<TextBlock x:Name="Content" Margin="0,40" TextWrapping="WrapWholeWords" > Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce eleifend ex sit amet blandit lobortis. Curabitur ut diam fringilla, interdum massa sit amet, facilisis erat. Donec vulputate sed ex vel pellentesque. In sodales odio non felis interdum viverra. Morbi in mi mollis, ullamcorper nibh sit amet, sagittis ex. Maecenas dapibus commodo venenatis. Donec at egestas est. Donec sit amet ante gravida, feugiat arcu quis, ullamcorper justo. Donec finibus erat lectus, pretium ultrices erat lobortis eu. Nulla sodales libero nisi, a varius urna vehicula et. In rhoncus magna sed felis ultricies aliquet. Sed rhoncus mi id elementum faucibus. Fusce blandit, urna sit amet maximus ultrices, lorem neque fermentum felis, id elementum tellus erat eu eros. Vivamus egestas, est eu sagittis vehicula, lorem nulla hendrerit elit, eu consectetur leo magna eu lorem. Nulla pulvinar augue vitae libero pretium molestie. Nam eget dui velit. Curabitur eu vehicula velit, eu convallis orci. Interdum et malesuada fames ac ante ipsum primis in faucibus. Vestibulum et ipsum turpis. Ut volutpat condimentum elit, sit amet faucibus libero dignissim ac. Aenean vitae euismod lorem. Cras enim neque, hendrerit et dui vitae, viverra porttitor nisi. Aliquam suscipit dictum leo id consequat. Pellentesque condimentum elementum neque. Donec hendrerit nisi quis lorem sagittis, et aliquam dui suscipit. Cras at ligula vitae magna dignissim condimentum nec sagittis mauris. In hac habitasse platea dictumst. Donec tempor, dui et pretium pretium, libero magna iaculis eros, sed consequat nisi orci tempus est. Fusce in rutrum odio. Donec vitae porta metus, et pellentesque turpis. Nullam vestibulum lacus a metus sollicitudin vestibulum. Quisque lacinia quam et urna iaculis mattis. Vestibulum in justo ligula. Donec in dolor lacinia, semper risus eget, bibendum libero. Phasellus elementum odio vel facilisis gravida. Aliquam ac rutrum lacus, et aliquam arcu. Sed tempor rhoncus ipsum, nec viverra diam suscipit non. Nam fermentum commodo auctor. Praesent et nunc id nibh dignissim interdum. Phasellus fermentum mauris tortor, vel laoreet leo maximus sed. Nam sagittis risus lacinia quam dictum rutrum. Pellentesque mollis elit vel mauris eleifend auctor. Donec nec tincidunt odio. Morbi eleifend, turpis ullamcorper convallis vehicula, eros enim lobortis sapien, sit amet consequat risus lorem eu ligula. Quisque hendrerit scelerisque justo vel ultricies. Duis nec erat vulputate, sagittis nisi ut, congue tellus. Integer eget risus nec justo rutrum gravida. Sed eu aliquam nisl, consectetur euismod lacus. Etiam erat ligula, laoreet sed risus non, auctor sollicitudin lacus. Ut tincidunt lectus nec tempor interdum. Proin varius nisi enim, sed finibus urna tincidunt et. Suspendisse venenatis ex ut risus porttitor tempor. Vestibulum mauris ante, blandit in bibendum ac, aliquet quis leo. Aenean at facilisis nunc. Nullam blandit erat at orci tincidunt, in iaculis lorem viverra. Maecenas nec dui porta, tempus nulla nec, rhoncus felis. Ut vitae lectus a metus varius pretium at ut enim. Suspendisse potenti.</TextBlock>
27+
<TextBlock x:Name="Content" Margin="0,40" TextWrapping="WrapWholeWords" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce eleifend ex sit amet blandit lobortis. Curabitur ut diam fringilla, interdum massa sit amet, facilisis erat. Donec vulputate sed ex vel pellentesque. In sodales odio non felis interdum viverra. Morbi in mi mollis, ullamcorper nibh sit amet, sagittis ex. Maecenas dapibus commodo venenatis. Donec at egestas est. Donec sit amet ante gravida, feugiat arcu quis, ullamcorper justo. Donec finibus erat lectus, pretium ultrices erat lobortis eu. Nulla sodales libero nisi, a varius urna vehicula et. In rhoncus magna sed felis ultricies aliquet. Sed rhoncus mi id elementum faucibus. Fusce blandit, urna sit amet maximus ultrices, lorem neque fermentum felis, id elementum tellus erat eu eros. Vivamus egestas, est eu sagittis vehicula, lorem nulla hendrerit elit, eu consectetur leo magna eu lorem. Nulla pulvinar augue vitae libero pretium molestie. Nam eget dui velit. Curabitur eu vehicula velit, eu convallis orci. Interdum et malesuada fames ac ante ipsum primis in faucibus. Vestibulum et ipsum turpis. Ut volutpat condimentum elit, sit amet faucibus libero dignissim ac. Aenean vitae euismod lorem. Cras enim neque, hendrerit et dui vitae, viverra porttitor nisi. Aliquam suscipit dictum leo id consequat. Pellentesque condimentum elementum neque. Donec hendrerit nisi quis lorem sagittis, et aliquam dui suscipit. Cras at ligula vitae magna dignissim condimentum nec sagittis mauris. In hac habitasse platea dictumst. Donec tempor, dui et pretium pretium, libero magna iaculis eros, sed consequat nisi orci tempus est. Fusce in rutrum odio. Donec vitae porta metus, et pellentesque turpis. Nullam vestibulum lacus a metus sollicitudin vestibulum. Quisque lacinia quam et urna iaculis mattis. Vestibulum in justo ligula. Donec in dolor lacinia, semper risus eget, bibendum libero. Phasellus elementum odio vel facilisis gravida. Aliquam ac rutrum lacus, et aliquam arcu. Sed tempor rhoncus ipsum, nec viverra diam suscipit non. Nam fermentum commodo auctor. Praesent et nunc id nibh dignissim interdum. Phasellus fermentum mauris tortor, vel laoreet leo maximus sed. Nam sagittis risus lacinia quam dictum rutrum. Pellentesque mollis elit vel mauris eleifend auctor. Donec nec tincidunt odio. Morbi eleifend, turpis ullamcorper convallis vehicula, eros enim lobortis sapien, sit amet consequat risus lorem eu ligula. Quisque hendrerit scelerisque justo vel ultricies. Duis nec erat vulputate, sagittis nisi ut, congue tellus. Integer eget risus nec justo rutrum gravida. Sed eu aliquam nisl, consectetur euismod lacus. Etiam erat ligula, laoreet sed risus non, auctor sollicitudin lacus. Ut tincidunt lectus nec tempor interdum. Proin varius nisi enim, sed finibus urna tincidunt et. Suspendisse venenatis ex ut risus porttitor tempor. Vestibulum mauris ante, blandit in bibendum ac, aliquet quis leo. Aenean at facilisis nunc. Nullam blandit erat at orci tincidunt, in iaculis lorem viverra. Maecenas nec dui porta, tempus nulla nec, rhoncus felis. Ut vitae lectus a metus varius pretium at ut enim. Suspendisse potenti."/>
2828
</StackPanel>
2929
</Grid>
3030
</Page>

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DataGrid/DataGridCode.bind‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<RowDefinition Height="*" />
3939
</Grid.RowDefinitions>
4040
<StackPanel Orientation="Horizontal" Margin="12">
41-
<TextBlock Text="DataGrid Sample : Mountains" VerticalAlignment="Center" Margin="5,0" Style="{ThemeResource SubtitleTextBlockStyle}"></TextBlock>
41+
<TextBlock Text="DataGrid Sample : Mountains" VerticalAlignment="Center" Margin="5,0" Style="{ThemeResource SubtitleTextBlockStyle}"/>
4242
<AppBarButton Icon="Filter" Label="Filter by">
4343
<AppBarButton.Flyout>
4444
<MenuFlyout>

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanel.bind‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
mc:Ignorable="d" >
99

1010
<Grid>
11-
<TextBlock Margin="5" Text="In this demo you can't add a child after a Stretch child"></TextBlock>
11+
<TextBlock Margin="5" Text="In this demo you can't add a child after a Stretch child"/>
1212
<Grid Padding="48">
1313
<controls:DockPanel x:Name="SampleDockPanel"
1414
Background="LightGray"

0 commit comments

Comments
 (0)