From af97d2d72c137784f53cf58357877fbe7b3f3fe2 Mon Sep 17 00:00:00 2001
From: Flre-fly <firefly_0@naver.com>
Date: Sat, 6 Nov 2021 16:52:29 +0900
Subject: [PATCH] Added description when mouseover on ce and c.

---
 src/Calculator/Controls/EquationTextBox.cs           |  2 +-
 src/Calculator/Controls/OperatorPanelListView.cs     |  1 +
 src/Calculator/Resources/ko-KR/Resources.resw        |  4 ++--
 src/Calculator/Views/Calculator.xaml                 |  3 ++-
 .../Views/CalculatorProgrammerRadixOperators.xaml    |  2 +-
 .../Views/CalculatorProgrammerRadixOperators.xaml.cs |  4 +++-
 .../Views/CalculatorScientificOperators.xaml.cs      |  1 +
 .../Views/CalculatorStandardOperators.xaml           | 11 +++++++++--
 src/Calculator/Views/MainPage.xaml                   |  3 ++-
 src/Calculator/Views/MemoryListItem.xaml             | 12 ++++++++----
 10 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/src/Calculator/Controls/EquationTextBox.cs b/src/Calculator/Controls/EquationTextBox.cs
index ebf1bb64..0b05290c 100644
--- a/src/Calculator/Controls/EquationTextBox.cs
+++ b/src/Calculator/Controls/EquationTextBox.cs
@@ -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;
diff --git a/src/Calculator/Controls/OperatorPanelListView.cs b/src/Calculator/Controls/OperatorPanelListView.cs
index ac56cc65..499edb26 100644
--- a/src/Calculator/Controls/OperatorPanelListView.cs
+++ b/src/Calculator/Controls/OperatorPanelListView.cs
@@ -69,6 +69,7 @@ namespace CalculatorApp
 
             private void OnPointerEntered(object sender, PointerRoutedEventArgs e)
             {
+                
                 if (e.Pointer.PointerDeviceType == PointerDeviceType.Mouse)
                 {
                     UpdateScrollButtons();
diff --git a/src/Calculator/Resources/ko-KR/Resources.resw b/src/Calculator/Resources/ko-KR/Resources.resw
index f486bb08..a086f4c2 100644
--- a/src/Calculator/Resources/ko-KR/Resources.resw
+++ b/src/Calculator/Resources/ko-KR/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4166,4 +4166,4 @@
     <value>앱 테마 설정</value>
     <comment>Screen reader prompt for the App theme Setting radio buttons group</comment>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/src/Calculator/Views/Calculator.xaml b/src/Calculator/Views/Calculator.xaml
index b5d23783..8a11c53a 100644
--- a/src/Calculator/Views/Calculator.xaml
+++ b/src/Calculator/Views/Calculator.xaml
@@ -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 -->
diff --git a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml
index 8b3a1409..aab94b38 100644
--- a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml
+++ b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml
@@ -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"
diff --git a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cs b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cs
index 419c4e5c..2acc43b6 100644
--- a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cs
+++ b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cs
@@ -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)
             {
diff --git a/src/Calculator/Views/CalculatorScientificOperators.xaml.cs b/src/Calculator/Views/CalculatorScientificOperators.xaml.cs
index d1e1fd97..779fe72c 100644
--- a/src/Calculator/Views/CalculatorScientificOperators.xaml.cs
+++ b/src/Calculator/Views/CalculatorScientificOperators.xaml.cs
@@ -160,6 +160,7 @@ namespace CalculatorApp
         {
             if (ClearEntryButton.Visibility == Visibility.Collapsed && ClearButton.Visibility == Visibility.Visible)
             {
+                
                 ClearButton.Focus(FocusState.Programmatic);
             }
         }
diff --git a/src/Calculator/Views/CalculatorStandardOperators.xaml b/src/Calculator/Views/CalculatorStandardOperators.xaml
index 6907e8b4..3ae1a3b7 100644
--- a/src/Calculator/Views/CalculatorStandardOperators.xaml
+++ b/src/Calculator/Views/CalculatorStandardOperators.xaml
@@ -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"
diff --git a/src/Calculator/Views/MainPage.xaml b/src/Calculator/Views/MainPage.xaml
index 8fac3eaf..2759528c 100644
--- a/src/Calculator/Views/MainPage.xaml
+++ b/src/Calculator/Views/MainPage.xaml
@@ -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"/>
diff --git a/src/Calculator/Views/MemoryListItem.xaml b/src/Calculator/Views/MemoryListItem.xaml
index 230c2d09..63daa4ea 100644
--- a/src/Calculator/Views/MemoryListItem.xaml
+++ b/src/Calculator/Views/MemoryListItem.xaml
@@ -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>