DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Font Sizes for Graph Settings and Key Graph Features to be aligned (#923)

Browse Source 
* Updated fonts for Graph Settings to match KGF

* Update graph settings font sizes to be a bigger

* Update KGF fonts to match Graph Settings
This commit is contained in:
Stephanie Anderl 2020-01-10 15:56:12 -08:00 committed by Eric Wong
parent 42dcfdc598
commit ab2ad8cdee
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml
View File

@ -82,13 +82,16 @@
</Style> </Style>
<Style x:Key="SubTitleTextBoxStyle" TargetType="TextBlock"> <Style x:Key="SubTitleTextBoxStyle" TargetType="TextBlock">
<Setter Property="FontSize" Value="16"/> <Setter Property="FontSize" Value="16"/>
<Setter Property="FontWeight" Value="SemiBold"/> <Setter Property="FontWeight" Value="Medium"/>
</Style> </Style>
<Style x:Key="ErrorTextBoxStyle" TargetType="TextBox"> <Style x:Key="ErrorTextBoxStyle" TargetType="TextBox">
<Setter Property="BorderBrush" Value="{ThemeResource GraphSettingsErrorBorderBrush}"/> <Setter Property="BorderBrush" Value="{ThemeResource GraphSettingsErrorBorderBrush}"/>
<Setter Property="Background" Value="{ThemeResource GraphSettingsErrorBackgroundBrush}"/> <Setter Property="Background" Value="{ThemeResource GraphSettingsErrorBackgroundBrush}"/>
</Style> </Style>
<DataTemplate x:Key="XYTextBoxHeaderTemplate" x:DataType="x:String">
<TextBlock FontSize="14" Text="{x:Bind}"/>
</DataTemplate>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
@ -96,7 +99,8 @@
<StackPanel Margin="4,0,4,4"> <StackPanel Margin="4,0,4,4">
<TextBlock x:Name="GraphOptionsHeading" <TextBlock x:Name="GraphOptionsHeading"
x:Uid="GraphOptionsHeading" x:Uid="GraphOptionsHeading"
FontSize="22" FontSize="20"
FontWeight="Medium"
AutomationProperties.HeadingLevel="Level1"/> AutomationProperties.HeadingLevel="Level1"/>
<TextBlock x:Name="GridHeading" <TextBlock x:Name="GridHeading"
x:Uid="GridHeading" x:Uid="GridHeading"
@ -119,6 +123,7 @@
x:Uid="GraphSettingsXMin" x:Uid="GraphSettingsXMin"
MaxWidth="160" MaxWidth="160"
Style="{x:Bind SelectTextBoxStyle(ViewModel.XError, ViewModel.XMinError), Mode=OneWay}" Style="{x:Bind SelectTextBoxStyle(ViewModel.XError, ViewModel.XMinError), Mode=OneWay}"
HeaderTemplate="{StaticResource XYTextBoxHeaderTemplate}"
PreviewKeyDown="GridSettingsTextBox_PreviewKeyDown" PreviewKeyDown="GridSettingsTextBox_PreviewKeyDown"
Text="{x:Bind ViewModel.XMin, Mode=TwoWay}"/> Text="{x:Bind ViewModel.XMin, Mode=TwoWay}"/>
<TextBox x:Name="SettingsXMax" <TextBox x:Name="SettingsXMax"
@ -126,6 +131,7 @@
Grid.Column="2" Grid.Column="2"
MaxWidth="160" MaxWidth="160"
Style="{x:Bind SelectTextBoxStyle(ViewModel.XError, ViewModel.XMaxError), Mode=OneWay}" Style="{x:Bind SelectTextBoxStyle(ViewModel.XError, ViewModel.XMaxError), Mode=OneWay}"
HeaderTemplate="{StaticResource XYTextBoxHeaderTemplate}"
PreviewKeyDown="GridSettingsTextBox_PreviewKeyDown" PreviewKeyDown="GridSettingsTextBox_PreviewKeyDown"
Text="{x:Bind ViewModel.XMax, Mode=TwoWay}"/> Text="{x:Bind ViewModel.XMax, Mode=TwoWay}"/>
@ -134,6 +140,7 @@
Grid.Row="2" Grid.Row="2"
MaxWidth="160" MaxWidth="160"
Style="{x:Bind SelectTextBoxStyle(ViewModel.YError, ViewModel.YMinError), Mode=OneWay}" Style="{x:Bind SelectTextBoxStyle(ViewModel.YError, ViewModel.YMinError), Mode=OneWay}"
HeaderTemplate="{StaticResource XYTextBoxHeaderTemplate}"
PreviewKeyDown="GridSettingsTextBox_PreviewKeyDown" PreviewKeyDown="GridSettingsTextBox_PreviewKeyDown"
Text="{x:Bind ViewModel.YMin, Mode=TwoWay}"/> Text="{x:Bind ViewModel.YMin, Mode=TwoWay}"/>
<TextBox x:Name="SettingsYMax" <TextBox x:Name="SettingsYMax"
@ -142,6 +149,7 @@
Grid.Column="2" Grid.Column="2"
MaxWidth="160" MaxWidth="160"
Style="{x:Bind SelectTextBoxStyle(ViewModel.YError, ViewModel.YMaxError), Mode=OneWay}" Style="{x:Bind SelectTextBoxStyle(ViewModel.YError, ViewModel.YMaxError), Mode=OneWay}"
HeaderTemplate="{StaticResource XYTextBoxHeaderTemplate}"
PreviewKeyDown="GridSettingsTextBox_PreviewKeyDown" PreviewKeyDown="GridSettingsTextBox_PreviewKeyDown"
Text="{x:Bind ViewModel.YMax, Mode=TwoWay}"/> Text="{x:Bind ViewModel.YMax, Mode=TwoWay}"/>
</Grid> </Grid>

4
src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml
View File

@ -59,7 +59,7 @@
<Style x:Name="KGF_TitleTextBlockStyle" TargetType="TextBlock"> <Style x:Name="KGF_TitleTextBlockStyle" TargetType="TextBlock">
<Setter Property="FontWeight" Value="Medium"/> <Setter Property="FontWeight" Value="Medium"/>
<Setter Property="FontSize" Value="14"/> <Setter Property="FontSize" Value="16"/>
<Setter Property="TextWrapping" Value="WrapWholeWords"/> <Setter Property="TextWrapping" Value="WrapWholeWords"/>
<Setter Property="AutomationProperties.HeadingLevel" Value="Level2"/> <Setter Property="AutomationProperties.HeadingLevel" Value="Level2"/>
</Style> </Style>
@ -194,7 +194,7 @@
Grid.Row="1" Grid.Row="1"
Margin="12,12,10,0" Margin="12,12,10,0"
Style="{StaticResource KGF_TitleTextBlockStyle}" Style="{StaticResource KGF_TitleTextBlockStyle}"
FontSize="18" FontSize="20"
AutomationProperties.HeadingLevel="Level1"/> AutomationProperties.HeadingLevel="Level1"/>
<ListView x:Name="KeyGraphFeaturesListView" <ListView x:Name="KeyGraphFeaturesListView"