Skip to content

Rename Flyout UI - Make everything tabbable #81319

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

Merged
akhera99 merged 1 commit into from
Nov 19, 2025
Merged

Rename Flyout UI - Make everything tabbable #81319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 23 additions & 9 deletions src/EditorFeatures/Core/InlineRename/UI/Adornment/RenameFlyout.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
KeyDown="Adornment_KeyDown"
MouseDown="Adornment_ConsumeMouseEvent"
MouseUp="Adornment_ConsumeMouseEvent"
GotKeyboardFocus="Adornment_GotKeyboardFocus"
Focusable="False"
Focusable="True"
UseLayoutRounding="True"
Cursor="Arrow"
Visibility="{Binding Path=Visibility}"
x:Name="control">
x:Name="control"
KeyboardNavigation.TabNavigation="Cycle">

<UserControl.Resources>
<ResourceDictionary>
Expand All @@ -45,7 +45,8 @@
<rename:RenameUserInputPresenter
Grid.Column="0"
x:Name="RenameUserInputPresenter"
HorizontalAlignment="Stretch"/>
HorizontalAlignment="Stretch"
Focusable="False"/>

<!-- Expand/Collapse button and glyph -->
<Button
Expand All @@ -58,20 +59,29 @@
platformimaging:ImageThemingUtilities.ImageBackgroundColor="{Binding Path=Background, ElementName=Outline, Converter={StaticResource BrushToColorConverter}}" >
<Button.Style>
<Style TargetType="Button">
<Setter Property="IsTabStop" Value="True"/>
<Setter Property="Focusable" Value="True"/>
Comment on lines +62 to +63
Copy link
Member

@jasonmalinowski jasonmalinowski Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice job doing this in the style so it applies to all buttons here.

<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="Button">
<Border Name="border"
BorderThickness="1"
BorderBrush="Transparent"
Background="{TemplateBinding Background}">
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
</Border>

<ControlTemplate.Triggers>
<Trigger Property="IsKeyboardFocused" Value="True">
<Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource {x:Static vsui:EnvironmentColors.SnaplinesBrushKey}}" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</Button.Style>
<imaging:CrispImage Grid.Column="0">
<imaging:CrispImage Focusable="False" Grid.Column="0">
<imaging:CrispImage.Style>
<Style TargetType="imaging:CrispImage">
<Style.Triggers>
Expand Down Expand Up @@ -109,15 +119,19 @@

<StackPanel Orientation="Vertical" Visibility="{Binding IsExpanded, Converter={StaticResource BooleanToVisibilityConverter}}">
<CheckBox Content="{Binding ElementName=control, Path=RenameOverloads}" Margin="0,5,0,0" IsChecked="{Binding Path=RenameOverloadFlag, Mode=TwoWay}"
Name="OverloadsCheckbox" Visibility="{Binding IsRenameOverloadsVisible, Converter={StaticResource BooleanToVisibilityConverter}, Mode=OneWay}" IsEnabled="{Binding IsRenameOverloadsEditable}" />
<CheckBox Name="CommentsCheckbox" Content="{Binding ElementName=control, Path=SearchInComments}" Margin="0,5,0,0" IsChecked="{Binding Path=RenameInCommentsFlag, Mode=TwoWay}" />
<CheckBox Name="StringsCheckbox" Content="{Binding ElementName=control, Path=SearchInStrings}" Margin="0,5,0,0" IsChecked="{Binding Path=RenameInStringsFlag, Mode=TwoWay}" />
Name="OverloadsCheckbox" Visibility="{Binding IsRenameOverloadsVisible, Converter={StaticResource BooleanToVisibilityConverter}, Mode=OneWay}" IsEnabled="{Binding IsRenameOverloadsEditable}"
IsTabStop="True" Focusable="True" />
<CheckBox Name="CommentsCheckbox" Content="{Binding ElementName=control, Path=SearchInComments}" Margin="0,5,0,0" IsChecked="{Binding Path=RenameInCommentsFlag, Mode=TwoWay}"
IsTabStop="True" Focusable="True" />
<CheckBox Name="StringsCheckbox" Content="{Binding ElementName=control, Path=SearchInStrings}" Margin="0,5,0,0" IsChecked="{Binding Path=RenameInStringsFlag, Mode=TwoWay}"
IsTabStop="True" Focusable="True" />
<CheckBox Name="FileRenameCheckbox"
Content="{Binding Path=FileRenameString}"
Margin="0,5,0,0"
IsChecked="{Binding Path=RenameFileFlag, Mode=TwoWay}"
IsEnabled="{Binding Path=AllowFileRename, Mode=OneWay}"
Visibility="{Binding Path=ShowFileRename, Converter={StaticResource BooleanToVisibilityConverter}, Mode=OneWay}"/>
Visibility="{Binding Path=ShowFileRename, Converter={StaticResource BooleanToVisibilityConverter}, Mode=OneWay}"
IsTabStop="True" Focusable="True" />
</StackPanel>

<TextBlock
Expand Down
31 changes: 7 additions & 24 deletions src/EditorFeatures/Core/InlineRename/UI/Adornment/RenameFlyout.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ public RenameFlyout(

RenameUserInput = _viewModel.SmartRenameViewModel is null ? new RenameUserInputTextBox(_viewModel) : new SmartRenameUserInputComboBox(_viewModel);

if (RenameUserInput is Control renameControl)
{
renameControl.IsTabStop = true;
renameControl.Focusable = true;
}

// On load focus the first tab target
var token1 = _listener.BeginAsyncOperation(nameof(RenameUserInput.GotFocus));
Loaded += (s, e) =>
Expand Down Expand Up @@ -183,21 +189,6 @@ private void Adornment_KeyDown(object sender, KeyEventArgs e)
_viewModel.Cancel();
break;

case Key.Tab:
Copy link
Member

@jasonmalinowski jasonmalinowski Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bravo for also finding a way to do this directly versus us having to fight with the system.

// We don't want tab to lose focus for the adornment, so manually
// loop focus back to the first item that is focusable.
var lastItem = _viewModel.IsExpanded
? FileRenameCheckbox
: (FrameworkElement)RenameUserInput;

if (lastItem.IsFocused)
{
e.Handled = true;
MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
}

break;

case Key.Space:
if (Keyboard.Modifiers == ModifierKeys.Control)
{
Expand All @@ -208,6 +199,7 @@ private void Adornment_KeyDown(object sender, KeyEventArgs e)
e.Handled = true;
}
}

break;
}
}
Expand All @@ -217,15 +209,6 @@ private void Adornment_ConsumeMouseEvent(object sender, MouseButtonEventArgs e)
e.Handled = true;
}

private void Adornment_GotKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
{
if (e.NewFocus != RenameUserInput)
{
RenameUserInput.Focus();
e.Handled = true;
}
}

private void ToggleExpand(object sender, RoutedEventArgs e)
{
_viewModel.IsExpanded = !_viewModel.IsExpanded;
Expand Down
Loading