DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update WinUI to build 2.6.2 (#1660)

Browse Source
This commit is contained in:
Kenny Guo 2021-08-23 13:57:22 +08:00 committed by GitHub
parent ba3cee4366
commit 8797e37e73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Calculator/App.xaml.cs
View File

@ -440,10 +440,6 @@ private async Task HandleViewReleaseAndRemoveWindowFromMap(WindowFrameService fr
mainPage.UnregisterEventHandlers(); mainPage.UnregisterEventHandlers();
// TODO, remove this workaround after Mica fix
// Workaround app crash caused by Mica in multi-view case.
Microsoft.UI.Xaml.Controls.BackdropMaterial.SetApplyToRootOrPageBackground(mainPage, false);
await frameService.HandleViewRelease(); await frameService.HandleViewRelease();
await Task.Run(() => await Task.Run(() =>
{ {

2
src/Calculator/Calculator.csproj
View File

@ -788,7 +788,7 @@
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform"> <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.10</Version> <Version>6.2.10</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.UI.Xaml" Version="2.6.1" /> <PackageReference Include="Microsoft.UI.Xaml" Version="2.6.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\CalcViewModel\CalcViewModel.vcxproj"> <ProjectReference Include="..\CalcViewModel\CalcViewModel.vcxproj">

1
src/Calculator/Views/MainPage.xaml
View File

@ -102,6 +102,7 @@
Loaded="OnNavLoaded" Loaded="OnNavLoaded"
MenuItemsSource="{x:Bind CreateUIElementsForCategories(Model.Categories), Mode=OneWay}" MenuItemsSource="{x:Bind CreateUIElementsForCategories(Model.Categories), Mode=OneWay}"
OpenPaneLength="{x:Bind NavigationViewOpenPaneLength(Model.IsAlwaysOnTop), Mode=OneWay}" OpenPaneLength="{x:Bind NavigationViewOpenPaneLength(Model.IsAlwaysOnTop), Mode=OneWay}"
PaneDisplayMode="LeftMinimal"
PaneClosed="OnNavPaneClosed" PaneClosed="OnNavPaneClosed"
PaneOpened="OnNavPaneOpened" PaneOpened="OnNavPaneOpened"
SelectionChanged="OnNavSelectionChanged" SelectionChanged="OnNavSelectionChanged"