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

Add icons for show, hide and switch to equation mode (#845)

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

* use correct icon for small mode

* cleanup of fonts
This commit is contained in:
Eric Wong 2019-12-03 16:02:46 -08:00 • committed by Dave Grochocki
commit 133df73d6a
4 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/Calculator/App.xaml
View file

@ -1628,6 +1628,7 @@
<Style x:Name="EquationTextBoxButtonStyle" TargetType="Button"> <Style x:Name="EquationTextBoxButtonStyle" TargetType="Button">
<Setter Property="Background" Value="Transparent"/> <Setter Property="Background" Value="Transparent"/>
<Setter Property="Foreground" Value="Transparent"/> <Setter Property="Foreground" Value="Transparent"/>
<Setter Property="FontSize" Value="16"/>
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="Button"> <ControlTemplate TargetType="Button">
@ -1683,7 +1684,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Foreground="{ThemeResource EquationBoxHoverButtonForegroundBrush}" Foreground="{ThemeResource EquationBoxHoverButtonForegroundBrush}"
FontFamily="{TemplateBinding FontFamily}" FontFamily="{TemplateBinding FontFamily}"
FontSize="12" FontSize="{TemplateBinding FontSize}"
FontStyle="Normal" FontStyle="Normal"
AutomationProperties.AccessibilityView="Raw" AutomationProperties.AccessibilityView="Raw"
Text="{TemplateBinding Content}"/> Text="{TemplateBinding Content}"/>
@ -2056,9 +2057,9 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Background="Transparent" Background="Transparent"
Orientation="Horizontal"> Orientation="Horizontal">
<TextBlock Text="ƒ"/> <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xF893;"/>
<TextBlock Margin="0,10,0,0" <TextBlock Margin="-5,19,0,0"
FontSize="9" FontSize="11"
Text="{TemplateBinding EquationButtonContentIndex}"/> Text="{TemplateBinding EquationButtonContentIndex}"/>
</StackPanel> </StackPanel>
</ToggleButton.Content> </ToggleButton.Content>
@ -2092,7 +2093,7 @@
<Setter Target="Overlay.Opacity" Value="{StaticResource EquationButtonOverlayPointerOverOpacity}"/> <Setter Target="Overlay.Opacity" Value="{StaticResource EquationButtonOverlayPointerOverOpacity}"/>
<Setter Target="ContentPresenter.Visibility" Value="Collapsed"/> <Setter Target="ContentPresenter.Visibility" Value="Collapsed"/>
<Setter Target="ShowHideIcon.Visibility" Value="Visible"/> <Setter Target="ShowHideIcon.Visibility" Value="Visible"/>
<Setter Target="ShowHideIcon.Glyph" Value="&#xE890;"/> <Setter Target="ShowHideIcon.Glyph" Value="&#xF6AC;"/>
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="Pressed"> <VisualState x:Name="Pressed">
@ -2102,7 +2103,7 @@
<Setter Target="Overlay.Opacity" Value="{StaticResource EquationButtonOverlayPressedOpacity}"/> <Setter Target="Overlay.Opacity" Value="{StaticResource EquationButtonOverlayPressedOpacity}"/>
<Setter Target="ContentPresenter.Visibility" Value="Collapsed"/> <Setter Target="ContentPresenter.Visibility" Value="Collapsed"/>
<Setter Target="ShowHideIcon.Visibility" Value="Visible"/> <Setter Target="ShowHideIcon.Visibility" Value="Visible"/>
<Setter Target="ShowHideIcon.Glyph" Value="&#xE890;"/> <Setter Target="ShowHideIcon.Glyph" Value="&#xF6AC;"/>
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="Checked"> <VisualState x:Name="Checked">
@ -2120,7 +2121,7 @@
<Setter Target="Overlay.Opacity" Value="{StaticResource EquationButtonOverlayPointerOverOpacity}"/> <Setter Target="Overlay.Opacity" Value="{StaticResource EquationButtonOverlayPointerOverOpacity}"/>
<Setter Target="ContentPresenter.Visibility" Value="Collapsed"/> <Setter Target="ContentPresenter.Visibility" Value="Collapsed"/>
<Setter Target="ShowHideIcon.Visibility" Value="Visible"/> <Setter Target="ShowHideIcon.Visibility" Value="Visible"/>
<Setter Target="ShowHideIcon.Glyph" Value="&#xED1A;"/> <Setter Target="ShowHideIcon.Glyph" Value="&#xE890;"/>
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="CheckedPressed"> <VisualState x:Name="CheckedPressed">
@ -2131,7 +2132,7 @@
<Setter Target="Overlay.Opacity" Value="{StaticResource EquationButtonOverlayPressedOpacity}"/> <Setter Target="Overlay.Opacity" Value="{StaticResource EquationButtonOverlayPressedOpacity}"/>
<Setter Target="ContentPresenter.Visibility" Value="Collapsed"/> <Setter Target="ContentPresenter.Visibility" Value="Collapsed"/>
<Setter Target="ShowHideIcon.Visibility" Value="Visible"/> <Setter Target="ShowHideIcon.Visibility" Value="Visible"/>
<Setter Target="ShowHideIcon.Glyph" Value="&#xED1A;"/> <Setter Target="ShowHideIcon.Glyph" Value="&#xE890;"/>
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
@ -2144,7 +2145,7 @@
AutomationProperties.AccessibilityView="Raw" AutomationProperties.AccessibilityView="Raw"
IsHitTestVisible="False"/> IsHitTestVisible="False"/>
<FontIcon x:Name="ShowHideIcon" <FontIcon x:Name="ShowHideIcon"
FontFamily="{ThemeResource SymbolThemeFontFamily}" FontFamily="{StaticResource CalculatorFontFamily}"
Visibility="Collapsed"/> Visibility="Collapsed"/>
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
@ -2190,7 +2191,7 @@
Foreground="{TemplateBinding EquationColor}" Foreground="{TemplateBinding EquationColor}"
BorderThickness="0" BorderThickness="0"
FontFamily="{ThemeResource SymbolThemeFontFamily}" FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="{TemplateBinding FontSize}" FontSize="12"
AutomationProperties.AccessibilityView="Raw" AutomationProperties.AccessibilityView="Raw"
Content="&#xE10A;" Content="&#xE10A;"
IsTabStop="False" IsTabStop="False"
@ -2214,8 +2215,7 @@
Background="{TemplateBinding EquationColor}" Background="{TemplateBinding EquationColor}"
Foreground="{TemplateBinding EquationColor}" Foreground="{TemplateBinding EquationColor}"
BorderThickness="0" BorderThickness="0"
FontFamily="{ThemeResource SymbolThemeFontFamily}" FontFamily="{StaticResource CalculatorFontFamily}"
FontSize="{TemplateBinding FontSize}"
AutomationProperties.AccessibilityView="Raw" AutomationProperties.AccessibilityView="Raw"
Content="&#xECC9;" Content="&#xECC9;"
IsTabStop="False" IsTabStop="False"
@ -2228,8 +2228,7 @@
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Background="{ThemeResource AppControlTransparentButtonBackgroundBrush}" Background="{ThemeResource AppControlTransparentButtonBackgroundBrush}"
BorderThickness="0" BorderThickness="0"
FontFamily="{ThemeResource SymbolThemeFontFamily}" FontFamily="{StaticResource CalculatorFontFamily}"
FontSize="{TemplateBinding FontSize}"
AutomationProperties.AccessibilityView="Raw" AutomationProperties.AccessibilityView="Raw"
Content="&#xE790;" Content="&#xE790;"
IsTabStop="False" IsTabStop="False"
@ -2256,9 +2255,9 @@
Background="{TemplateBinding EquationColor}" Background="{TemplateBinding EquationColor}"
Foreground="{TemplateBinding EquationColor}" Foreground="{TemplateBinding EquationColor}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
FontSize="{TemplateBinding FontSize}" FontFamily="{StaticResource CalculatorFontFamily}"
AutomationProperties.AccessibilityView="Raw" AutomationProperties.AccessibilityView="Raw"
Content="ƒₓ" Content="&#xE3B5;"
IsTabStop="False" IsTabStop="False"
Visibility="Collapsed"/> Visibility="Collapsed"/>
</Grid> </Grid>

BIN
src/Calculator/Assets/CalcMDL2.ttf
View file

Binary file not shown.

5
src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
View file

@ -387,8 +387,7 @@
ToolTipService.ToolTip="{x:Bind local:GraphingCalculator.GetInfoForSwitchModeToggleButton(SwitchModeToggleButton.IsChecked.Value), Mode=OneWay}" ToolTipService.ToolTip="{x:Bind local:GraphingCalculator.GetInfoForSwitchModeToggleButton(SwitchModeToggleButton.IsChecked.Value), Mode=OneWay}"
Unchecked="SwitchModeToggleButton_Checked" Unchecked="SwitchModeToggleButton_Checked"
Visibility="Collapsed"> Visibility="Collapsed">
<!-- TODO: update this icon --> <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xF770;"/>
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph=""/>
</ToggleButton> </ToggleButton>
</Grid> </Grid>
<!-- Left portion of the screen --> <!-- Left portion of the screen -->
@ -591,7 +590,7 @@
Style="{StaticResource GraphButtonStyle}" Style="{StaticResource GraphButtonStyle}"
Click="OnActiveTracingClick" Click="OnActiveTracingClick"
RequestedTheme="Light"> RequestedTheme="Light">
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE73F;"/> <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xE3B3;"/>
</Button> </Button>
<Button x:Name="Share" <Button x:Name="Share"

8
src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml
View file

@ -55,10 +55,10 @@
<FontIcon VerticalAlignment="Center" <FontIcon VerticalAlignment="Center"
FontFamily="{ThemeResource SymbolThemeFontFamily}" FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="16" FontSize="16"
Glyph="&#xE72B;"/> Glyph="&#xE72B;" Margin="0,0,6,0"/>
<TextBlock Text="ƒ" Margin="12,0,0,0"/> <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xF893;"/>
<TextBlock Margin="0,10,0,0" <TextBlock Margin="-5,19,0,0"
FontSize="9" FontSize="11"
Text="{TemplateBinding EquationButtonContentIndex}"/> Text="{TemplateBinding EquationButtonContentIndex}"/>
</StackPanel> </StackPanel>