From 62a028e3c5995e6e63faafc94cf9f64f9c979f69 Mon Sep 17 00:00:00 2001
From: Han Zhang <zhangh@microsoft.com>
Date: Wed, 4 Aug 2021 16:09:15 +0800
Subject: [PATCH] Fix title bar string trimming issue and right-to-left display
 issue

---
 src/Calculator/Views/TitleBar.xaml    | 7 +++----
 src/Calculator/Views/TitleBar.xaml.cs | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Calculator/Views/TitleBar.xaml b/src/Calculator/Views/TitleBar.xaml
index 29b60f79..a9da2168 100644
--- a/src/Calculator/Views/TitleBar.xaml
+++ b/src/Calculator/Views/TitleBar.xaml
@@ -65,14 +65,13 @@
                   Background="Transparent">
                 <Grid x:Name="TitleHolder">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
 
                     <Image x:Name="AppIcon"
-                           Width="16"
-                           Height="16"
+                           Width="20"
+                           Height="20"
                            Margin="16,0,0,0"
                            VerticalAlignment="Center"
                            AutomationProperties.AccessibilityView="Raw"
@@ -80,7 +79,7 @@
                     <TextBlock x:Name="AppName"
                                x:Uid="AppName"
                                Grid.Column="1"
-                               Margin="16,0,16,0"
+                               Margin="12,0,0,0"
                                HorizontalAlignment="Left"
                                VerticalAlignment="Center"
                                FontSize="12"
diff --git a/src/Calculator/Views/TitleBar.xaml.cs b/src/Calculator/Views/TitleBar.xaml.cs
index 2797e5bb..8c02f16b 100644
--- a/src/Calculator/Views/TitleBar.xaml.cs
+++ b/src/Calculator/Views/TitleBar.xaml.cs
@@ -154,7 +154,7 @@ namespace CalculatorApp
             else
             {
                 leftAddition = m_coreTitleBar.SystemOverlayRightInset;
-                leftAddition = m_coreTitleBar.SystemOverlayLeftInset;
+                rightAddition = m_coreTitleBar.SystemOverlayLeftInset;
             }
 
             LayoutRoot.Padding = new Thickness(leftAddition, 0, rightAddition, 0);