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

Added description when mouseover on ce and c.

Browse source
This commit is contained in:
Flre-fly 2021-11-06 16:52:29 +09:00
commit af97d2d72c
10 changed files with 30 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Calculator/Controls/EquationTextBox.cs
View file

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
using CalculatorApp.ViewModel.Common;

1
src/Calculator/Controls/OperatorPanelListView.cs
View file

@ -69,6 +69,7 @@ namespace CalculatorApp
private void OnPointerEntered(object sender, PointerRoutedEventArgs e)
{
if (e.Pointer.PointerDeviceType == PointerDeviceType.Mouse)
{
UpdateScrollButtons();

2
src/Calculator/Resources/ko-KR/Resources.resw
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

3
src/Calculator/Views/Calculator.xaml
View file

@ -12,7 +12,8 @@
xmlns:local="using:CalculatorApp"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Loaded="OnLoaded"
mc:Ignorable="d">
mc:Ignorable="d"
>
<UserControl.Resources>
<!-- DataTemplates -->

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

@ -480,7 +480,7 @@
<controls:CalculatorButton x:Name="ClearEntryButton"
x:Uid="clearEntryButton"
Style="{StaticResource OperatorButtonStyle}"
Style="{StaticResource MemoryHoverButtonStyle}"
FontSize="12"
AutomationProperties.AutomationId="clearEntryButton"
ButtonId="ClearEntry"

4
src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cs
View file

@ -16,6 +16,7 @@ using Windows.UI.Xaml.Controls.Primitives;
using Windows.UI.Xaml.Data;
using CalculatorApp.Common;
using Windows.UI.Xaml.Media;
using Windows.Devices.Input;
namespace CalculatorApp
{
@ -215,6 +216,7 @@ namespace CalculatorApp
}
}
private void ClearButton_LostFocus(object sender, RoutedEventArgs e)
{
if (ClearEntryButton.Visibility == Visibility.Visible && ClearButton.Visibility == Visibility.Collapsed)
@ -223,7 +225,7 @@ namespace CalculatorApp
}
}
private void BitShiftFlyout_Opened(object sender, object e)
private void BitShiftFlyout_Opened(object sender, object e)
{
if (m_selectedShiftButtonMode == BitShiftMode.Arithmetic)
{

1
src/Calculator/Views/CalculatorScientificOperators.xaml.cs
View file

@ -160,6 +160,7 @@ namespace CalculatorApp
{
if (ClearEntryButton.Visibility == Visibility.Collapsed && ClearButton.Visibility == Visibility.Visible)
{
ClearButton.Focus(FocusState.Programmatic);
}
}

11
src/Calculator/Views/CalculatorStandardOperators.xaml
View file

@ -183,6 +183,7 @@
</Grid.ColumnDefinitions>
<controls:CalculatorButton x:Name="PercentButton"
x:Uid="percentButton"
Grid.Column="0"
Style="{StaticResource SymbolOperatorButtonStyle}"
AutomationProperties.AutomationId="percentButton"
@ -195,7 +196,11 @@
FontSize="16"
AutomationProperties.AutomationId="clearEntryButton"
ButtonId="ClearEntry"
Content="CE"/>
Content="CE"
ToolTipService.ToolTip ="현재 입력 지우기"
/>
<controls:CalculatorButton x:Name="ClearButton"
x:Uid="clearButton"
Grid.Column="2"
@ -203,7 +208,8 @@
FontSize="16"
AutomationProperties.AutomationId="clearButton"
ButtonId="Clear"
Content="C"/>
Content="C"
ToolTipService.ToolTip ="전 계산과정 지우기"/>
<controls:CalculatorButton x:Name="BackSpaceButton"
x:Uid="backSpaceButton"
Grid.Column="3"
@ -287,6 +293,7 @@
<controls:CalculatorButton x:Name="MinusButton"
x:Uid="minusButton"
Grid.Row="2"
Style="{StaticResource SymbolOperatorButtonStyle}"
AutomationProperties.AutomationId="minusButton"
ButtonId="Subtract"

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

@ -10,7 +10,8 @@
x:Name="PageRoot"
muxc:BackdropMaterial.ApplyToRootOrPageBackground="True"
Loaded="OnPageLoaded"
mc:Ignorable="d">
mc:Ignorable="d"
>
<Page.Resources>
<automation:NarratorNotifier x:Name="NarratorNotifier"/>

12
src/Calculator/Views/MemoryListItem.xaml
View file

@ -65,6 +65,10 @@
Margin="0,0,16,4"
HorizontalAlignment="Right"
Opacity="0">
<Grid.RowDefinitions>
<RowDefinition Height="17*"/>
<RowDefinition Height="11*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
@ -74,20 +78,20 @@
Style="{StaticResource MemoryHoverButtonStyle}"
AutomationProperties.AutomationId="MClearButton"
Click="OnClearButtonClicked"
Content="MC"/>
Content="MC" Grid.RowSpan="2"/>
<Button x:Uid="MemPlusItem"
Grid.Column="1"
Margin="1,0"
Margin="1,0,1,0"
Style="{StaticResource MemoryHoverButtonStyle}"
AutomationProperties.AutomationId="MAddButton"
Click="OnMemoryAddButtonClicked"
Content="M+"/>
Content="M+" Grid.RowSpan="2"/>
<Button x:Uid="MemMinusItem"
Grid.Column="2"
Style="{StaticResource MemoryHoverButtonStyle}"
AutomationProperties.AutomationId="MSubButton"
Click="OnMemorySubtractButtonClicked"
Content="M-"/>
Content="M-" Grid.RowSpan="2"/>
</Grid>
</Grid>
</muxc:SwipeControl>