mirror of
https://github.com/Microsoft/calculator.git
synced 2025-08-22 14:13:30 -07:00
Added description when mouseover on ce and c.
This commit is contained in:
parent
c5501294a1
commit
af97d2d72c
10 changed files with 30 additions and 13 deletions
|
@ -1,4 +1,4 @@
|
||||||
// Copyright (c) Microsoft Corporation. All rights reserved.
|
// Copyright (c) Microsoft Corporation. All rights reserved.
|
||||||
// Licensed under the MIT License.
|
// Licensed under the MIT License.
|
||||||
|
|
||||||
using CalculatorApp.ViewModel.Common;
|
using CalculatorApp.ViewModel.Common;
|
||||||
|
|
|
@ -69,6 +69,7 @@ namespace CalculatorApp
|
||||||
|
|
||||||
private void OnPointerEntered(object sender, PointerRoutedEventArgs e)
|
private void OnPointerEntered(object sender, PointerRoutedEventArgs e)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (e.Pointer.PointerDeviceType == PointerDeviceType.Mouse)
|
if (e.Pointer.PointerDeviceType == PointerDeviceType.Mouse)
|
||||||
{
|
{
|
||||||
UpdateScrollButtons();
|
UpdateScrollButtons();
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<root>
|
<root>
|
||||||
<!--
|
<!--
|
||||||
Microsoft ResX Schema
|
Microsoft ResX Schema
|
||||||
|
@ -4166,4 +4166,4 @@
|
||||||
<value>앱 테마 설정</value>
|
<value>앱 테마 설정</value>
|
||||||
<comment>Screen reader prompt for the App theme Setting radio buttons group</comment>
|
<comment>Screen reader prompt for the App theme Setting radio buttons group</comment>
|
||||||
</data>
|
</data>
|
||||||
</root>
|
</root>
|
||||||
|
|
|
@ -12,7 +12,8 @@
|
||||||
xmlns:local="using:CalculatorApp"
|
xmlns:local="using:CalculatorApp"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
Loaded="OnLoaded"
|
Loaded="OnLoaded"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d"
|
||||||
|
>
|
||||||
|
|
||||||
<UserControl.Resources>
|
<UserControl.Resources>
|
||||||
<!-- DataTemplates -->
|
<!-- DataTemplates -->
|
||||||
|
|
|
@ -480,7 +480,7 @@
|
||||||
|
|
||||||
<controls:CalculatorButton x:Name="ClearEntryButton"
|
<controls:CalculatorButton x:Name="ClearEntryButton"
|
||||||
x:Uid="clearEntryButton"
|
x:Uid="clearEntryButton"
|
||||||
Style="{StaticResource OperatorButtonStyle}"
|
Style="{StaticResource MemoryHoverButtonStyle}"
|
||||||
FontSize="12"
|
FontSize="12"
|
||||||
AutomationProperties.AutomationId="clearEntryButton"
|
AutomationProperties.AutomationId="clearEntryButton"
|
||||||
ButtonId="ClearEntry"
|
ButtonId="ClearEntry"
|
||||||
|
|
|
@ -16,6 +16,7 @@ using Windows.UI.Xaml.Controls.Primitives;
|
||||||
using Windows.UI.Xaml.Data;
|
using Windows.UI.Xaml.Data;
|
||||||
using CalculatorApp.Common;
|
using CalculatorApp.Common;
|
||||||
using Windows.UI.Xaml.Media;
|
using Windows.UI.Xaml.Media;
|
||||||
|
using Windows.Devices.Input;
|
||||||
|
|
||||||
namespace CalculatorApp
|
namespace CalculatorApp
|
||||||
{
|
{
|
||||||
|
@ -215,6 +216,7 @@ namespace CalculatorApp
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void ClearButton_LostFocus(object sender, RoutedEventArgs e)
|
private void ClearButton_LostFocus(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (ClearEntryButton.Visibility == Visibility.Visible && ClearButton.Visibility == Visibility.Collapsed)
|
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)
|
if (m_selectedShiftButtonMode == BitShiftMode.Arithmetic)
|
||||||
{
|
{
|
||||||
|
|
|
@ -160,6 +160,7 @@ namespace CalculatorApp
|
||||||
{
|
{
|
||||||
if (ClearEntryButton.Visibility == Visibility.Collapsed && ClearButton.Visibility == Visibility.Visible)
|
if (ClearEntryButton.Visibility == Visibility.Collapsed && ClearButton.Visibility == Visibility.Visible)
|
||||||
{
|
{
|
||||||
|
|
||||||
ClearButton.Focus(FocusState.Programmatic);
|
ClearButton.Focus(FocusState.Programmatic);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -183,6 +183,7 @@
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<controls:CalculatorButton x:Name="PercentButton"
|
<controls:CalculatorButton x:Name="PercentButton"
|
||||||
x:Uid="percentButton"
|
x:Uid="percentButton"
|
||||||
|
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Style="{StaticResource SymbolOperatorButtonStyle}"
|
Style="{StaticResource SymbolOperatorButtonStyle}"
|
||||||
AutomationProperties.AutomationId="percentButton"
|
AutomationProperties.AutomationId="percentButton"
|
||||||
|
@ -195,7 +196,11 @@
|
||||||
FontSize="16"
|
FontSize="16"
|
||||||
AutomationProperties.AutomationId="clearEntryButton"
|
AutomationProperties.AutomationId="clearEntryButton"
|
||||||
ButtonId="ClearEntry"
|
ButtonId="ClearEntry"
|
||||||
Content="CE"/>
|
Content="CE"
|
||||||
|
ToolTipService.ToolTip ="현재 입력 지우기"
|
||||||
|
/>
|
||||||
|
|
||||||
|
|
||||||
<controls:CalculatorButton x:Name="ClearButton"
|
<controls:CalculatorButton x:Name="ClearButton"
|
||||||
x:Uid="clearButton"
|
x:Uid="clearButton"
|
||||||
Grid.Column="2"
|
Grid.Column="2"
|
||||||
|
@ -203,7 +208,8 @@
|
||||||
FontSize="16"
|
FontSize="16"
|
||||||
AutomationProperties.AutomationId="clearButton"
|
AutomationProperties.AutomationId="clearButton"
|
||||||
ButtonId="Clear"
|
ButtonId="Clear"
|
||||||
Content="C"/>
|
Content="C"
|
||||||
|
ToolTipService.ToolTip ="전 계산과정 지우기"/>
|
||||||
<controls:CalculatorButton x:Name="BackSpaceButton"
|
<controls:CalculatorButton x:Name="BackSpaceButton"
|
||||||
x:Uid="backSpaceButton"
|
x:Uid="backSpaceButton"
|
||||||
Grid.Column="3"
|
Grid.Column="3"
|
||||||
|
@ -287,6 +293,7 @@
|
||||||
<controls:CalculatorButton x:Name="MinusButton"
|
<controls:CalculatorButton x:Name="MinusButton"
|
||||||
x:Uid="minusButton"
|
x:Uid="minusButton"
|
||||||
Grid.Row="2"
|
Grid.Row="2"
|
||||||
|
|
||||||
Style="{StaticResource SymbolOperatorButtonStyle}"
|
Style="{StaticResource SymbolOperatorButtonStyle}"
|
||||||
AutomationProperties.AutomationId="minusButton"
|
AutomationProperties.AutomationId="minusButton"
|
||||||
ButtonId="Subtract"
|
ButtonId="Subtract"
|
||||||
|
|
|
@ -10,7 +10,8 @@
|
||||||
x:Name="PageRoot"
|
x:Name="PageRoot"
|
||||||
muxc:BackdropMaterial.ApplyToRootOrPageBackground="True"
|
muxc:BackdropMaterial.ApplyToRootOrPageBackground="True"
|
||||||
Loaded="OnPageLoaded"
|
Loaded="OnPageLoaded"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d"
|
||||||
|
>
|
||||||
|
|
||||||
<Page.Resources>
|
<Page.Resources>
|
||||||
<automation:NarratorNotifier x:Name="NarratorNotifier"/>
|
<automation:NarratorNotifier x:Name="NarratorNotifier"/>
|
||||||
|
|
|
@ -65,6 +65,10 @@
|
||||||
Margin="0,0,16,4"
|
Margin="0,0,16,4"
|
||||||
HorizontalAlignment="Right"
|
HorizontalAlignment="Right"
|
||||||
Opacity="0">
|
Opacity="0">
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="17*"/>
|
||||||
|
<RowDefinition Height="11*"/>
|
||||||
|
</Grid.RowDefinitions>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="Auto"/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
<ColumnDefinition Width="Auto"/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
|
@ -74,20 +78,20 @@
|
||||||
Style="{StaticResource MemoryHoverButtonStyle}"
|
Style="{StaticResource MemoryHoverButtonStyle}"
|
||||||
AutomationProperties.AutomationId="MClearButton"
|
AutomationProperties.AutomationId="MClearButton"
|
||||||
Click="OnClearButtonClicked"
|
Click="OnClearButtonClicked"
|
||||||
Content="MC"/>
|
Content="MC" Grid.RowSpan="2"/>
|
||||||
<Button x:Uid="MemPlusItem"
|
<Button x:Uid="MemPlusItem"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Margin="1,0"
|
Margin="1,0,1,0"
|
||||||
Style="{StaticResource MemoryHoverButtonStyle}"
|
Style="{StaticResource MemoryHoverButtonStyle}"
|
||||||
AutomationProperties.AutomationId="MAddButton"
|
AutomationProperties.AutomationId="MAddButton"
|
||||||
Click="OnMemoryAddButtonClicked"
|
Click="OnMemoryAddButtonClicked"
|
||||||
Content="M+"/>
|
Content="M+" Grid.RowSpan="2"/>
|
||||||
<Button x:Uid="MemMinusItem"
|
<Button x:Uid="MemMinusItem"
|
||||||
Grid.Column="2"
|
Grid.Column="2"
|
||||||
Style="{StaticResource MemoryHoverButtonStyle}"
|
Style="{StaticResource MemoryHoverButtonStyle}"
|
||||||
AutomationProperties.AutomationId="MSubButton"
|
AutomationProperties.AutomationId="MSubButton"
|
||||||
Click="OnMemorySubtractButtonClicked"
|
Click="OnMemorySubtractButtonClicked"
|
||||||
Content="M-"/>
|
Content="M-" Grid.RowSpan="2"/>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</muxc:SwipeControl>
|
</muxc:SwipeControl>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue