TabView: Make TabViewItem consume the TabViewItemHeaderForeground the…

…me resource (#2348) * Make ContentPresenter consume the resource * Set a tab as testing tab * Add test
microsoft · May 18, 2020 · b06204c · b06204c
1 parent e34b0f0
commit b06204c
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 0 deletions.
diff --git a/dev/TabView/InteractionTests/TabViewTests.cs b/dev/TabView/InteractionTests/TabViewTests.cs
@@ -633,6 +633,20 @@ public void ScrollButtonToolTipTest()
             }
         }
 
+        [TestMethod]
+        public void VerifyTabViewItemHeaderForegroundResource()
+        {
+            using (var setup = new TestSetupHelper("TabView Tests"))
+            {
+                Button getSecondTabHeaderForegroundButton = FindElement.ByName<Button>("GetSecondTabHeaderForegroundButton");
+                getSecondTabHeaderForegroundButton.InvokeAndWait();
+
+                TextBlock secondTabHeaderForegroundTextBlock = FindElement.ByName<TextBlock>("SecondTabHeaderForegroundTextBlock");
+
+                Verify.AreEqual("#FF008000", secondTabHeaderForegroundTextBlock.DocumentText);
+            }
+        }
+
         public void PressButtonAndVerifyText(String buttonName, String textBlockName, String expectedText)
         {
             Button button = FindElement.ByName<Button>(buttonName);

diff --git a/dev/TabView/TabView.xaml b/dev/TabView/TabView.xaml
@@ -647,6 +647,7 @@
                                 ContentTransitions="{TemplateBinding ContentTransitions}"
                                 FontWeight="{TemplateBinding FontWeight}"
                                 FontSize="{ThemeResource TabViewItemHeaderFontSize}"
+                                Foreground="{ThemeResource TabViewItemHeaderForeground}"
                                 OpticalMarginAlignment="TrimSideBearings"
                                 HighContrastAdjustment="None" />
 

diff --git a/dev/TabView/TestUI/TabViewPage.xaml b/dev/TabView/TestUI/TabViewPage.xaml
@@ -109,6 +109,11 @@
                     <Button x:Name="GetScrollIncreaseButtonToolTipButton" AutomationProperties.Name="GetScrollIncreaseButtonToolTipButton" Content="TooltipScrollIncreaseButton" Click="GetScrollIncreaseButtonToolTipButton_Click"/>
                     <TextBlock x:Name="ScrollIncreaseButtonToolTipTextBlock" AutomationProperties.Name="ScrollIncreaseButtonToolTipTextBlock" Margin="4,0,0,0" Text=""/>
                 </StackPanel>
+
+                <StackPanel Orientation="Horizontal" Margin="0,0,0,8">
+                    <Button x:Name="GetSecondTabHeaderForegroundButton" AutomationProperties.Name="GetSecondTabHeaderForegroundButton" Content="SecondTabHeaderForeground" Click="GetSecondTabHeaderForegroundButton_Click" />
+                    <TextBlock x:Name="SecondTabHeaderForegroundTextBlock" AutomationProperties.Name="SecondTabHeaderForegroundTextBlock" Margin="4,0,0,0" Text=""/>
+                </StackPanel>
             </StackPanel>
 
             <Grid Grid.Column="1">
@@ -153,6 +158,10 @@
                     </controls:TabViewItem>
 
                     <controls:TabViewItem x:Name="SecondTab" Header="SecondTab" IsClosable="True">
+                        <controls:TabViewItem.Resources>
+                            <!-- Do not remove or change this! We are verifying this resource in a TabView InteractionTest. -->
+                            <SolidColorBrush x:Key="TabViewItemHeaderForeground" Color="#FF008000" />
+                        </controls:TabViewItem.Resources>
                         <controls:TabViewItem.IconSource>
                             <controls:SymbolIconSource Symbol="Shop"/>
                         </controls:TabViewItem.IconSource>

diff --git a/dev/TabView/TestUI/TabViewPage.xaml.cs b/dev/TabView/TestUI/TabViewPage.xaml.cs
@@ -415,5 +415,14 @@ private void GetScrollIncreaseButtonToolTipButton_Click(object sender, RoutedEve
                 GetToolTipStringForUIElement(scrollIncreaseButton, ScrollIncreaseButtonToolTipTextBlock);
             }
         }
+
+        private void GetSecondTabHeaderForegroundButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (FindVisualChildByName(SecondTab, "ContentPresenter") is ContentPresenter presenter
+                && presenter.Foreground is SolidColorBrush brush)
+            {
+                SecondTabHeaderForegroundTextBlock.Text = brush.Color.ToString();
+            }
+        }
     }
 }