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

Leverage favorites for recommended tool providers #626

Merged
merged 1 commit into from
Aug 18, 2022
Merged

Leverage favorites for recommended tool providers #626

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 19 additions & 3 deletions src/dev/impl/DevToys/ViewModels/MainPageViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,8 +666,9 @@ ToolProviderViewItem[] newRecommendedTools

using (await _sempahore.WaitAsync(CancellationToken.None).ConfigureAwait(false))
{
if (newRecommendedTools.Length == 1
&& IsToolDisplayedInMenu(ToolsMenuItems.OfType<ToolProviderViewItem>(), newRecommendedTools[0]))
ToolProviderViewItem? toolProvider = GetRecommendedToolProvider(newRecommendedTools);
if (toolProvider != null
&& IsToolDisplayedInMenu(ToolsMenuItems.OfType<ToolProviderViewItem>(), toolProvider))
{
// One unique tool is recommended.
// The recommended tool is displayed in the top menu.
Expand All @@ -679,13 +680,28 @@ ToolProviderViewItem[] newRecommendedTools
{
if (!IsInCompactOverlayMode && _allowSelectAutomaticallyRecommendedTool)
{
SetSelectedMenuItem(newRecommendedTools[0], _clipboardContent);
SetSelectedMenuItem(toolProvider, _clipboardContent);
}
});
}
}
}

private ToolProviderViewItem? GetRecommendedToolProvider(ToolProviderViewItem[] items)
{
ToolProviderViewItem favoriteItem = items.FirstOrDefault(i => i.IsFavorite);
if (favoriteItem != null)
{
return favoriteItem;
}
else if (items.Length == 1)
{
return items[0];
}

return null;
}

private bool IsToolDisplayedInMenu(IEnumerable<ToolProviderViewItem> tools, ToolProviderViewItem ToolProviderViewItem)
{
Arguments.NotNull(tools, nameof(tools));
Expand Down