github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-23 06:25:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjust xaml for memory and history

Browse source
This commit is contained in:
Jérôme Laban 2019-05-22 22:55:22 -04:00
commit 8bc564523a
4 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
src/CalcManager/CalcManager.wasm
View file

Binary file not shown.

8
src/Calculator.Shared/Views/HistoryList.xaml
View file

@ -1,5 +1,6 @@
<UserControl x:Class="CalculatorApp.HistoryList" <UserControl x:Class="CalculatorApp.HistoryList"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:automation="using:CalculatorApp.Common.Automation" xmlns:automation="using:CalculatorApp.Common.Automation"
xmlns:controls="using:CalculatorApp.Controls" xmlns:controls="using:CalculatorApp.Controls"
@ -41,11 +42,12 @@
<converters:ItemSizeToVisibilityNegationConverter x:Key="ItemSizeToVisibilityNegationConverter"/> <converters:ItemSizeToVisibilityNegationConverter x:Key="ItemSizeToVisibilityNegationConverter"/>
<converters:ItemSizeToVisibilityConverter x:Key="ItemSizeToVisibilityConverter"/> <converters:ItemSizeToVisibilityConverter x:Key="ItemSizeToVisibilityConverter"/>
<MenuFlyout x:Key="HistoryContextMenu"> <!--UNO TODO-->
<win:MenuFlyout x:Key="HistoryContextMenu">
<MenuFlyoutItem x:Uid="DeleteHistoryMenuItem" <MenuFlyoutItem x:Uid="DeleteHistoryMenuItem"
Click="OnDeleteMenuItemClicked" Click="OnDeleteMenuItemClicked"
Icon="Delete"/> Icon="Delete"/>
</MenuFlyout> </win:MenuFlyout>
<!-- <!--
@ -94,7 +96,7 @@
<DataTemplate x:Key="HistoryItemTemplate" x:DataType="model:HistoryItemViewModel"> <DataTemplate x:Key="HistoryItemTemplate" x:DataType="model:HistoryItemViewModel">
<StackPanel Margin="0,6,4,6" <StackPanel Margin="0,6,4,6"
Background="Transparent" Background="Transparent"
ContextFlyout="{StaticResource HistoryContextMenu}"> win:ContextFlyout="{StaticResource HistoryContextMenu}">
<TextBlock x:Name="ExprTextBlock" <TextBlock x:Name="ExprTextBlock"
Margin="0,0,0,4" Margin="0,0,0,4"
HorizontalAlignment="Right" HorizontalAlignment="Right"

6
src/Calculator.Shared/Views/Memory.xaml
View file

@ -1,5 +1,6 @@
<UserControl x:Class="CalculatorApp.Memory" <UserControl x:Class="CalculatorApp.Memory"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:common="using:CalculatorApp.Common" xmlns:common="using:CalculatorApp.Common"
xmlns:controls="using:CalculatorApp.Controls" xmlns:controls="using:CalculatorApp.Controls"
@ -17,7 +18,8 @@
<converters:BooleanToVisibilityNegationConverter x:Key="BooleanToVisibilityNegationConverter"/> <converters:BooleanToVisibilityNegationConverter x:Key="BooleanToVisibilityNegationConverter"/>
<converters:BooleanNegationConverter x:Key="BooleanNegationConverter"/> <converters:BooleanNegationConverter x:Key="BooleanNegationConverter"/>
<MenuFlyout x:Key="MemoryContextMenu"> <!--UNO TODO-->
<win:MenuFlyout x:Key="MemoryContextMenu">
<MenuFlyoutItem x:Uid="ClearMemoryMenuItem" Click="OnClearMenuItemClicked"> <MenuFlyoutItem x:Uid="ClearMemoryMenuItem" Click="OnClearMenuItemClicked">
<MenuFlyoutItem.Icon> <MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xf754;"/> <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xf754;"/>
@ -33,7 +35,7 @@
<FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xf758;"/> <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xf758;"/>
</MenuFlyoutItem.Icon> </MenuFlyoutItem.Icon>
</MenuFlyoutItem> </MenuFlyoutItem>
</MenuFlyout> </win:MenuFlyout>
<DataTemplate x:Key="MemoryItemTemplate" x:DataType="model:MemoryItemViewModel"> <DataTemplate x:Key="MemoryItemTemplate" x:DataType="model:MemoryItemViewModel">
<local:MemoryListItem Model="{x:Bind Mode=OneWay}"/> <local:MemoryListItem Model="{x:Bind Mode=OneWay}"/>

4
src/Calculator.Shared/Views/Memory.xaml.cs
View file

@ -35,7 +35,9 @@ namespace CalculatorApp
{ {
m_isErrorVisualState = false; m_isErrorVisualState = false;
InitializeComponent(); InitializeComponent();
m_memoryItemFlyout = (MenuFlyout)(Resources["MemoryContextMenu"]);
// UNO TODO
m_memoryItemFlyout = Resources["MemoryContextMenu"] as MenuFlyout ?? new MenuFlyout();
MemoryPaneEmpty.FlowDirection = LocalizationService.GetInstance().GetFlowDirection(); MemoryPaneEmpty.FlowDirection = LocalizationService.GetInstance().GetFlowDirection();
} }