From a98628261d8d72847cefecd44c8df12974c573db Mon Sep 17 00:00:00 2001
From: Rudy Huyn <rudyhuyn@gmail.com>
Date: Sun, 10 Mar 2019 00:10:17 -0800
Subject: [PATCH] Fix auto-scaling of CalculationResult when the current locale
 displays symbols at the right

---
 src/Calculator/Views/UnitConverter.xaml     | 4 +++-
 src/Calculator/Views/UnitConverter.xaml.cpp | 9 +++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Calculator/Views/UnitConverter.xaml b/src/Calculator/Views/UnitConverter.xaml
index 7afc660d..6109fd32 100644
--- a/src/Calculator/Views/UnitConverter.xaml
+++ b/src/Calculator/Views/UnitConverter.xaml
@@ -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=""/>
diff --git a/src/Calculator/Views/UnitConverter.xaml.cpp b/src/Calculator/Views/UnitConverter.xaml.cpp
index a4889a55..de86f1e4 100644
--- a/src/Calculator/Views/UnitConverter.xaml.cpp
+++ b/src/Calculator/Views/UnitConverter.xaml.cpp
@@ -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();