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

Merge pull request #57 from nventive/dev/dr/ResultScale

Browse source 
Workaround text scaling in converters
This commit is contained in:
David 2019-05-25 23:42:40 -04:00 • committed by GitHub
commit f4d6fb9162
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -478,10 +478,11 @@
IsActive="False"/> IsActive="False"/>
</Grid> </Grid>
<!--TODO UNO: HorizontalAlignment="{x:Bind FlowDirectionHorizontalAlignment}" -->
<Grid x:Name="Value1Container" <Grid x:Name="Value1Container"
Grid.Row="1" Grid.Row="1"
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="{x:Bind FlowDirectionHorizontalAlignment}" HorizontalAlignment="Stretch"
Style="{ThemeResource ValueContainerStyle}" Style="{ThemeResource ValueContainerStyle}"
Visibility="{x:Bind Model.IsCurrencyLoadingVisible, Mode=OneWay, Converter={StaticResource BooleanToVisibilityNegationConverter}}"> Visibility="{x:Bind Model.IsCurrencyLoadingVisible, Mode=OneWay, Converter={StaticResource BooleanToVisibilityNegationConverter}}">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@ -535,10 +536,11 @@
AutomationProperties.AutomationId="Units1" AutomationProperties.AutomationId="Units1"
AutomationProperties.Name="{x:Bind Model.Unit1AutomationName, Mode=OneWay}"--> AutomationProperties.Name="{x:Bind Model.Unit1AutomationName, Mode=OneWay}"-->
<!--TODO UNO: HorizontalAlignment="{x:Bind FlowDirectionHorizontalAlignment}" -->
<Grid x:Name="Value2Container" <Grid x:Name="Value2Container"
Grid.Row="3" Grid.Row="3"
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="{x:Bind FlowDirectionHorizontalAlignment}" HorizontalAlignment="Stretch"
Style="{ThemeResource ValueContainerStyle}" Style="{ThemeResource ValueContainerStyle}"
Visibility="{x:Bind Model.IsCurrencyLoadingVisible, Mode=OneWay, Converter={StaticResource BooleanToVisibilityNegationConverter}}"> Visibility="{x:Bind Model.IsCurrencyLoadingVisible, Mode=OneWay, Converter={StaticResource BooleanToVisibilityNegationConverter}}">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@ -555,7 +557,7 @@
<!--TODO UNO AutomationProperties.AccessibilityView="Raw"--> <!--TODO UNO AutomationProperties.AccessibilityView="Raw"-->
<controls:CalculationResult x:Name="Value2" <controls:CalculationResult x:Name="Value2"
Grid.Column="1" Grid.Column="1"
Style="{ThemeResource ValueMediumStyle}" Style="{ThemeResource ValueMediumStyle}"
ContextCanceled="OnContextCanceled" ContextCanceled="OnContextCanceled"
ContextRequested="OnContextRequested" ContextRequested="OnContextRequested"
DisplayValue="{x:Bind Model.Value2, Mode=OneWay}" DisplayValue="{x:Bind Model.Value2, Mode=OneWay}"