Skip to content

Commit 0098676

Browse files
committed
avoid crash on expander
1 parent cf38e4a commit 0098676

File tree

2 files changed

+38
-1
lines changed

2 files changed

+38
-1
lines changed

dev/Expander/Expander.vcxitems

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,12 @@
3030
<Type>DefaultStyle</Type>
3131
</Page>
3232
<Page Include="$(MSBuildThisFileDirectory)Expander_themeresources.xaml">
33-
<UseVisualStyle>Any</UseVisualStyle>
33+
<UseVisualStyle>Latest</UseVisualStyle>
34+
<Version>RS1</Version>
35+
<Type>ThemeResources</Type>
36+
</Page>
37+
<Page Include="$(MSBuildThisFileDirectory)Expander_themeresources_v2.5.xaml">
38+
<UseVisualStyle>V2dot5</UseVisualStyle>
3439
<Version>RS1</Version>
3540
<Type>ThemeResources</Type>
3641
</Page>
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
2+
<ResourceDictionary
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:local="using:Microsoft.UI.Xaml.Controls">
6+
7+
<ResourceDictionary.ThemeDictionaries>
8+
<ResourceDictionary x:Key="Dark">
9+
<StaticResource x:Key="ExpanderHeaderBackground" ResourceKey="SystemControlTransparentBrush" />
10+
<StaticResource x:Key="ExpanderChevronBackground" ResourceKey="SystemControlTransparentBrush" />
11+
<StaticResource x:Key="ExpanderChevronForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
12+
</ResourceDictionary>
13+
14+
<ResourceDictionary x:Key="Light">
15+
<StaticResource x:Key="ExpanderHeaderBackground" ResourceKey="SystemControlTransparentBrush" />
16+
<StaticResource x:Key="ExpanderChevronBackground" ResourceKey="SystemControlTransparentBrush" />
17+
<StaticResource x:Key="ExpanderChevronForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
18+
</ResourceDictionary>
19+
20+
<ResourceDictionary x:Key="HighContrast">
21+
<StaticResource x:Key="ExpanderHeaderBackground" ResourceKey="SystemControlTransparentBrush" />
22+
<StaticResource x:Key="ExpanderChevronBackground" ResourceKey="SystemControlTransparentBrush" />
23+
<StaticResource x:Key="ExpanderChevronForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
24+
</ResourceDictionary>
25+
</ResourceDictionary.ThemeDictionaries>
26+
27+
<Thickness x:Key="ExpanderChevronMargin">8</Thickness>
28+
<x:String x:Key="ExpanderChevronGlyph">&#xE70D;</x:String>
29+
<x:Double x:Key="ExpanderChevronWidth">40</x:Double>
30+
<x:Double x:Key="ExpanderPopinVerticalOffset">50</x:Double>
31+
32+
</ResourceDictionary>

0 commit comments

Comments
 (0)