merge main branch

This commit is contained in:
CXWTool Service Account
2021-06-16 05:01:45 +00:00
2 changed files with 4 additions and 3 deletions
@@ -23,7 +23,7 @@
<Border.BorderBrush> <Border.BorderBrush>
<SolidColorBrush Color="{DynamicResource BorderMediumColor}" /> <SolidColorBrush Color="{DynamicResource BorderMediumColor}" />
</Border.BorderBrush> </Border.BorderBrush>
<ScrollContentPresenter /> <ScrollContentPresenter CanContentScroll="{TemplateBinding CanContentScroll}" />
</Border> </Border>
<ScrollBar x:Name="PART_VerticalScrollBar" <ScrollBar x:Name="PART_VerticalScrollBar"
Value="{TemplateBinding VerticalOffset}" Value="{TemplateBinding VerticalOffset}"
@@ -45,4 +45,4 @@
</Setter> </Setter>
</Style> </Style>
<!--</SnippetScrollViewer>--> <!--</SnippetScrollViewer>-->
</ResourceDictionary> </ResourceDictionary>
+2 -1
View File
@@ -1,5 +1,6 @@
{ {
"ignore":[ "ignore":[
"dotnet-desktop-guide/samples/**/*.*" "dotnet-desktop-guide/samples/**/*.*",
"dotnet-desktop-guide/framework/**/*.*"
] ]
} }