mirror of
https://github.com/Microsoft/calculator.git
synced 2025-08-22 14:13:30 -07:00
Fixed the display issue in AOT mode
This commit is contained in:
parent
7cdc247071
commit
226e555d92
3 changed files with 6 additions and 2 deletions
|
@ -333,7 +333,6 @@
|
||||||
|
|
||||||
<FontFamily x:Key="CalculatorFontFamily">ms-appx:///Assets/CalculatorIcons.ttf#Calculator Fluent Icons</FontFamily>
|
<FontFamily x:Key="CalculatorFontFamily">ms-appx:///Assets/CalculatorIcons.ttf#Calculator Fluent Icons</FontFamily>
|
||||||
|
|
||||||
<x:Double x:Key="SplitViewOpenPaneLength">256</x:Double>
|
|
||||||
<Thickness x:Key="PivotPortraitThemePadding">0,1,0,0</Thickness>
|
<Thickness x:Key="PivotPortraitThemePadding">0,1,0,0</Thickness>
|
||||||
<x:Double x:Key="PivotHeaderItemFontSize">14</x:Double>
|
<x:Double x:Key="PivotHeaderItemFontSize">14</x:Double>
|
||||||
<FontWeight x:Key="PivotHeaderItemThemeFontWeight">Normal</FontWeight>
|
<FontWeight x:Key="PivotHeaderItemThemeFontWeight">Normal</FontWeight>
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -604,6 +604,11 @@ namespace CalculatorApp
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private double NavigationViewOpenPaneLength(bool isAlwaysOnTop)
|
||||||
|
{
|
||||||
|
return isAlwaysOnTop ? 0 : 256;
|
||||||
|
}
|
||||||
|
|
||||||
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;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue