From 31ca62bb0e37b088f09b7953cf5958d2af3fa718 Mon Sep 17 00:00:00 2001
From: Vsevolod <sevkorobot@gmail.com>
Date: Mon, 14 Dec 2020 14:24:08 -0800
Subject: [PATCH] Add support for Content Alignment inside AutoSuggestBox
 (#3383)

* Add content alignment support

* Remove test from PR, add defalt alignment parameters

* Add content alignment support to default textbox template

* Update verification files

* Update Vertificatin files

* Update verification files

* Remove unnecessary ver file
---
 .../AutoSuggestBox_themeresources.xaml        |   6 +
 dev/CommonStyles/TextBox_themeresources.xaml  |   4 +
 .../verification/AppBarToggleButton-4.xml     |  18 +-
 .../verification/AppBarToggleButton-5.xml     | 161 ++++++++++++++++++
 .../NavigationViewLeftPaneContent-4.xml       |  12 +-
 .../NavigationViewLeftPaneContent-7.xml       |  12 +-
 .../NavigationViewLeftPaneContent-8.xml       |  12 +-
 .../NavigationViewTopPaneContent-4.xml        |  12 +-
 .../NavigationViewTopPaneContent-7.xml        |  12 +-
 .../NavigationViewTopPaneContent-8.xml        |  12 +-
 .../verification/TextBox-4.xml                |  12 +-
 .../verification/TextBox-5.xml                |  12 +-
 .../verification/TextBox-7.xml                |  12 +-
 13 files changed, 234 insertions(+), 63 deletions(-)
 create mode 100644 test/MUXControlsTestApp/verification/AppBarToggleButton-5.xml

diff --git a/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml b/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml
index 2949ac5870..06bd95bf6d 100644
--- a/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml
+++ b/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml
@@ -315,6 +315,8 @@
                             IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
                             IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
                             IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             Margin="{TemplateBinding BorderThickness}"
                             Padding="{TemplateBinding Padding}"
                             IsTabStop="False"
@@ -372,6 +374,8 @@
 
     <Style x:Key="DefaultAutoSuggestBoxStyle" TargetType="AutoSuggestBox">
         <Setter Property="VerticalAlignment" Value="Top" />
+        <Setter Property="VerticalContentAlignment" Value="Top"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="Foreground" Value="{ThemeResource TextControlForeground}" />
         <Setter Property="Background" Value="{ThemeResource TextControlBackground}" />
@@ -418,6 +422,8 @@
                             FontFamily="{TemplateBinding FontFamily}"
                             FontWeight="{TemplateBinding FontWeight}"
                             FontStretch="{TemplateBinding FontStretch}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                             ScrollViewer.BringIntoViewOnFocusChange="False"
                             Canvas.ZIndex="0"
                             Margin="0"
diff --git a/dev/CommonStyles/TextBox_themeresources.xaml b/dev/CommonStyles/TextBox_themeresources.xaml
index ec4f269657..9065a453d4 100644
--- a/dev/CommonStyles/TextBox_themeresources.xaml
+++ b/dev/CommonStyles/TextBox_themeresources.xaml
@@ -101,6 +101,8 @@
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
         <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
+        <Setter Property="VerticalContentAlignment" Value="Top"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
         <Setter Property="MinHeight" Value="{ThemeResource TextControlThemeMinHeight}" />
         <Setter Property="MinWidth" Value="{ThemeResource TextControlThemeMinWidth}" />
         <Setter Property="Padding" Value="{ThemeResource TextControlThemePadding}" />
@@ -314,6 +316,8 @@
                             IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
                             IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
                             IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             Margin="{TemplateBinding BorderThickness}"
                             Padding="{TemplateBinding Padding}"
                             IsTabStop="False"
diff --git a/test/MUXControlsTestApp/verification/AppBarToggleButton-4.xml b/test/MUXControlsTestApp/verification/AppBarToggleButton-4.xml
index 5fc9a0f5e6..5c4b6536f7 100644
--- a/test/MUXControlsTestApp/verification/AppBarToggleButton-4.xml
+++ b/test/MUXControlsTestApp/verification/AppBarToggleButton-4.xml
@@ -26,7 +26,7 @@
       FocusVisualPrimaryThickness=2,2,2,2
       FocusVisualPrimaryBrush=#FF000000
       Visibility=Visible
-      RenderSize=68,56
+      RenderSize=68,40
     [Windows.UI.Xaml.Controls.Grid]
         Padding=0,0,0,0
         CornerRadius=0,0,0,0
@@ -40,7 +40,7 @@
         FocusVisualPrimaryThickness=2,2,2,2
         FocusVisualPrimaryBrush=#FF000000
         Visibility=Visible
-        RenderSize=68,56
+        RenderSize=68,40
       [Windows.UI.Xaml.Shapes.Rectangle]
           StrokeThickness=1
           Name=CheckedHighlightBackground
@@ -50,7 +50,7 @@
           FocusVisualPrimaryThickness=2,2,2,2
           FocusVisualPrimaryBrush=#FF000000
           Visibility=Visible
-          RenderSize=68,56
+          RenderSize=68,40
       [Windows.UI.Xaml.Shapes.Rectangle]
           StrokeThickness=1
           Name=AccentOverlayBackground
@@ -60,7 +60,7 @@
           FocusVisualPrimaryThickness=2,2,2,2
           FocusVisualPrimaryBrush=#FF000000
           Visibility=Visible
-          RenderSize=68,56
+          RenderSize=68,40
       [Windows.UI.Xaml.Shapes.Rectangle]
           StrokeThickness=1
           Name=AppBarToggleButtonInnerBorder
@@ -70,7 +70,7 @@
           FocusVisualPrimaryThickness=2,2,2,2
           FocusVisualPrimaryBrush=#FF000000
           Visibility=Visible
-          RenderSize=68,56
+          RenderSize=68,40
       [Windows.UI.Xaml.Controls.Grid]
           Padding=0,0,0,0
           CornerRadius=0,0,0,0
@@ -78,14 +78,14 @@
           BorderBrush=[NULL]
           Background=[NULL]
           Name=ContentRoot
-          MinHeight=56
+          MinHeight=40
           Margin=0,0,0,0
           FocusVisualSecondaryThickness=1,1,1,1
           FocusVisualSecondaryBrush=#99FFFFFF
           FocusVisualPrimaryThickness=2,2,2,2
           FocusVisualPrimaryBrush=#FF000000
           Visibility=Visible
-          RenderSize=68,56
+          RenderSize=68,40
         [Windows.UI.Xaml.Controls.TextBlock]
             Padding=0,0,0,0
             Foreground=#FF000000
@@ -146,8 +146,8 @@
             FocusVisualSecondaryBrush=#99FFFFFF
             FocusVisualPrimaryThickness=2,2,2,2
             FocusVisualPrimaryBrush=#FF000000
-            Visibility=Visible
-            RenderSize=64,16
+            Visibility=Collapsed
+            RenderSize=0,0
         [Windows.UI.Xaml.Controls.TextBlock]
             Padding=0,5,0,8
             Foreground=#FF000000
diff --git a/test/MUXControlsTestApp/verification/AppBarToggleButton-5.xml b/test/MUXControlsTestApp/verification/AppBarToggleButton-5.xml
new file mode 100644
index 0000000000..5fc9a0f5e6
--- /dev/null
+++ b/test/MUXControlsTestApp/verification/AppBarToggleButton-5.xml
@@ -0,0 +1,161 @@
+[Windows.UI.Xaml.Controls.Grid]
+    Padding=0,0,0,0
+    CornerRadius=0,0,0,0
+    BorderThickness=0,0,0,0
+    BorderBrush=[NULL]
+    Background=[NULL]
+    Width=400
+    Margin=0,0,0,0
+    Height=400
+    FocusVisualSecondaryThickness=1,1,1,1
+    FocusVisualSecondaryBrush=#99FFFFFF
+    FocusVisualPrimaryThickness=2,2,2,2
+    FocusVisualPrimaryBrush=#FF000000
+    Visibility=Visible
+    RenderSize=400,400
+  [Windows.UI.Xaml.Controls.AppBarToggleButton]
+      Padding=0,0,0,0
+      Foreground=#FF000000
+      BorderThickness=0,0,0,0
+      BorderBrush=#00FFFFFF
+      Background=#00FFFFFF
+      Width=68
+      Margin=0,0,0,0
+      FocusVisualSecondaryThickness=1,1,1,1
+      FocusVisualSecondaryBrush=#99FFFFFF
+      FocusVisualPrimaryThickness=2,2,2,2
+      FocusVisualPrimaryBrush=#FF000000
+      Visibility=Visible
+      RenderSize=68,56
+    [Windows.UI.Xaml.Controls.Grid]
+        Padding=0,0,0,0
+        CornerRadius=0,0,0,0
+        BorderThickness=0,0,0,0
+        BorderBrush=#00FFFFFF
+        Background=#00FFFFFF
+        Name=Root
+        Margin=0,0,0,0
+        FocusVisualSecondaryThickness=1,1,1,1
+        FocusVisualSecondaryBrush=#99FFFFFF
+        FocusVisualPrimaryThickness=2,2,2,2
+        FocusVisualPrimaryBrush=#FF000000
+        Visibility=Visible
+        RenderSize=68,56
+      [Windows.UI.Xaml.Shapes.Rectangle]
+          StrokeThickness=1
+          Name=CheckedHighlightBackground
+          Margin=0,0,0,0
+          FocusVisualSecondaryThickness=1,1,1,1
+          FocusVisualSecondaryBrush=#99FFFFFF
+          FocusVisualPrimaryThickness=2,2,2,2
+          FocusVisualPrimaryBrush=#FF000000
+          Visibility=Visible
+          RenderSize=68,56
+      [Windows.UI.Xaml.Shapes.Rectangle]
+          StrokeThickness=1
+          Name=AccentOverlayBackground
+          Margin=0,0,0,0
+          FocusVisualSecondaryThickness=1,1,1,1
+          FocusVisualSecondaryBrush=#99FFFFFF
+          FocusVisualPrimaryThickness=2,2,2,2
+          FocusVisualPrimaryBrush=#FF000000
+          Visibility=Visible
+          RenderSize=68,56
+      [Windows.UI.Xaml.Shapes.Rectangle]
+          StrokeThickness=1
+          Name=AppBarToggleButtonInnerBorder
+          Margin=0,0,0,0
+          FocusVisualSecondaryThickness=1,1,1,1
+          FocusVisualSecondaryBrush=#99FFFFFF
+          FocusVisualPrimaryThickness=2,2,2,2
+          FocusVisualPrimaryBrush=#FF000000
+          Visibility=Visible
+          RenderSize=68,56
+      [Windows.UI.Xaml.Controls.Grid]
+          Padding=0,0,0,0
+          CornerRadius=0,0,0,0
+          BorderThickness=0,0,0,0
+          BorderBrush=[NULL]
+          Background=[NULL]
+          Name=ContentRoot
+          MinHeight=56
+          Margin=0,0,0,0
+          FocusVisualSecondaryThickness=1,1,1,1
+          FocusVisualSecondaryBrush=#99FFFFFF
+          FocusVisualPrimaryThickness=2,2,2,2
+          FocusVisualPrimaryBrush=#FF000000
+          Visibility=Visible
+          RenderSize=68,56
+        [Windows.UI.Xaml.Controls.TextBlock]
+            Padding=0,0,0,0
+            Foreground=#FF000000
+            Width=14
+            Name=OverflowCheckGlyph
+            Margin=12,4,12,4
+            Height=14
+            FocusVisualSecondaryThickness=1,1,1,1
+            FocusVisualSecondaryBrush=#99FFFFFF
+            FocusVisualPrimaryThickness=2,2,2,2
+            FocusVisualPrimaryBrush=#FF000000
+            Visibility=Collapsed
+            RenderSize=0,0
+        [Windows.UI.Xaml.Controls.Viewbox]
+            Name=ContentViewbox
+            Margin=0,12,0,4
+            Height=16
+            FocusVisualSecondaryThickness=1,1,1,1
+            FocusVisualSecondaryBrush=#99FFFFFF
+            FocusVisualPrimaryThickness=2,2,2,2
+            FocusVisualPrimaryBrush=#FF000000
+            Visibility=Visible
+            RenderSize=0,0
+          [Windows.UI.Xaml.Controls.Border]
+              Padding=0,0,0,0
+              CornerRadius=0,0,0,0
+              BorderThickness=0,0,0,0
+              BorderBrush=[NULL]
+              Background=[NULL]
+              Margin=0,0,0,0
+              FocusVisualSecondaryThickness=1,1,1,1
+              FocusVisualSecondaryBrush=#99FFFFFF
+              FocusVisualPrimaryThickness=2,2,2,2
+              FocusVisualPrimaryBrush=#FF000000
+              Visibility=Visible
+              RenderSize=0,0
+            [Windows.UI.Xaml.Controls.ContentPresenter]
+                Foreground=#FF000000
+                Padding=0,0,0,0
+                CornerRadius=0,0,0,0
+                BorderThickness=0,0,0,0
+                BorderBrush=[NULL]
+                Background=[NULL]
+                Name=Content
+                Margin=0,0,0,0
+                FocusVisualSecondaryThickness=1,1,1,1
+                FocusVisualSecondaryBrush=#99FFFFFF
+                FocusVisualPrimaryThickness=2,2,2,2
+                FocusVisualPrimaryBrush=#FF000000
+                Visibility=Visible
+                RenderSize=0,0
+        [Windows.UI.Xaml.Controls.TextBlock]
+            Padding=0,0,0,0
+            Foreground=#FF000000
+            Name=TextLabel
+            Margin=2,0,2,8
+            FocusVisualSecondaryThickness=1,1,1,1
+            FocusVisualSecondaryBrush=#99FFFFFF
+            FocusVisualPrimaryThickness=2,2,2,2
+            FocusVisualPrimaryBrush=#FF000000
+            Visibility=Visible
+            RenderSize=64,16
+        [Windows.UI.Xaml.Controls.TextBlock]
+            Padding=0,5,0,8
+            Foreground=#FF000000
+            Name=OverflowTextLabel
+            Margin=38,0,12,0
+            FocusVisualSecondaryThickness=1,1,1,1
+            FocusVisualSecondaryBrush=#99FFFFFF
+            FocusVisualPrimaryThickness=2,2,2,2
+            FocusVisualPrimaryBrush=#FF000000
+            Visibility=Collapsed
+            RenderSize=0,0
diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-4.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-4.xml
index 0138d7edc6..ed6742ee3a 100644
--- a/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-4.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-4.xml
@@ -793,7 +793,7 @@
                                   FocusVisualPrimaryThickness=2,2,2,2
                                   FocusVisualPrimaryBrush=#FF000000
                                   Visibility=Visible
-                                  RenderSize=272,31
+                                  RenderSize=17,31
                                 [Windows.UI.Xaml.Controls.Border]
                                     Padding=0,0,0,0
                                     CornerRadius=0,0,0,0
@@ -807,7 +807,7 @@
                                     FocusVisualPrimaryThickness=2,2,2,2
                                     FocusVisualPrimaryBrush=#FF000000
                                     Visibility=Visible
-                                    RenderSize=272,31
+                                    RenderSize=17,31
                                   [Windows.UI.Xaml.Controls.Grid]
                                       Padding=0,0,0,0
                                       CornerRadius=0,0,0,0
@@ -820,7 +820,7 @@
                                       FocusVisualPrimaryThickness=2,2,2,2
                                       FocusVisualPrimaryBrush=#FF000000
                                       Visibility=Visible
-                                      RenderSize=272,31
+                                      RenderSize=17,31
                                     [Windows.UI.Xaml.Controls.ScrollContentPresenter]
                                         Foreground=#FF000000
                                         Padding=0,0,0,0
@@ -835,7 +835,7 @@
                                         FocusVisualPrimaryThickness=2,2,2,2
                                         FocusVisualPrimaryBrush=#FF000000
                                         Visibility=Visible
-                                        RenderSize=256,20
+                                        RenderSize=1,20
                                       [Windows.UI.Xaml.FrameworkElement]
                                           Margin=0,0,0,0
                                           FocusVisualSecondaryThickness=1,1,1,1
@@ -843,7 +843,7 @@
                                           FocusVisualPrimaryThickness=2,2,2,2
                                           FocusVisualPrimaryBrush=#FF000000
                                           Visibility=Visible
-                                          RenderSize=256,20
+                                          RenderSize=1,20
                                     [Windows.UI.Xaml.Controls.Grid]
                                         Padding=0,0,0,0
                                         CornerRadius=0,0,0,0
@@ -856,7 +856,7 @@
                                         FocusVisualPrimaryThickness=2,2,2,2
                                         FocusVisualPrimaryBrush=#FF000000
                                         Visibility=Visible
-                                        RenderSize=272,31
+                                        RenderSize=17,31
                                     [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
                                         Padding=0,0,0,0
                                         Foreground=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-7.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-7.xml
index 6884c0d42c..3378f4c308 100644
--- a/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-7.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-7.xml
@@ -812,7 +812,7 @@
                                   FocusVisualPrimaryThickness=2,2,2,2
                                   FocusVisualPrimaryBrush=#FF000000
                                   Visibility=Visible
-                                  RenderSize=272,30
+                                  RenderSize=17,30
                                 [Windows.UI.Xaml.Controls.Border]
                                     Padding=0,0,0,0
                                     CornerRadius=0,0,0,0
@@ -826,7 +826,7 @@
                                     FocusVisualPrimaryThickness=2,2,2,2
                                     FocusVisualPrimaryBrush=#FF000000
                                     Visibility=Visible
-                                    RenderSize=272,30
+                                    RenderSize=17,30
                                   [Windows.UI.Xaml.Controls.Grid]
                                       Padding=0,0,0,0
                                       CornerRadius=0,0,0,0
@@ -839,7 +839,7 @@
                                       FocusVisualPrimaryThickness=2,2,2,2
                                       FocusVisualPrimaryBrush=#FF000000
                                       Visibility=Visible
-                                      RenderSize=272,30
+                                      RenderSize=17,30
                                     [Windows.UI.Xaml.Controls.ScrollContentPresenter]
                                         Foreground=#FF000000
                                         Padding=0,0,0,0
@@ -854,7 +854,7 @@
                                         FocusVisualPrimaryThickness=2,2,2,2
                                         FocusVisualPrimaryBrush=#FF000000
                                         Visibility=Visible
-                                        RenderSize=256,19
+                                        RenderSize=1,19
                                       [Windows.UI.Xaml.FrameworkElement]
                                           Margin=0,0,0,0
                                           FocusVisualSecondaryThickness=1,1,1,1
@@ -862,7 +862,7 @@
                                           FocusVisualPrimaryThickness=2,2,2,2
                                           FocusVisualPrimaryBrush=#FF000000
                                           Visibility=Visible
-                                          RenderSize=256,19
+                                          RenderSize=1,19
                                     [Windows.UI.Xaml.Controls.Grid]
                                         Padding=0,0,0,0
                                         CornerRadius=0,0,0,0
@@ -875,7 +875,7 @@
                                         FocusVisualPrimaryThickness=2,2,2,2
                                         FocusVisualPrimaryBrush=#FF000000
                                         Visibility=Visible
-                                        RenderSize=272,30
+                                        RenderSize=17,30
                                     [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
                                         Padding=0,0,0,0
                                         Foreground=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-8.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-8.xml
index 2e370b326e..7b89dc596f 100644
--- a/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-8.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-8.xml
@@ -812,7 +812,7 @@
                                   FocusVisualPrimaryThickness=2,2,2,2
                                   FocusVisualPrimaryBrush=#FF000000
                                   Visibility=Visible
-                                  RenderSize=272,30
+                                  RenderSize=17,30
                                 [Windows.UI.Xaml.Controls.Border]
                                     Padding=0,0,0,0
                                     CornerRadius=0,0,0,0
@@ -826,7 +826,7 @@
                                     FocusVisualPrimaryThickness=2,2,2,2
                                     FocusVisualPrimaryBrush=#FF000000
                                     Visibility=Visible
-                                    RenderSize=272,30
+                                    RenderSize=17,30
                                   [Windows.UI.Xaml.Controls.Grid]
                                       Padding=0,0,0,0
                                       CornerRadius=0,0,0,0
@@ -839,7 +839,7 @@
                                       FocusVisualPrimaryThickness=2,2,2,2
                                       FocusVisualPrimaryBrush=#FF000000
                                       Visibility=Visible
-                                      RenderSize=272,30
+                                      RenderSize=17,30
                                     [Windows.UI.Xaml.Controls.ScrollContentPresenter]
                                         Foreground=#FF000000
                                         Padding=0,0,0,0
@@ -854,7 +854,7 @@
                                         FocusVisualPrimaryThickness=2,2,2,2
                                         FocusVisualPrimaryBrush=#FF000000
                                         Visibility=Visible
-                                        RenderSize=256,19
+                                        RenderSize=1,19
                                       [Windows.UI.Xaml.FrameworkElement]
                                           Margin=0,0,0,0
                                           FocusVisualSecondaryThickness=1,1,1,1
@@ -862,7 +862,7 @@
                                           FocusVisualPrimaryThickness=2,2,2,2
                                           FocusVisualPrimaryBrush=#FF000000
                                           Visibility=Visible
-                                          RenderSize=256,19
+                                          RenderSize=1,19
                                     [Windows.UI.Xaml.Controls.Grid]
                                         Padding=0,0,0,0
                                         CornerRadius=0,0,0,0
@@ -875,7 +875,7 @@
                                         FocusVisualPrimaryThickness=2,2,2,2
                                         FocusVisualPrimaryBrush=#FF000000
                                         Visibility=Visible
-                                        RenderSize=272,30
+                                        RenderSize=17,30
                                     [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
                                         Padding=0,0,0,0
                                         Foreground=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-4.xml b/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-4.xml
index 0668347ef6..42aeb7699f 100644
--- a/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-4.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-4.xml
@@ -1161,7 +1161,7 @@
                             FocusVisualPrimaryThickness=2,2,2,2
                             FocusVisualPrimaryBrush=#FF000000
                             Visibility=Visible
-                            RenderSize=62,31
+                            RenderSize=17,31
                           [Windows.UI.Xaml.Controls.Border]
                               Padding=0,0,0,0
                               CornerRadius=0,0,0,0
@@ -1175,7 +1175,7 @@
                               FocusVisualPrimaryThickness=2,2,2,2
                               FocusVisualPrimaryBrush=#FF000000
                               Visibility=Visible
-                              RenderSize=62,31
+                              RenderSize=17,31
                             [Windows.UI.Xaml.Controls.Grid]
                                 Padding=0,0,0,0
                                 CornerRadius=0,0,0,0
@@ -1188,7 +1188,7 @@
                                 FocusVisualPrimaryThickness=2,2,2,2
                                 FocusVisualPrimaryBrush=#FF000000
                                 Visibility=Visible
-                                RenderSize=62,31
+                                RenderSize=17,31
                               [Windows.UI.Xaml.Controls.ScrollContentPresenter]
                                   Foreground=#FF000000
                                   Padding=0,0,0,0
@@ -1203,7 +1203,7 @@
                                   FocusVisualPrimaryThickness=2,2,2,2
                                   FocusVisualPrimaryBrush=#FF000000
                                   Visibility=Visible
-                                  RenderSize=46,20
+                                  RenderSize=1,20
                                 [Windows.UI.Xaml.FrameworkElement]
                                     Margin=0,0,0,0
                                     FocusVisualSecondaryThickness=1,1,1,1
@@ -1211,7 +1211,7 @@
                                     FocusVisualPrimaryThickness=2,2,2,2
                                     FocusVisualPrimaryBrush=#FF000000
                                     Visibility=Visible
-                                    RenderSize=46,20
+                                    RenderSize=1,20
                               [Windows.UI.Xaml.Controls.Grid]
                                   Padding=0,0,0,0
                                   CornerRadius=0,0,0,0
@@ -1224,7 +1224,7 @@
                                   FocusVisualPrimaryThickness=2,2,2,2
                                   FocusVisualPrimaryBrush=#FF000000
                                   Visibility=Visible
-                                  RenderSize=62,31
+                                  RenderSize=17,31
                               [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
                                   Padding=0,0,0,0
                                   Foreground=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-7.xml b/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-7.xml
index c1b9e36891..6880ae6b22 100644
--- a/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-7.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-7.xml
@@ -1182,7 +1182,7 @@
                             FocusVisualPrimaryThickness=2,2,2,2
                             FocusVisualPrimaryBrush=#FF000000
                             Visibility=Visible
-                            RenderSize=62,30
+                            RenderSize=17,30
                           [Windows.UI.Xaml.Controls.Border]
                               Padding=0,0,0,0
                               CornerRadius=0,0,0,0
@@ -1196,7 +1196,7 @@
                               FocusVisualPrimaryThickness=2,2,2,2
                               FocusVisualPrimaryBrush=#FF000000
                               Visibility=Visible
-                              RenderSize=62,30
+                              RenderSize=17,30
                             [Windows.UI.Xaml.Controls.Grid]
                                 Padding=0,0,0,0
                                 CornerRadius=0,0,0,0
@@ -1209,7 +1209,7 @@
                                 FocusVisualPrimaryThickness=2,2,2,2
                                 FocusVisualPrimaryBrush=#FF000000
                                 Visibility=Visible
-                                RenderSize=62,30
+                                RenderSize=17,30
                               [Windows.UI.Xaml.Controls.ScrollContentPresenter]
                                   Foreground=#FF000000
                                   Padding=0,0,0,0
@@ -1224,7 +1224,7 @@
                                   FocusVisualPrimaryThickness=2,2,2,2
                                   FocusVisualPrimaryBrush=#FF000000
                                   Visibility=Visible
-                                  RenderSize=46,19
+                                  RenderSize=1,19
                                 [Windows.UI.Xaml.FrameworkElement]
                                     Margin=0,0,0,0
                                     FocusVisualSecondaryThickness=1,1,1,1
@@ -1232,7 +1232,7 @@
                                     FocusVisualPrimaryThickness=2,2,2,2
                                     FocusVisualPrimaryBrush=#FF000000
                                     Visibility=Visible
-                                    RenderSize=46,19
+                                    RenderSize=1,19
                               [Windows.UI.Xaml.Controls.Grid]
                                   Padding=0,0,0,0
                                   CornerRadius=0,0,0,0
@@ -1245,7 +1245,7 @@
                                   FocusVisualPrimaryThickness=2,2,2,2
                                   FocusVisualPrimaryBrush=#FF000000
                                   Visibility=Visible
-                                  RenderSize=62,30
+                                  RenderSize=17,30
                               [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
                                   Padding=0,0,0,0
                                   Foreground=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-8.xml b/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-8.xml
index 82ba52a384..9932b0230f 100644
--- a/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-8.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-8.xml
@@ -1182,7 +1182,7 @@
                             FocusVisualPrimaryThickness=2,2,2,2
                             FocusVisualPrimaryBrush=#FF000000
                             Visibility=Visible
-                            RenderSize=62,30
+                            RenderSize=17,30
                           [Windows.UI.Xaml.Controls.Border]
                               Padding=0,0,0,0
                               CornerRadius=0,0,0,0
@@ -1196,7 +1196,7 @@
                               FocusVisualPrimaryThickness=2,2,2,2
                               FocusVisualPrimaryBrush=#FF000000
                               Visibility=Visible
-                              RenderSize=62,30
+                              RenderSize=17,30
                             [Windows.UI.Xaml.Controls.Grid]
                                 Padding=0,0,0,0
                                 CornerRadius=0,0,0,0
@@ -1209,7 +1209,7 @@
                                 FocusVisualPrimaryThickness=2,2,2,2
                                 FocusVisualPrimaryBrush=#FF000000
                                 Visibility=Visible
-                                RenderSize=62,30
+                                RenderSize=17,30
                               [Windows.UI.Xaml.Controls.ScrollContentPresenter]
                                   Foreground=#FF000000
                                   Padding=0,0,0,0
@@ -1224,7 +1224,7 @@
                                   FocusVisualPrimaryThickness=2,2,2,2
                                   FocusVisualPrimaryBrush=#FF000000
                                   Visibility=Visible
-                                  RenderSize=46,19
+                                  RenderSize=1,19
                                 [Windows.UI.Xaml.FrameworkElement]
                                     Margin=0,0,0,0
                                     FocusVisualSecondaryThickness=1,1,1,1
@@ -1232,7 +1232,7 @@
                                     FocusVisualPrimaryThickness=2,2,2,2
                                     FocusVisualPrimaryBrush=#FF000000
                                     Visibility=Visible
-                                    RenderSize=46,19
+                                    RenderSize=1,19
                               [Windows.UI.Xaml.Controls.Grid]
                                   Padding=0,0,0,0
                                   CornerRadius=0,0,0,0
@@ -1245,7 +1245,7 @@
                                   FocusVisualPrimaryThickness=2,2,2,2
                                   FocusVisualPrimaryBrush=#FF000000
                                   Visibility=Visible
-                                  RenderSize=62,30
+                                  RenderSize=17,30
                               [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
                                   Padding=0,0,0,0
                                   Foreground=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/TextBox-4.xml b/test/MUXControlsTestApp/verification/TextBox-4.xml
index a4aa396496..fef60eb0ae 100644
--- a/test/MUXControlsTestApp/verification/TextBox-4.xml
+++ b/test/MUXControlsTestApp/verification/TextBox-4.xml
@@ -70,7 +70,7 @@
           FocusVisualPrimaryThickness=2,2,2,2
           FocusVisualPrimaryBrush=#FF000000
           Visibility=Visible
-          RenderSize=398,398
+          RenderSize=17,31
         [Windows.UI.Xaml.Controls.Border]
             Padding=0,0,0,0
             CornerRadius=0,0,0,0
@@ -84,7 +84,7 @@
             FocusVisualPrimaryThickness=2,2,2,2
             FocusVisualPrimaryBrush=#FF000000
             Visibility=Visible
-            RenderSize=398,398
+            RenderSize=17,31
           [Windows.UI.Xaml.Controls.Grid]
               Padding=0,0,0,0
               CornerRadius=0,0,0,0
@@ -97,7 +97,7 @@
               FocusVisualPrimaryThickness=2,2,2,2
               FocusVisualPrimaryBrush=#FF000000
               Visibility=Visible
-              RenderSize=398,398
+              RenderSize=17,31
             [Windows.UI.Xaml.Controls.ScrollContentPresenter]
                 Foreground=#FF000000
                 Padding=0,0,0,0
@@ -112,7 +112,7 @@
                 FocusVisualPrimaryThickness=2,2,2,2
                 FocusVisualPrimaryBrush=#FF000000
                 Visibility=Visible
-                RenderSize=382,387
+                RenderSize=1,20
               [Windows.UI.Xaml.FrameworkElement]
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1
@@ -120,7 +120,7 @@
                   FocusVisualPrimaryThickness=2,2,2,2
                   FocusVisualPrimaryBrush=#FF000000
                   Visibility=Visible
-                  RenderSize=382,387
+                  RenderSize=1,20
             [Windows.UI.Xaml.Controls.Grid]
                 Padding=0,0,0,0
                 CornerRadius=0,0,0,0
@@ -133,7 +133,7 @@
                 FocusVisualPrimaryThickness=2,2,2,2
                 FocusVisualPrimaryBrush=#FF000000
                 Visibility=Visible
-                RenderSize=398,398
+                RenderSize=17,31
             [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
                 Padding=0,0,0,0
                 Foreground=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/TextBox-5.xml b/test/MUXControlsTestApp/verification/TextBox-5.xml
index 9dbfc4c104..e718210555 100644
--- a/test/MUXControlsTestApp/verification/TextBox-5.xml
+++ b/test/MUXControlsTestApp/verification/TextBox-5.xml
@@ -70,7 +70,7 @@
           FocusVisualPrimaryThickness=2,2,2,2
           FocusVisualPrimaryBrush=#FF000000
           Visibility=Visible
-          RenderSize=398,398
+          RenderSize=17,31
         [Windows.UI.Xaml.Controls.Border]
             Padding=0,0,0,0
             CornerRadius=0,0,0,0
@@ -84,7 +84,7 @@
             FocusVisualPrimaryThickness=2,2,2,2
             FocusVisualPrimaryBrush=#FF000000
             Visibility=Visible
-            RenderSize=398,398
+            RenderSize=17,31
           [Windows.UI.Xaml.Controls.Grid]
               Padding=0,0,0,0
               CornerRadius=0,0,0,0
@@ -97,7 +97,7 @@
               FocusVisualPrimaryThickness=2,2,2,2
               FocusVisualPrimaryBrush=#FF000000
               Visibility=Visible
-              RenderSize=398,398
+              RenderSize=17,31
             [Windows.UI.Xaml.Controls.ScrollContentPresenter]
                 Foreground=#FF000000
                 Padding=0,0,0,0
@@ -112,7 +112,7 @@
                 FocusVisualPrimaryThickness=2,2,2,2
                 FocusVisualPrimaryBrush=#FF000000
                 Visibility=Visible
-                RenderSize=382,387
+                RenderSize=1,20
               [Windows.UI.Xaml.FrameworkElement]
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1
@@ -120,7 +120,7 @@
                   FocusVisualPrimaryThickness=2,2,2,2
                   FocusVisualPrimaryBrush=#FF000000
                   Visibility=Visible
-                  RenderSize=382,387
+                  RenderSize=1,20
             [Windows.UI.Xaml.Controls.Grid]
                 Padding=0,0,0,0
                 CornerRadius=0,0,0,0
@@ -133,7 +133,7 @@
                 FocusVisualPrimaryThickness=2,2,2,2
                 FocusVisualPrimaryBrush=#FF000000
                 Visibility=Visible
-                RenderSize=398,398
+                RenderSize=17,31
             [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
                 Padding=0,0,0,0
                 Foreground=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/TextBox-7.xml b/test/MUXControlsTestApp/verification/TextBox-7.xml
index 5c9d543c7d..b5aa13097b 100644
--- a/test/MUXControlsTestApp/verification/TextBox-7.xml
+++ b/test/MUXControlsTestApp/verification/TextBox-7.xml
@@ -72,7 +72,7 @@
           FocusVisualPrimaryThickness=2,2,2,2
           FocusVisualPrimaryBrush=#FF000000
           Visibility=Visible
-          RenderSize=398,398
+          RenderSize=17,30
         [Windows.UI.Xaml.Controls.Border]
             Padding=0,0,0,0
             CornerRadius=0,0,0,0
@@ -86,7 +86,7 @@
             FocusVisualPrimaryThickness=2,2,2,2
             FocusVisualPrimaryBrush=#FF000000
             Visibility=Visible
-            RenderSize=398,398
+            RenderSize=17,30
           [Windows.UI.Xaml.Controls.Grid]
               Padding=0,0,0,0
               CornerRadius=0,0,0,0
@@ -99,7 +99,7 @@
               FocusVisualPrimaryThickness=2,2,2,2
               FocusVisualPrimaryBrush=#FF000000
               Visibility=Visible
-              RenderSize=398,398
+              RenderSize=17,30
             [Windows.UI.Xaml.Controls.ScrollContentPresenter]
                 Foreground=#FF000000
                 Padding=0,0,0,0
@@ -114,7 +114,7 @@
                 FocusVisualPrimaryThickness=2,2,2,2
                 FocusVisualPrimaryBrush=#FF000000
                 Visibility=Visible
-                RenderSize=382,387
+                RenderSize=1,19
               [Windows.UI.Xaml.FrameworkElement]
                   Margin=0,0,0,0
                   FocusVisualSecondaryThickness=1,1,1,1
@@ -122,7 +122,7 @@
                   FocusVisualPrimaryThickness=2,2,2,2
                   FocusVisualPrimaryBrush=#FF000000
                   Visibility=Visible
-                  RenderSize=382,387
+                  RenderSize=1,19
             [Windows.UI.Xaml.Controls.Grid]
                 Padding=0,0,0,0
                 CornerRadius=0,0,0,0
@@ -135,7 +135,7 @@
                 FocusVisualPrimaryThickness=2,2,2,2
                 FocusVisualPrimaryBrush=#FF000000
                 Visibility=Visible
-                RenderSize=398,398
+                RenderSize=17,30
             [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
                 Padding=0,0,0,0
                 Foreground=#00FFFFFF