From 133df73d6ad5a3b26e1ee8e809c083be33b1c795 Mon Sep 17 00:00:00 2001
From: Eric Wong <eriwong@microsoft.com>
Date: Tue, 3 Dec 2019 16:02:46 -0800
Subject: [PATCH] Add icons for show, hide and switch to equation mode (#845)

* Add icons for show, hide and switch to equation mode

* use correct icon for small mode

* cleanup of fonts
---
 src/Calculator/App.xaml                       |  31 +++++++++---------
 src/Calculator/Assets/CalcMDL2.ttf            | Bin 24028 -> 27008 bytes
 .../GraphingCalculator.xaml                   |   5 ++-
 .../KeyGraphFeaturesPanel.xaml                |   8 ++---
 4 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/Calculator/App.xaml b/src/Calculator/App.xaml
index 10283837..4db00b45 100644
--- a/src/Calculator/App.xaml
+++ b/src/Calculator/App.xaml
@@ -1628,6 +1628,7 @@
             <Style x:Name="EquationTextBoxButtonStyle" TargetType="Button">
                 <Setter Property="Background" Value="Transparent"/>
                 <Setter Property="Foreground" Value="Transparent"/>
+                <Setter Property="FontSize" Value="16"/>
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="Button">
@@ -1683,7 +1684,7 @@
                                            VerticalAlignment="Center"
                                            Foreground="{ThemeResource EquationBoxHoverButtonForegroundBrush}"
                                            FontFamily="{TemplateBinding FontFamily}"
-                                           FontSize="12"
+                                           FontSize="{TemplateBinding FontSize}"
                                            FontStyle="Normal"
                                            AutomationProperties.AccessibilityView="Raw"
                                            Text="{TemplateBinding Content}"/>
@@ -2056,9 +2057,9 @@
                                                     VerticalAlignment="Center"
                                                     Background="Transparent"
                                                     Orientation="Horizontal">
-                                            <TextBlock Text="ƒ"/>
-                                            <TextBlock Margin="0,10,0,0"
-                                                       FontSize="9"
+                                            <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xF893;"/>
+                                            <TextBlock Margin="-5,19,0,0"
+                                                       FontSize="11"
                                                        Text="{TemplateBinding EquationButtonContentIndex}"/>
                                         </StackPanel>
                                     </ToggleButton.Content>
@@ -2092,7 +2093,7 @@
                                                                             <Setter Target="Overlay.Opacity" Value="{StaticResource EquationButtonOverlayPointerOverOpacity}"/>
                                                                             <Setter Target="ContentPresenter.Visibility" Value="Collapsed"/>
                                                                             <Setter Target="ShowHideIcon.Visibility" Value="Visible"/>
-                                                                            <Setter Target="ShowHideIcon.Glyph" Value="&#xE890;"/>
+                                                                            <Setter Target="ShowHideIcon.Glyph" Value="&#xF6AC;"/>
                                                                         </VisualState.Setters>
                                                                     </VisualState>
                                                                     <VisualState x:Name="Pressed">
@@ -2102,7 +2103,7 @@
                                                                             <Setter Target="Overlay.Opacity" Value="{StaticResource EquationButtonOverlayPressedOpacity}"/>
                                                                             <Setter Target="ContentPresenter.Visibility" Value="Collapsed"/>
                                                                             <Setter Target="ShowHideIcon.Visibility" Value="Visible"/>
-                                                                            <Setter Target="ShowHideIcon.Glyph" Value="&#xE890;"/>
+                                                                            <Setter Target="ShowHideIcon.Glyph" Value="&#xF6AC;"/>
                                                                         </VisualState.Setters>
                                                                     </VisualState>
                                                                     <VisualState x:Name="Checked">
@@ -2120,7 +2121,7 @@
                                                                             <Setter Target="Overlay.Opacity" Value="{StaticResource EquationButtonOverlayPointerOverOpacity}"/>
                                                                             <Setter Target="ContentPresenter.Visibility" Value="Collapsed"/>
                                                                             <Setter Target="ShowHideIcon.Visibility" Value="Visible"/>
-                                                                            <Setter Target="ShowHideIcon.Glyph" Value="&#xED1A;"/>
+                                                                            <Setter Target="ShowHideIcon.Glyph" Value="&#xE890;"/>
                                                                         </VisualState.Setters>
                                                                     </VisualState>
                                                                     <VisualState x:Name="CheckedPressed">
@@ -2131,7 +2132,7 @@
                                                                             <Setter Target="Overlay.Opacity" Value="{StaticResource EquationButtonOverlayPressedOpacity}"/>
                                                                             <Setter Target="ContentPresenter.Visibility" Value="Collapsed"/>
                                                                             <Setter Target="ShowHideIcon.Visibility" Value="Visible"/>
-                                                                            <Setter Target="ShowHideIcon.Glyph" Value="&#xED1A;"/>
+                                                                            <Setter Target="ShowHideIcon.Glyph" Value="&#xE890;"/>
                                                                         </VisualState.Setters>
                                                                     </VisualState>
                                                                 </VisualStateGroup>
@@ -2144,7 +2145,7 @@
                                                                               AutomationProperties.AccessibilityView="Raw"
                                                                               IsHitTestVisible="False"/>
                                                             <FontIcon x:Name="ShowHideIcon"
-                                                                      FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                                                      FontFamily="{StaticResource CalculatorFontFamily}"
                                                                       Visibility="Collapsed"/>
                                                         </Grid>
                                                     </ControlTemplate>
@@ -2190,7 +2191,7 @@
                                                 Foreground="{TemplateBinding EquationColor}"
                                                 BorderThickness="0"
                                                 FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                                FontSize="{TemplateBinding FontSize}"
+                                                FontSize="12"
                                                 AutomationProperties.AccessibilityView="Raw"
                                                 Content="&#xE10A;"
                                                 IsTabStop="False"
@@ -2214,8 +2215,7 @@
                                                 Background="{TemplateBinding EquationColor}"
                                                 Foreground="{TemplateBinding EquationColor}"
                                                 BorderThickness="0"
-                                                FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                                FontSize="{TemplateBinding FontSize}"
+                                                FontFamily="{StaticResource CalculatorFontFamily}"
                                                 AutomationProperties.AccessibilityView="Raw"
                                                 Content="&#xECC9;"
                                                 IsTabStop="False"
@@ -2228,8 +2228,7 @@
                                                       VerticalAlignment="Stretch"
                                                       Background="{ThemeResource AppControlTransparentButtonBackgroundBrush}"
                                                       BorderThickness="0"
-                                                      FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                                      FontSize="{TemplateBinding FontSize}"
+                                                      FontFamily="{StaticResource CalculatorFontFamily}"
                                                       AutomationProperties.AccessibilityView="Raw"
                                                       Content="&#xE790;"
                                                       IsTabStop="False"
@@ -2256,9 +2255,9 @@
                                                 Background="{TemplateBinding EquationColor}"
                                                 Foreground="{TemplateBinding EquationColor}"
                                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                                FontSize="{TemplateBinding FontSize}"
+                                                FontFamily="{StaticResource CalculatorFontFamily}"
                                                 AutomationProperties.AccessibilityView="Raw"
-                                                Content="ƒₓ"
+                                                Content="&#xE3B5;"
                                                 IsTabStop="False"
                                                 Visibility="Collapsed"/>
                                     </Grid>
diff --git a/src/Calculator/Assets/CalcMDL2.ttf b/src/Calculator/Assets/CalcMDL2.ttf
index 9e6bfaa4d2aa2ea7e917c4862bea76bb5243c8b4..62461d0bc3cbd2f97ccee187118d10143ebc199d 100644
GIT binary patch
delta 3888
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
Ke`n2d@&5qH92lek

delta 1017
zcmZ`%ZERCz6n@@&``zAlUDuBl+TFV#V&l}oMo~B17$2i!8wIADaj<5Ljcj!nS6Pk3
zcE(8H2mH7RW||n1CF+*=k=zi824q<j<Oh)PLm4VW30>Wsu0pyWoAq?gfBNIR&wI{u
z&hws}^CoYyAHHM>FaS0r!9#A|`{er2i%B2A;uP(8ersdv(Ebxg0KNdw-tCM=<g<N~
zi-6$|%DLEiG$tBv89xOqcPT$`NbZg<zJLD|VET;sw(iJ)3<FjH?Kg<Gboae>=<38$
z7!b|_b#pykk;FlRH*k(f62-<IinxbtUsG`f`D=Qjv3TP^X&d?9lWpqj?~EKT89Yk@
z7UIXEk+_UEm`GeJ`QpowXxE2jCocoxkLW$E+&>V@g)vACP(u*qSGwf*g^ZQBeEm(Z
zQUZQpgK6&E!~t8?LzoQ|0KQrpPv-H~u~Cg8vY@_xc~1M3{mjQg$}v{W1mz31_HnK}
zpGE@#9AvtDIT>#NORn5kkkcz`xS+j;qW?0WEGRMV31y5st=94xt*{+BtS1ctMPSOf
z>5&8n&GI(tQ3EYi2oQf^DQn7+YD^tS9Z!u+8>d%K|DJZIL+M@V=Cu6l)Qm72n*Dh8
zo7rn~JLY!IpP3)a*fNt3#veMftywvHV_`U#TYe+2B>accHd1Oz_ve)o|0}hZq^>Ls
z<#M?Pxu1P|08hqq!87W4%X8Sh<o?a=cV%5yUEjK{xJI2dPOD?mam4Y0BW%BIpR%5^
zzHW63E#_`>k>NYTC2EFNxO@UzR`4HCu9?bq!vrt68tCyfHX(?Os6+)e(5T9>72B{K
zJ5Z0E2%!PH(1<29V>k97j5^Y*rO`cy&8S8dp2ahOy3gFpC0=DG*&Qy#jqvOEcldeD
z7EP~aTyszJm)4?f(q7iy))ng3={D;{!(pS}*kYVCE}6<q9j0E>QM1)tZC<dHS}t1d
z3njwa!h$t!ov`t?mV&Z^sJ*DLu<%F6Cq=`~TIZtcx-07*cK_*l$um^Uic5-Tyq~Xn
zZ*{ZZ_kq9KKUFd)dc_gRAw4S9No`V0IwPHzveaYDTFxm!`#p8WQN=64;-Azz-X^Vj
zS_<gZ_Q%#Tx0wH6mskyGn@I+JQjdZ<Nb0+Rv_>6ysx+WBw7<!76_x7sjs~8uK&9$C
H*s1*+oqj3M

diff --git a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
index 21317458..2efbcb60 100644
--- a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
+++ b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
@@ -387,8 +387,7 @@
                           ToolTipService.ToolTip="{x:Bind local:GraphingCalculator.GetInfoForSwitchModeToggleButton(SwitchModeToggleButton.IsChecked.Value), Mode=OneWay}"
                           Unchecked="SwitchModeToggleButton_Checked"
                           Visibility="Collapsed">
-                <!-- TODO: update this icon -->
-                <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph=""/>
+                <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xF770;"/>
             </ToggleButton>
         </Grid>
         <!-- Left portion of the screen -->
@@ -591,7 +590,7 @@
                             Style="{StaticResource GraphButtonStyle}"
                             Click="OnActiveTracingClick"
                             RequestedTheme="Light">
-                        <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE73F;"/>
+                        <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xE3B3;"/>
                     </Button>
 
                     <Button x:Name="Share"
diff --git a/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml b/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml
index 5b0545d8..e85cd875 100644
--- a/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml
+++ b/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml
@@ -55,10 +55,10 @@
                                         <FontIcon VerticalAlignment="Center"
                                                   FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                                   FontSize="16"
-                                                  Glyph="&#xE72B;"/>
-                                        <TextBlock Text="ƒ" Margin="12,0,0,0"/>
-                                        <TextBlock Margin="0,10,0,0"
-                                                       FontSize="9"
+                                                  Glyph="&#xE72B;" Margin="0,0,6,0"/>
+                                        <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xF893;"/>
+                                        <TextBlock Margin="-5,19,0,0"
+                                                       FontSize="11"
                                                        Text="{TemplateBinding EquationButtonContentIndex}"/>
                                     </StackPanel>