Skip to content

Commit

Permalink
Merge branch 'master' into 1144894
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkDHarper authored Oct 14, 2020
2 parents af31646 + 6a17288 commit d7f6916
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Sample Applications/DataBindingDemo/AddProductWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,11 @@
</Border>
<ContentControl Name="ShortPreview" Grid.Row="1"
Content="{Binding}"
HorizontalAlignment="Left" />
HorizontalAlignment="Left" IsTabStop="False" />
<ContentControl Name="LongPreview" Grid.Row="2"
Content="{Binding}"
ContentTemplate="{StaticResource DetailsProductListingTemplate}"
HorizontalAlignment="Left" />
HorizontalAlignment="Left" IsTabStop="False" />
</Grid>
</Border>
</Window>
</Window>
2 changes: 1 addition & 1 deletion Sample Applications/DataBindingDemo/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<ContentControl Name="Detail" Grid.Row="3" Grid.ColumnSpan="3"
Content="{Binding Source={StaticResource ListingDataView}}"
ContentTemplate="{StaticResource DetailsProductListingTemplate}"
Margin="9,0,0,0" />
Margin="9,0,0,0" IsTabStop="False"/>
<Button Name="OpenAddProduct" Grid.Row="4" Grid.Column="1" Content="Add Product" HorizontalAlignment="Center"
Margin="8"
Click="OpenAddProductWindow" />
Expand Down

0 comments on commit d7f6916

Please sign in to comment.