From ea97e3ae0ad4597d9a56172dabf8436d6ea2c2cd Mon Sep 17 00:00:00 2001
From: Ayush Verma <ayushverma@microsoft.com>
Date: Mon, 24 May 2021 20:38:53 +0530
Subject: [PATCH] Fixing Bug 1159083 in WPF Sample

Description
While navigating through caps lock+arrow key, All the drop down list
items are announced despite of them being not displayed.
---
 Sample Applications/CustomComboBox/MainWindow.xaml | 2 +-
 Sample Applications/CustomComboBox/Styles.xaml     | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Sample Applications/CustomComboBox/MainWindow.xaml b/Sample Applications/CustomComboBox/MainWindow.xaml
index 2bf5360cf..1b05e84d5 100644
--- a/Sample Applications/CustomComboBox/MainWindow.xaml	
+++ b/Sample Applications/CustomComboBox/MainWindow.xaml	
@@ -21,7 +21,7 @@
                              ItemsSource="{Binding Movies}" Command="{Binding OnWatchNow}" 
                              ItemContainerStyle="{StaticResource MovieItemContainerStyle}"
                              DisplayMemberPath="Title"
-                             IsTabStop="False"/>
+                             IsTabStop="False" Width="160"/>
 
         <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
             <TextBlock Text="{Binding SelectedMovie, Converter={StaticResource stringConverter}, ConverterParameter=text, NotifyOnTargetUpdated=True}" Style="{DynamicResource streamingTextStyle}" TargetUpdated="TextBlock_TargetUpdated" AutomationProperties.LiveSetting="Assertive"/>
diff --git a/Sample Applications/CustomComboBox/Styles.xaml b/Sample Applications/CustomComboBox/Styles.xaml
index 7cd252081..0e351347a 100644
--- a/Sample Applications/CustomComboBox/Styles.xaml	
+++ b/Sample Applications/CustomComboBox/Styles.xaml	
@@ -339,7 +339,7 @@
                                      ItemContainerStyle="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ItemContainerStyle}"
                                      DisplayMemberPath="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=DisplayMemberPath}" 
                                      SelectedValuePath="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=DisplayMemberPath}"
-                                     TabIndex="1">
+                                     TabIndex="1" Visibility="Collapsed">
                             <ListBox.Resources>
                                 <Style TargetType="ScrollBar" BasedOn="{StaticResource ScrollBarStyle}" />
                                 <Style TargetType="ListBoxItem" BasedOn="{StaticResource ListBoxItemStyle}" />
@@ -350,6 +350,9 @@
                             <EventTrigger RoutedEvent="local:ExpandableToggleButton.Expanded">
                                 <BeginStoryboard>
                                     <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="lstBx" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0:0:0.0" Value="{x:Static Visibility.Visible}"/>
+                                        </ObjectAnimationUsingKeyFrames>
                                         <DoubleAnimation Storyboard.TargetName="lstBx" Storyboard.TargetProperty="Height" From="0" To="60" Duration="0:0:0.5"/>
                                         <BooleanAnimationUsingKeyFrames Storyboard.TargetName="lstBx" Storyboard.TargetProperty="Focusable">
                                             <DiscreteBooleanKeyFrame KeyTime="00:00:00" Value="True"/>
@@ -360,6 +363,9 @@
                             <EventTrigger RoutedEvent="local:ExpandableToggleButton.Collapsed">
                                 <BeginStoryboard>
                                     <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="lstBx" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0:0:0.5" Value="{x:Static Visibility.Collapsed}"/>
+                                        </ObjectAnimationUsingKeyFrames>
                                         <DoubleAnimation Storyboard.TargetName="lstBx" Storyboard.TargetProperty="Height" From="60" To="0" Duration="0:0:0.5"/>
                                         <BooleanAnimationUsingKeyFrames Storyboard.TargetName="lstBx" Storyboard.TargetProperty="Focusable">
                                             <DiscreteBooleanKeyFrame KeyTime="00:00:00" Value="False"/>