From 473932ec5b30d6cc7e37f585127684b833b1f932 Mon Sep 17 00:00:00 2001
From: Felix-Dev <FelixDev91@gmail.com>
Date: Wed, 29 Apr 2020 03:18:39 +0200
Subject: [PATCH] Fix AutoSuggestBox not respecting common TextBox properties
 (#2252)

* Switch ColorPicker to use tracker_ref (#2191)

* Switch ColorPicker to use tracker_ref

* fix ProcessHelixFiles.ps1. Increase work item timeout

* CR feedback

Co-authored-by: Keith Mahoney <keith.mahoney@microsoft.com>

Follow up to: #2191 Switch ColorPicker to use tracker_ref  (#2225)

* update tracker ref use

* tab--

* AutoSuggestBox respects Foreground, Background, BorderBrush and BorderThickness now

* Update AutoSuggestBox and NavigationView xml masters

* update NavigationViewLeftPaneContent-6.xml and NavigationViewTopPaneContent-6.xml

* update NavigationViewLeftPaneContent-5.xml and NavigationViewTopPaneContent-5.xml

Co-authored-by: Keith Mahoney <41657372+kmahone@users.noreply.github.com>
Co-authored-by: kmahone <kmahone@microsoft.com>
---
 dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml     | 8 ++++++++
 test/MUXControlsTestApp/master/AutoSuggestBox-7.xml       | 6 +++---
 test/MUXControlsTestApp/master/AutoSuggestBox.xml         | 6 +++---
 .../master/NavigationViewLeftPaneContent-5.xml            | 6 +++---
 .../master/NavigationViewLeftPaneContent-6.xml            | 6 +++---
 .../master/NavigationViewLeftPaneContent-7.xml            | 6 +++---
 .../master/NavigationViewLeftPaneContent-8.xml            | 6 +++---
 .../master/NavigationViewLeftPaneContent.xml              | 6 +++---
 .../master/NavigationViewTopPaneContent-5.xml             | 6 +++---
 .../master/NavigationViewTopPaneContent-6.xml             | 6 +++---
 .../master/NavigationViewTopPaneContent-7.xml             | 6 +++---
 .../master/NavigationViewTopPaneContent-8.xml             | 6 +++---
 .../master/NavigationViewTopPaneContent.xml               | 6 +++---
 13 files changed, 44 insertions(+), 36 deletions(-)

diff --git a/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml b/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml
index 76ac07599b..2949ac5870 100644
--- a/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml
+++ b/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml
@@ -373,6 +373,10 @@
     <Style x:Key="DefaultAutoSuggestBoxStyle" TargetType="AutoSuggestBox">
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="Foreground" Value="{ThemeResource TextControlForeground}" />
+        <Setter Property="Background" Value="{ThemeResource TextControlBackground}" />
+        <Setter Property="BorderBrush" Value="{ThemeResource TextControlBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{ThemeResource TextControlBorderThemeThickness}" />
         <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
         <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
         <Setter Property="TextBoxStyle" Value="{StaticResource AutoSuggestBoxTextBoxStyle}" />
@@ -406,6 +410,10 @@
                             Header="{TemplateBinding Header}"
                             Width="{TemplateBinding Width}"
                             contract7Present:Description="{TemplateBinding Description}"
+                            Foreground="{TemplateBinding Foreground}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
                             FontSize="{TemplateBinding FontSize}"
                             FontFamily="{TemplateBinding FontFamily}"
                             FontWeight="{TemplateBinding FontWeight}"
diff --git a/test/MUXControlsTestApp/master/AutoSuggestBox-7.xml b/test/MUXControlsTestApp/master/AutoSuggestBox-7.xml
index d705bb7a26..53f1f84267 100644
--- a/test/MUXControlsTestApp/master/AutoSuggestBox-7.xml
+++ b/test/MUXControlsTestApp/master/AutoSuggestBox-7.xml
@@ -1,9 +1,9 @@
 [Windows.UI.Xaml.Controls.AutoSuggestBox]
     Padding=0,0,0,0
     Foreground=#FF000000
-    BorderThickness=0,0,0,0
-    BorderBrush=[NULL]
-    Background=[NULL]
+    BorderThickness=1,1,1,1
+    BorderBrush=#99000000
+    Background=#66FFFFFF
     CornerRadius=2,2,2,2
     Width=400
     Margin=0,0,0,0
diff --git a/test/MUXControlsTestApp/master/AutoSuggestBox.xml b/test/MUXControlsTestApp/master/AutoSuggestBox.xml
index cd239a1fed..4a37263436 100644
--- a/test/MUXControlsTestApp/master/AutoSuggestBox.xml
+++ b/test/MUXControlsTestApp/master/AutoSuggestBox.xml
@@ -1,9 +1,9 @@
 [Windows.UI.Xaml.Controls.AutoSuggestBox]
     Padding=0,0,0,0
     Foreground=#FF000000
-    BorderThickness=0,0,0,0
-    BorderBrush=[NULL]
-    Background=[NULL]
+    BorderThickness=1,1,1,1
+    BorderBrush=#99000000
+    Background=#66FFFFFF
     Width=400
     Margin=0,0,0,0
     FocusVisualSecondaryThickness=1,1,1,1
diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-5.xml b/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-5.xml
index 7a215dda74..39f68864ab 100644
--- a/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-5.xml
+++ b/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-5.xml
@@ -729,9 +729,9 @@
                       [Windows.UI.Xaml.Controls.AutoSuggestBox]
                           Padding=0,0,0,0
                           Foreground=#FF000000
-                          BorderThickness=0,0,0,0
-                          BorderBrush=[NULL]
-                          Background=[NULL]
+                          BorderThickness=1,1,1,1
+                          BorderBrush=#99000000
+                          Background=#66FFFFFF
                           Margin=0,0,0,0
                           FocusVisualSecondaryThickness=1,1,1,1
                           FocusVisualSecondaryBrush=#99FFFFFF
diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-6.xml b/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-6.xml
index 7a215dda74..39f68864ab 100644
--- a/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-6.xml
+++ b/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-6.xml
@@ -729,9 +729,9 @@
                       [Windows.UI.Xaml.Controls.AutoSuggestBox]
                           Padding=0,0,0,0
                           Foreground=#FF000000
-                          BorderThickness=0,0,0,0
-                          BorderBrush=[NULL]
-                          Background=[NULL]
+                          BorderThickness=1,1,1,1
+                          BorderBrush=#99000000
+                          Background=#66FFFFFF
                           Margin=0,0,0,0
                           FocusVisualSecondaryThickness=1,1,1,1
                           FocusVisualSecondaryBrush=#99FFFFFF
diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-7.xml b/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-7.xml
index e377935dd7..aaea01540b 100644
--- a/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-7.xml
+++ b/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-7.xml
@@ -746,9 +746,9 @@
                       [Windows.UI.Xaml.Controls.AutoSuggestBox]
                           Padding=0,0,0,0
                           Foreground=#FF000000
-                          BorderThickness=0,0,0,0
-                          BorderBrush=[NULL]
-                          Background=[NULL]
+                          BorderThickness=1,1,1,1
+                          BorderBrush=#99000000
+                          Background=#66FFFFFF
                           CornerRadius=2,2,2,2
                           Margin=0,0,0,0
                           FocusVisualSecondaryThickness=1,1,1,1
diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-8.xml b/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-8.xml
index fa7d63ca27..8a56a064af 100644
--- a/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-8.xml
+++ b/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-8.xml
@@ -746,9 +746,9 @@
                       [Windows.UI.Xaml.Controls.AutoSuggestBox]
                           Padding=0,0,0,0
                           Foreground=#FF000000
-                          BorderThickness=0,0,0,0
-                          BorderBrush=[NULL]
-                          Background=[NULL]
+                          BorderThickness=1,1,1,1
+                          BorderBrush=#99000000
+                          Background=#66FFFFFF
                           CornerRadius=2,2,2,2
                           Margin=0,0,0,0
                           FocusVisualSecondaryThickness=1,1,1,1
diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent.xml b/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent.xml
index 7a215dda74..39f68864ab 100644
--- a/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent.xml
+++ b/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent.xml
@@ -729,9 +729,9 @@
                       [Windows.UI.Xaml.Controls.AutoSuggestBox]
                           Padding=0,0,0,0
                           Foreground=#FF000000
-                          BorderThickness=0,0,0,0
-                          BorderBrush=[NULL]
-                          Background=[NULL]
+                          BorderThickness=1,1,1,1
+                          BorderBrush=#99000000
+                          Background=#66FFFFFF
                           Margin=0,0,0,0
                           FocusVisualSecondaryThickness=1,1,1,1
                           FocusVisualSecondaryBrush=#99FFFFFF
diff --git a/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-5.xml b/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-5.xml
index fd847666e9..38c2c6ed4e 100644
--- a/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-5.xml
+++ b/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-5.xml
@@ -1080,9 +1080,9 @@
                 [Windows.UI.Xaml.Controls.AutoSuggestBox]
                     Padding=0,0,0,0
                     Foreground=#FF000000
-                    BorderThickness=0,0,0,0
-                    BorderBrush=[NULL]
-                    Background=[NULL]
+                    BorderThickness=1,1,1,1
+                    BorderBrush=#99000000
+                    Background=#66FFFFFF
                     Margin=0,0,0,0
                     FocusVisualSecondaryThickness=1,1,1,1
                     FocusVisualSecondaryBrush=#99FFFFFF
diff --git a/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-6.xml b/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-6.xml
index fd847666e9..38c2c6ed4e 100644
--- a/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-6.xml
+++ b/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-6.xml
@@ -1080,9 +1080,9 @@
                 [Windows.UI.Xaml.Controls.AutoSuggestBox]
                     Padding=0,0,0,0
                     Foreground=#FF000000
-                    BorderThickness=0,0,0,0
-                    BorderBrush=[NULL]
-                    Background=[NULL]
+                    BorderThickness=1,1,1,1
+                    BorderBrush=#99000000
+                    Background=#66FFFFFF
                     Margin=0,0,0,0
                     FocusVisualSecondaryThickness=1,1,1,1
                     FocusVisualSecondaryBrush=#99FFFFFF
diff --git a/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-7.xml b/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-7.xml
index 57498e4946..c307f7ad10 100644
--- a/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-7.xml
+++ b/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-7.xml
@@ -1098,9 +1098,9 @@
                 [Windows.UI.Xaml.Controls.AutoSuggestBox]
                     Padding=0,0,0,0
                     Foreground=#FF000000
-                    BorderThickness=0,0,0,0
-                    BorderBrush=[NULL]
-                    Background=[NULL]
+                    BorderThickness=1,1,1,1
+                    BorderBrush=#99000000
+                    Background=#66FFFFFF
                     CornerRadius=2,2,2,2
                     Margin=0,0,0,0
                     FocusVisualSecondaryThickness=1,1,1,1
diff --git a/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-8.xml b/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-8.xml
index dc2990c884..1b2a5dce7a 100644
--- a/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-8.xml
+++ b/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-8.xml
@@ -1098,9 +1098,9 @@
                 [Windows.UI.Xaml.Controls.AutoSuggestBox]
                     Padding=0,0,0,0
                     Foreground=#FF000000
-                    BorderThickness=0,0,0,0
-                    BorderBrush=[NULL]
-                    Background=[NULL]
+                    BorderThickness=1,1,1,1
+                    BorderBrush=#99000000
+                    Background=#66FFFFFF
                     CornerRadius=2,2,2,2
                     Margin=0,0,0,0
                     FocusVisualSecondaryThickness=1,1,1,1
diff --git a/test/MUXControlsTestApp/master/NavigationViewTopPaneContent.xml b/test/MUXControlsTestApp/master/NavigationViewTopPaneContent.xml
index fd847666e9..38c2c6ed4e 100644
--- a/test/MUXControlsTestApp/master/NavigationViewTopPaneContent.xml
+++ b/test/MUXControlsTestApp/master/NavigationViewTopPaneContent.xml
@@ -1080,9 +1080,9 @@
                 [Windows.UI.Xaml.Controls.AutoSuggestBox]
                     Padding=0,0,0,0
                     Foreground=#FF000000
-                    BorderThickness=0,0,0,0
-                    BorderBrush=[NULL]
-                    Background=[NULL]
+                    BorderThickness=1,1,1,1
+                    BorderBrush=#99000000
+                    Background=#66FFFFFF
                     Margin=0,0,0,0
                     FocusVisualSecondaryThickness=1,1,1,1
                     FocusVisualSecondaryBrush=#99FFFFFF