Skip to content

Commit 5c8b29d

Browse files
authored
Merge pull request #311 from MarkDHarper/1144932
Fix 1144932 by in ComboBoxSample by setting the tab-order to the logical order of operations
2 parents fd76629 + 4d175f7 commit 5c8b29d

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

Sample Applications/CustomComboBox/Styles.xaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@
247247
<ColumnDefinition/>
248248
</Grid.ColumnDefinitions>
249249
<ToggleButton FocusVisualStyle="{DynamicResource CustomFocusVisual}"
250-
AutomationProperties.Name="Play">
250+
AutomationProperties.Name="Play" TabIndex="0">
251251
<ToggleButton.Template>
252252
<ControlTemplate TargetType="ToggleButton">
253253
<Border Background="Transparent">
@@ -294,7 +294,7 @@
294294
<Grid Grid.Column="2" Height="37">
295295
<Button AutomationProperties.Name="Watch Now" FocusVisualStyle="{DynamicResource CustomFocusVisual}" Command="{Binding Command, RelativeSource={RelativeSource TemplatedParent}}"
296296
CommandParameter="{Binding ElementName=lstBx, Path=SelectedItem}"
297-
Content="{TemplateBinding Content}">
297+
Content="{TemplateBinding Content}" TabIndex="2">
298298
<Button.Template>
299299
<ControlTemplate TargetType="Button">
300300
<Border CornerRadius="4">
@@ -331,7 +331,8 @@
331331
FocusVisualStyle="{DynamicResource CustomFocusVisual}"
332332
ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ItemsSource}"
333333
DisplayMemberPath="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=DisplayMemberPath}"
334-
SelectedValuePath="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=DisplayMemberPath}">
334+
SelectedValuePath="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=DisplayMemberPath}"
335+
TabIndex="1">
335336
<ListBox.Resources>
336337
<Style TargetType="ScrollBar" BasedOn="{StaticResource ScrollBarStyle}" />
337338
<Style TargetType="ListBoxItem" BasedOn="{StaticResource ListBoxItemStyle}" />
@@ -379,4 +380,4 @@
379380
</DataTrigger>
380381
</Style.Triggers>
381382
</Style>
382-
</ResourceDictionary>
383+
</ResourceDictionary>

0 commit comments

Comments
 (0)