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

Merge pull request #46 from nventive/dev/gefi/font-size-converters

Browse source 
Converters input/output font size is not valid
This commit is contained in:
David 2019-05-24 17:12:19 -04:00 • committed by GitHub
commit c350c867da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Calculator.Shared/Views/UnitConverter.xaml
View file

@ -200,7 +200,7 @@
<Style x:Key="ValueMediumStyle" <Style x:Key="ValueMediumStyle"
BasedOn="{StaticResource ValueBaseStyle}" BasedOn="{StaticResource ValueBaseStyle}"
TargetType="controls:CalculationResult"> TargetType="controls:CalculationResult">
<Setter Property="MaxFontSize" Value="34"/> <Setter Property="MaxFontSize" Value="46"/>
<Setter Property="Margin" Value="0,0,0,0"/> <Setter Property="Margin" Value="0,0,0,0"/>
<Setter Property="DisplayMargin" Value="0,0,0,4"/> <Setter Property="DisplayMargin" Value="0,0,0,4"/>
</Style> </Style>
@ -502,6 +502,7 @@
DisplayValue="{x:Bind Model.Value1, Mode=OneWay}" DisplayValue="{x:Bind Model.Value1, Mode=OneWay}"
ExpressionVisibility="Collapsed" ExpressionVisibility="Collapsed"
FlowDirection="{x:Bind LayoutDirection}" FlowDirection="{x:Bind LayoutDirection}"
FontSize="{StaticResource CalcResultFontSizeM}"
IsActive="{Binding Value1Active, Mode=TwoWay}" IsActive="{Binding Value1Active, Mode=TwoWay}"
KeyDown="OnValueKeyDown" KeyDown="OnValueKeyDown"
ValueSelected="OnValueSelected" ValueSelected="OnValueSelected"
@ -558,6 +559,7 @@
DisplayValue="{x:Bind Model.Value2, Mode=OneWay}" DisplayValue="{x:Bind Model.Value2, Mode=OneWay}"
ExpressionVisibility="Collapsed" ExpressionVisibility="Collapsed"
FlowDirection="{x:Bind LayoutDirection}" FlowDirection="{x:Bind LayoutDirection}"
FontSize="{StaticResource CalcResultFontSizeM}"
IsActive="{Binding Value2Active, Mode=TwoWay}" IsActive="{Binding Value2Active, Mode=TwoWay}"
KeyDown="OnValueKeyDown" KeyDown="OnValueKeyDown"
ValueSelected="OnValueSelected" ValueSelected="OnValueSelected"