github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 14:13:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/winui2.6' into user/kg/fixstyle

Browse source
This commit is contained in:
Kenny Guo 2021-07-22 15:15:54 +08:00 • committed by GitHub
commit a74dadacd6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Calculator/Views/MainPage.xaml
View file

@ -101,7 +101,7 @@
ItemInvoked="OnNavItemInvoked" ItemInvoked="OnNavItemInvoked"
Loaded="OnNavLoaded" Loaded="OnNavLoaded"
MenuItemsSource="{x:Bind CreateUIElementsForCategories(Model.Categories), Mode=OneWay}" MenuItemsSource="{x:Bind CreateUIElementsForCategories(Model.Categories), Mode=OneWay}"
OpenPaneLength="{StaticResource SplitViewOpenPaneLength}" OpenPaneLength="{x:Bind NavigationViewOpenPaneLength(Model.IsAlwaysOnTop), Mode=OneWay}"
PaneClosed="OnNavPaneClosed" PaneClosed="OnNavPaneClosed"
PaneOpened="OnNavPaneOpened" PaneOpened="OnNavPaneOpened"
SelectionChanged="OnNavSelectionChanged" SelectionChanged="OnNavSelectionChanged"

5
src/Calculator/Views/MainPage.xaml.cs
View file

@ -588,6 +588,11 @@ namespace CalculatorApp
return !isAlwaysOnTop && isPopupOpen ? Visibility.Visible : Visibility.Collapsed; return !isAlwaysOnTop && isPopupOpen ? Visibility.Visible : Visibility.Collapsed;
} }
private double NavigationViewOpenPaneLength(bool isAlwaysOnTop)
{
return isAlwaysOnTop ? 0 : (double)Application.Current.Resources["SplitViewOpenPaneLength"];
}
private CalculatorApp.Calculator m_calculator; private CalculatorApp.Calculator m_calculator;
private GraphingCalculator m_graphingCalculator; private GraphingCalculator m_graphingCalculator;
private CalculatorApp.UnitConverter m_converter; private CalculatorApp.UnitConverter m_converter;