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

Fix auto-scaling of CalculationResult when the current locale displays symbols at the right

Browse source
This commit is contained in:
Rudy Huyn 2019-03-10 00:10:17 -08:00
commit a98628261d
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -487,6 +487,7 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock x:Name="CurrencySymbol1Block"
Grid.Column="0"
@ -541,6 +542,7 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock x:Name="CurrencySymbol2Block"
Grid.Column="0"
@ -620,7 +622,7 @@
Click="CurrencyRefreshButton_Click"
x:Uid="RefreshButtonText"/>
<TextBlock Style="{ThemeResource CaptionTextBlockStyle}" Margin="0, 7, 0, 0">
<Run x:Name="Spacing" Text="&#x200A;"/>
<Run x:Name="Spacing" Text="&#x200A;"/>
<Run x:Name="CurrencySecondaryStatus"
FontWeight="SemiBold"
Text=""/>

9
src/Calculator/Views/UnitConverter.xaml.cpp
View file

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
// UnitConverter.xaml.cpp
@ -66,11 +66,8 @@ UnitConverter::UnitConverter() :
if (preferRight)
{
// Currency symbol should appear on the right. Reverse the order of children.
Grid::SetColumn(Value1, 0);
Grid::SetColumn(CurrencySymbol1Block, 1);
Grid::SetColumn(Value2, 0);
Grid::SetColumn(CurrencySymbol2Block, 1);
Grid::SetColumn(CurrencySymbol1Block, 2);
Grid::SetColumn(CurrencySymbol2Block, 2);
}
auto userSettings = ref new UISettings();