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 <[email protected]> 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 <[email protected]> Co-authored-by: kmahone <[email protected]>
microsoft · Apr 29, 2020 · 473932e · 473932e
1 parent 9fd0861
commit 473932e
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 36 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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