Skip to content

Commit 378f509

Browse files
yaira2Copilot
andauthored
Code Quality: Improved Omnibar (#17186)
Signed-off-by: Yair <39923744+yaira2@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent 3824834 commit 378f509

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

src/Files.App.Controls/Omnibar/Omnibar.Events.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,12 @@ private void AutoSuggestBoxSuggestionsPopup_GettingFocus(UIElement sender, Getti
129129
args.TryCancel();
130130
}
131131

132+
private void AutoSuggestBoxSuggestionsPopup_Opened(object? sender, object e)
133+
{
134+
if (_textBoxSuggestionsListView.Items.Count > 0)
135+
_textBoxSuggestionsListView.ScrollIntoView(_textBoxSuggestionsListView.Items[0]);
136+
}
137+
132138
private void AutoSuggestBoxSuggestionsListView_ItemClick(object sender, ItemClickEventArgs e)
133139
{
134140
if (CurrentSelectedMode is null)

src/Files.App.Controls/Omnibar/Omnibar.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ protected override void OnApplyTemplate()
7979
_textBox.KeyDown += AutoSuggestBox_KeyDown;
8080
_textBox.TextChanged += AutoSuggestBox_TextChanged;
8181
_textBoxSuggestionsPopup.GettingFocus += AutoSuggestBoxSuggestionsPopup_GettingFocus;
82+
_textBoxSuggestionsPopup.Opened += AutoSuggestBoxSuggestionsPopup_Opened;
8283
_textBoxSuggestionsListView.ItemClick += AutoSuggestBoxSuggestionsListView_ItemClick;
8384
_textBoxSuggestionsListView.SelectionChanged += AutoSuggestBoxSuggestionsListView_SelectionChanged;
8485

src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1232,7 +1232,8 @@ public void PopulateOmnibarSuggestionsForCommandPaletteMode()
12321232

12331233
foreach (var item in suggestionItems)
12341234
{
1235-
OmnibarCommandPaletteModeSuggestionItems.Add(item);
1235+
if (item.Text != Commands.OpenCommandPalette.Code.ToString())
1236+
OmnibarCommandPaletteModeSuggestionItems.Add(item);
12361237
}
12371238

12381239
if (OmnibarCommandPaletteModeSuggestionItems.Count is 0)

0 commit comments

Comments
 (0)