From 373c353e3c630637397db942e7db0407b11bc9f4 Mon Sep 17 00:00:00 2001 From: Yair <39923744+yaira2@users.noreply.github.com> Date: Thu, 12 Jun 2025 14:19:59 -0400 Subject: [PATCH 1/3] Filtered OpenCommandPalette action from Command Palette --- .../ViewModels/UserControls/NavigationToolbarViewModel.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs b/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs index 7b2db64ecf6f..8332c2aa3a04 100644 --- a/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs +++ b/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs @@ -1232,7 +1232,8 @@ public void PopulateOmnibarSuggestionsForCommandPaletteMode() foreach (var item in suggestionItems) { - OmnibarCommandPaletteModeSuggestionItems.Add(item); + if (item.Text != Commands.OpenCommandPalette.Code.ToString()) + OmnibarCommandPaletteModeSuggestionItems.Add(item); } if (OmnibarCommandPaletteModeSuggestionItems.Count is 0) From ba9419dc7fabf47602bdb75ecdb0f53874c33546 Mon Sep 17 00:00:00 2001 From: Yair <39923744+yaira2@users.noreply.github.com> Date: Thu, 12 Jun 2025 14:27:45 -0400 Subject: [PATCH 2/3] Scroll to top of list --- src/Files.App.Controls/Omnibar/Omnibar.Events.cs | 6 ++++++ src/Files.App.Controls/Omnibar/Omnibar.cs | 1 + 2 files changed, 7 insertions(+) diff --git a/src/Files.App.Controls/Omnibar/Omnibar.Events.cs b/src/Files.App.Controls/Omnibar/Omnibar.Events.cs index 4499c41ab5d4..2e71e815ba9d 100644 --- a/src/Files.App.Controls/Omnibar/Omnibar.Events.cs +++ b/src/Files.App.Controls/Omnibar/Omnibar.Events.cs @@ -129,6 +129,12 @@ private void AutoSuggestBoxSuggestionsPopup_GettingFocus(UIElement sender, Getti args.TryCancel(); } + private void AutoSuggestBoxSuggestionsPopup_Opened(object? sender, object e) + { + if (_textBoxSuggestionsListView.Items.Count >= 0) + _textBoxSuggestionsListView.ScrollIntoView(_textBoxSuggestionsListView.Items[0]); + } + private void AutoSuggestBoxSuggestionsListView_ItemClick(object sender, ItemClickEventArgs e) { if (CurrentSelectedMode is null) diff --git a/src/Files.App.Controls/Omnibar/Omnibar.cs b/src/Files.App.Controls/Omnibar/Omnibar.cs index 50c4eecacd43..6ab43cea4e14 100644 --- a/src/Files.App.Controls/Omnibar/Omnibar.cs +++ b/src/Files.App.Controls/Omnibar/Omnibar.cs @@ -79,6 +79,7 @@ protected override void OnApplyTemplate() _textBox.KeyDown += AutoSuggestBox_KeyDown; _textBox.TextChanged += AutoSuggestBox_TextChanged; _textBoxSuggestionsPopup.GettingFocus += AutoSuggestBoxSuggestionsPopup_GettingFocus; + _textBoxSuggestionsPopup.Opened += AutoSuggestBoxSuggestionsPopup_Opened; _textBoxSuggestionsListView.ItemClick += AutoSuggestBoxSuggestionsListView_ItemClick; _textBoxSuggestionsListView.SelectionChanged += AutoSuggestBoxSuggestionsListView_SelectionChanged; From 45143cddb4ba49b15138ad107435c81818749479 Mon Sep 17 00:00:00 2001 From: Yair <39923744+yaira2@users.noreply.github.com> Date: Thu, 12 Jun 2025 14:40:42 -0400 Subject: [PATCH 3/3] Update src/Files.App.Controls/Omnibar/Omnibar.Events.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Yair <39923744+yaira2@users.noreply.github.com> --- src/Files.App.Controls/Omnibar/Omnibar.Events.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Files.App.Controls/Omnibar/Omnibar.Events.cs b/src/Files.App.Controls/Omnibar/Omnibar.Events.cs index 2e71e815ba9d..bdb8de3e3fac 100644 --- a/src/Files.App.Controls/Omnibar/Omnibar.Events.cs +++ b/src/Files.App.Controls/Omnibar/Omnibar.Events.cs @@ -131,7 +131,7 @@ private void AutoSuggestBoxSuggestionsPopup_GettingFocus(UIElement sender, Getti private void AutoSuggestBoxSuggestionsPopup_Opened(object? sender, object e) { - if (_textBoxSuggestionsListView.Items.Count >= 0) + if (_textBoxSuggestionsListView.Items.Count > 0) _textBoxSuggestionsListView.ScrollIntoView(_textBoxSuggestionsListView.Items[0]); }