Skip to content

Performance: Use Lazy<T> for ShellFolder instances #17733

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

Closed
wants to merge 1 commit into from
Closed

Performance: Use Lazy<T> for ShellFolder instances #17733

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
8 changes: 4 additions & 4 deletions src/Files.App/Helpers/Win32/Win32Helper.Shell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ namespace Files.App.Helpers
/// </summary>
public static partial class Win32Helper
{
private readonly static ShellFolder _controlPanel = new(Shell32.KNOWNFOLDERID.FOLDERID_ControlPanelFolder);
private readonly static Lazy<ShellFolder> _controlPanel = new(() => new(Shell32.KNOWNFOLDERID.FOLDERID_ControlPanelFolder));

private readonly static ShellFolder _controlPanelCategoryView = new("::{26EE0668-A00A-44D7-9371-BEB064C98683}");
private readonly static Lazy<ShellFolder> _controlPanelCategoryView = new(() => new("::{26EE0668-A00A-44D7-9371-BEB064C98683}"));

public static async Task<(ShellFileItem Folder, List<ShellFileItem> Enumerate)> GetShellFolderAsync(string path, bool getFolder, bool getEnumerate, int from, int count, params string[] properties)
{
Expand All @@ -34,8 +34,8 @@ public static partial class Win32Helper
using var shellFolder = ShellFolderExtensions.GetShellItemFromPathOrPIDL(path) as ShellFolder;

if (shellFolder is null ||
(_controlPanel.PIDL.IsParentOf(shellFolder.PIDL, false) ||
_controlPanelCategoryView.PIDL.IsParentOf(shellFolder.PIDL, false)) &&
(_controlPanel.Value.PIDL.IsParentOf(shellFolder.PIDL, false) ||
_controlPanelCategoryView.Value.PIDL.IsParentOf(shellFolder.PIDL, false)) &&
!shellFolder.Any())
{
// Return null to force open unsupported items in explorer
Expand Down
Loading