Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed keyboard focus for DatePicker control #9340

Merged
merged 3 commits into from
Jul 15, 2024
Merged

Fixed keyboard focus for DatePicker control #9340

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53bcdfc
Fixed keyboard focus for DatePicker control
anjali-wpf Jul 2, 2024
f24c4ca
Removed TabIndex and added FocusManager to set focus
anjali-wpf Jul 4, 2024
8641bb6
Changed calendar popup placement
anjali-wpf Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/DatePicker.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Border.CornerRadius}">
<Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
<Grid FocusManager.FocusedElement="{Binding ElementName=PART_Button}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
Expand Down Expand Up @@ -135,9 +135,11 @@
Background="Transparent"
BorderBrush="Transparent"
AutomationProperties.Name="{Binding Path=(AutomationProperties.Name), Mode=OneWay, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type DatePicker}}}"
Cursor="Arrow">
Cursor="Arrow"
Focusable="True"
IsTabStop="True" >
<!-- WPF overrides paddings for button -->

<TextBlock
Margin="{StaticResource DatePickerCalendarButtonPadding}"
HorizontalAlignment="Center"
Expand Down
Loading