Skip to content

Commit

Permalink
avoid crash on expander, reveal and progressbar
Browse files Browse the repository at this point in the history
update muxcontrols.sln
  • Loading branch information
licanhua committed Jan 5, 2021
1 parent cf38e4a commit 77d145f
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 24 deletions.
24 changes: 2 additions & 22 deletions MUXControls.sln
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "RadioButtons_InteractionTes
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CommonStyles", "CommonStyles", "{807E57C8-F3E8-4049-AB88-BE3D3285B441}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutoGenNamea791d19d1b964d4798435c203cb19af7", "C:\Users\canli.REDMOND\AppData\Local\Temp\AutoGenNamea791d19d1b964d4798435c203cb19af7", "{3A07FA59-C5C1-4B46-8B31-043F9CA91226}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonStyles", "dev\CommonStyles\CommonStyles.vcxitems", "{3A07FA59-C5C1-4B46-8B31-043F9CA91226}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MUXControlsTestApp", "test\MUXControlsTestApp\MSTest\MUXControlsTestApp.csproj", "{FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}"
EndProject
Expand Down Expand Up @@ -751,6 +751,7 @@ Global
dev\ScrollView\APITests\ScrollView_APITests.projitems*{374b93f8-dd19-5eda-c56a-1640529d187c}*SharedItemsImports = 13
dev\CheckBox\TestUI\CheckBox_TestUI.projitems*{38410f2a-d1f0-4373-8b77-ae25d6c36451}*SharedItemsImports = 13
dev\Collections\Collections.vcxitems*{395a71a1-4327-477b-85d4-af0851732ccb}*SharedItemsImports = 9
dev\CommonStyles\CommonStyles.vcxitems*{3a07fa59-c5c1-4b46-8b31-043f9ca91226}*SharedItemsImports = 9
dev\ToolTip\TestUI\ToolTip_TestUI.projitems*{3ad7543b-020c-4c9f-99b9-252f666f59a8}*SharedItemsImports = 13
dev\Materials\Acrylic\AcrylicBrush.vcxitems*{3affd0ce-c682-4e59-a9d4-be8ec3f485da}*SharedItemsImports = 9
dev\ProgressBar\InteractionTests\ProgressBar_InteractionTests.projitems*{3d044ec1-c9d3-4745-b79e-e7bed66e93f8}*SharedItemsImports = 13
Expand Down Expand Up @@ -1193,27 +1194,6 @@ Global
{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Release|x86.ActiveCfg = Release|Win32
{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Release|x86.Build.0 = Release|Win32
{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Release|x86.Deploy.0 = Release|Win32
{3A07FA59-C5C1-4B46-8B31-043F9CA91226}.Debug_test|ARM.ActiveCfg = Debug|Win32
{3A07FA59-C5C1-4B46-8B31-043F9CA91226}.Debug_test|ARM.Build.0 = Debug|Win32
{3A07FA59-C5C1-4B46-8B31-043F9CA91226}.Debug_test|arm64.ActiveCfg = Debug|Win32
{3A07FA59-C5C1-4B46-8B31-043F9CA91226}.Debug_test|arm64.Build.0 = Debug|Win32
{3A07FA59-C5C1-4B46-8B31-043F9CA91226}.Debug_test|x64.ActiveCfg = Debug|Win32
{3A07FA59-C5C1-4B46-8B31-043F9CA91226}.Debug_test|x64.Build.0 = Debug|Win32
{3A07FA59-C5C1-4B46-8B31-043F9CA91226}.Debug_test|x86.ActiveCfg = Debug|Win32
{3A07FA59-C5C1-4B46-8B31-043F9CA91226}.Debug_test|x86.Build.0 = Debug|Win32
{3A07FA59-C5C1-4B46-8B31-043F9CA91226}.Debug|ARM.ActiveCfg = Debug|Win32
{3A07FA59-C5C1-4B46-8B31-043F9CA91226}.Debug|arm64.ActiveCfg = Debug|Win32
{3A07FA59-C5C1-4B46-8B31-043F9CA91226}.Debug|x64.ActiveCfg = Debug|Win32
{3A07FA59-C5C1-4B46-8B31-043F9CA91226}.Debug|x86.ActiveCfg = Debug|Win32
{3A07FA59-C5C1-4B46-8B31-043F9CA91226}.Debug|x86.Build.0 = Debug|Win32
{3A07FA59-C5C1-4B46-8B31-043F9CA91226}.Release|ARM.ActiveCfg = Debug|Win32
{3A07FA59-C5C1-4B46-8B31-043F9CA91226}.Release|ARM.Build.0 = Debug|Win32
{3A07FA59-C5C1-4B46-8B31-043F9CA91226}.Release|arm64.ActiveCfg = Debug|Win32
{3A07FA59-C5C1-4B46-8B31-043F9CA91226}.Release|arm64.Build.0 = Debug|Win32
{3A07FA59-C5C1-4B46-8B31-043F9CA91226}.Release|x64.ActiveCfg = Debug|Win32
{3A07FA59-C5C1-4B46-8B31-043F9CA91226}.Release|x64.Build.0 = Debug|Win32
{3A07FA59-C5C1-4B46-8B31-043F9CA91226}.Release|x86.ActiveCfg = Debug|Win32
{3A07FA59-C5C1-4B46-8B31-043F9CA91226}.Release|x86.Build.0 = Debug|Win32
{FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|ARM.ActiveCfg = Debug_test|ARM
{FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|ARM.Build.0 = Debug_test|ARM
{FBC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|ARM.Deploy.0 = Debug_test|ARM
Expand Down
7 changes: 6 additions & 1 deletion dev/Expander/Expander.vcxitems
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@
<Type>DefaultStyle</Type>
</Page>
<Page Include="$(MSBuildThisFileDirectory)Expander_themeresources.xaml">
<UseVisualStyle>Any</UseVisualStyle>
<UseVisualStyle>Latest</UseVisualStyle>
<Version>RS1</Version>
<Type>ThemeResources</Type>
</Page>
<Page Include="$(MSBuildThisFileDirectory)Expander_themeresources_v2.5.xaml">
<UseVisualStyle>V2dot5</UseVisualStyle>
<Version>RS1</Version>
<Type>ThemeResources</Type>
</Page>
Expand Down
32 changes: 32 additions & 0 deletions dev/Expander/Expander_themeresources_v2.5.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:Microsoft.UI.Xaml.Controls">

<ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Dark">
<StaticResource x:Key="ExpanderHeaderBackground" ResourceKey="SystemControlTransparentBrush" />
<StaticResource x:Key="ExpanderChevronBackground" ResourceKey="SystemControlTransparentBrush" />
<StaticResource x:Key="ExpanderChevronForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
</ResourceDictionary>

<ResourceDictionary x:Key="Light">
<StaticResource x:Key="ExpanderHeaderBackground" ResourceKey="SystemControlTransparentBrush" />
<StaticResource x:Key="ExpanderChevronBackground" ResourceKey="SystemControlTransparentBrush" />
<StaticResource x:Key="ExpanderChevronForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
</ResourceDictionary>

<ResourceDictionary x:Key="HighContrast">
<StaticResource x:Key="ExpanderHeaderBackground" ResourceKey="SystemControlTransparentBrush" />
<StaticResource x:Key="ExpanderChevronBackground" ResourceKey="SystemControlTransparentBrush" />
<StaticResource x:Key="ExpanderChevronForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>

<Thickness x:Key="ExpanderChevronMargin">8</Thickness>
<x:String x:Key="ExpanderChevronGlyph">&#xE70D;</x:String>
<x:Double x:Key="ExpanderChevronWidth">40</x:Double>
<x:Double x:Key="ExpanderPopinVerticalOffset">50</x:Double>

</ResourceDictionary>
1 change: 1 addition & 0 deletions dev/Materials/Reveal/RevealBrush.vcxitems
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<Version>RS2</Version>
<Type>ThemeResources</Type>
<Priority>2</Priority>
<UseNonstandardCondtionalXAML>true</UseNonstandardCondtionalXAML>
</Page>
<Page Include="$(MSBuildThisFileDirectory)RevealBrush_rs1_themeresources_v2.5.xaml">
<UseVisualStyle>V2dot5</UseVisualStyle>
Expand Down
8 changes: 7 additions & 1 deletion dev/ProgressBar/ProgressBar.vcxitems
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,13 @@
<Type>DefaultStyle</Type>
</Page>
<Page Include="$(MSBuildThisFileDirectory)ProgressBar_themeresources.xaml">
<UseVisualStyle>Any</UseVisualStyle>
<UseVisualStyle>Latest</UseVisualStyle>
<Version>RS1</Version>
<Type>ThemeResources</Type>
<UseNonstandardCondtionalXAML>true</UseNonstandardCondtionalXAML>
</Page>
<Page Include="$(MSBuildThisFileDirectory)ProgressBar_themeresources_v2.5.xaml">
<UseVisualStyle>V2dot5</UseVisualStyle>
<Version>RS1</Version>
<Type>ThemeResources</Type>
<UseNonstandardCondtionalXAML>true</UseNonstandardCondtionalXAML>
Expand Down

0 comments on commit 77d145f

Please sign in to comment.