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

Set IsTextScaleFactorEnabled to true for HEX, DEC, OCT, BIN buttons (#1157)

Browse Source 
* fix scale factor

* Allow expression to scale
This commit is contained in:
Pepe Rivera 2020-04-24 10:03:04 -07:00 committed by GitHub
parent db86e949f9
commit c2c92f4006
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Calculator/Views/Calculator.xaml
View File

@ -17,21 +17,17 @@
<DataTemplate x:Key="Operand" x:DataType="common:DisplayExpressionToken"> <DataTemplate x:Key="Operand" x:DataType="common:DisplayExpressionToken">
<TextBlock Margin="2,0,0,0" <TextBlock Margin="2,0,0,0"
Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}" Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
IsTextScaleFactorEnabled="False"
Text="{x:Bind Token, Mode=OneWay}"/> Text="{x:Bind Token, Mode=OneWay}"/>
</DataTemplate> </DataTemplate>
<DataTemplate x:Key="Operator" x:DataType="common:DisplayExpressionToken"> <DataTemplate x:Key="Operator" x:DataType="common:DisplayExpressionToken">
<TextBlock Margin="2,0,0,0" <TextBlock Margin="2,0,0,0"
Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}" Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
IsTextScaleFactorEnabled="False"
Text="{x:Bind Token, Mode=OneWay}"/> Text="{x:Bind Token, Mode=OneWay}"/>
</DataTemplate> </DataTemplate>
<DataTemplate x:Key="Separator" x:DataType="common:DisplayExpressionToken"> <DataTemplate x:Key="Separator" x:DataType="common:DisplayExpressionToken">
<TextBlock x:Name="MainText" <TextBlock x:Name="MainText" Text="{x:Bind Token, Mode=OneWay}"/>
IsTextScaleFactorEnabled="False"
Text="{x:Bind Token, Mode=OneWay}"/>
</DataTemplate> </DataTemplate>
<!-- TextBox Styles --> <!-- TextBox Styles -->

14
src/Calculator/Views/CalculatorProgrammerOperators.xaml
View File

@ -83,7 +83,7 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock x:Name="ContentPresenter" <TextBlock x:Name="ContentPresenter"
Grid.Column="2" Grid.Column="2"
Margin="0,2,4,-2" Margin="4,0,4,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}" Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"
@ -91,9 +91,8 @@
FontSize="{TemplateBinding FontSize}" FontSize="{TemplateBinding FontSize}"
FontWeight="{TemplateBinding FontWeight}" FontWeight="{TemplateBinding FontWeight}"
AutomationProperties.AccessibilityView="Raw" AutomationProperties.AccessibilityView="Raw"
IsTextScaleFactorEnabled="False" IsTextScaleFactorEnabled="{TemplateBinding IsTextScaleFactorEnabled}"
Text="{TemplateBinding Content}" Text="{TemplateBinding Content}"
TextLineBounds="TrimToCapHeight"
TextWrapping="Wrap"/> TextWrapping="Wrap"/>
<TextBlock x:Name="LabelPresenter" <TextBlock x:Name="LabelPresenter"
Grid.Column="1" Grid.Column="1"
@ -105,7 +104,7 @@
FontSize="{TemplateBinding FontSize}" FontSize="{TemplateBinding FontSize}"
FontWeight="{TemplateBinding FontWeight}" FontWeight="{TemplateBinding FontWeight}"
AutomationProperties.AccessibilityView="Raw" AutomationProperties.AccessibilityView="Raw"
IsTextScaleFactorEnabled="False" IsTextScaleFactorEnabled="{TemplateBinding IsTextScaleFactorEnabled}"
Text="{TemplateBinding Tag}"/> Text="{TemplateBinding Tag}"/>
</Grid> </Grid>
<Grid x:Name="CheckedStatesGrid" <Grid x:Name="CheckedStatesGrid"
@ -124,7 +123,7 @@
Fill="{ThemeResource SystemControlHighlightAccentBrush}"/> Fill="{ThemeResource SystemControlHighlightAccentBrush}"/>
<TextBlock x:Name="CheckedContentPresenter" <TextBlock x:Name="CheckedContentPresenter"
Grid.Column="2" Grid.Column="2"
Margin="0,2,4,-2" Margin="4,0,4,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
Foreground="{ThemeResource SystemControlHighlightAltBaseHighBrush}" Foreground="{ThemeResource SystemControlHighlightAltBaseHighBrush}"
@ -132,9 +131,8 @@
FontSize="{TemplateBinding FontSize}" FontSize="{TemplateBinding FontSize}"
FontWeight="{TemplateBinding FontWeight}" FontWeight="{TemplateBinding FontWeight}"
AutomationProperties.AccessibilityView="Raw" AutomationProperties.AccessibilityView="Raw"
IsTextScaleFactorEnabled="False" IsTextScaleFactorEnabled="{TemplateBinding IsTextScaleFactorEnabled}"
Text="{TemplateBinding Content}" Text="{TemplateBinding Content}"
TextLineBounds="TrimToCapHeight"
TextWrapping="Wrap"/> TextWrapping="Wrap"/>
<TextBlock x:Name="CheckedLabelPresenter" <TextBlock x:Name="CheckedLabelPresenter"
Grid.Column="1" Grid.Column="1"
@ -146,7 +144,7 @@
FontSize="{TemplateBinding FontSize}" FontSize="{TemplateBinding FontSize}"
FontWeight="{TemplateBinding FontWeight}" FontWeight="{TemplateBinding FontWeight}"
AutomationProperties.AccessibilityView="Raw" AutomationProperties.AccessibilityView="Raw"
IsTextScaleFactorEnabled="False" IsTextScaleFactorEnabled="{TemplateBinding IsTextScaleFactorEnabled}"
Text="{TemplateBinding Tag}"/> Text="{TemplateBinding Tag}"/>
</Grid> </Grid>
</Grid> </Grid>