Fix start menu integration not being enabled on launch

Author: srwi

EverythingToolbar.Deskband/ToolbarControl.xaml.cs

@@ -20,8 +20,7 @@ public ToolbarControl()
 
             ShortcutManager.Initialize(FocusSearchBox);
 
-            if (ToolbarSettings.User.IsReplaceStartMenuSearch)
-                StartMenuIntegration.Instance.Enable();
+            StartMenuIntegration.Instance.Initialize();
         }
 
         private void OnSearchWindowHiding(object? sender, EventArgs e)

EverythingToolbar.Launcher/Launcher.cs

@@ -63,8 +63,7 @@ public LauncherWindow(NotifyIcon icon)
 
                 ShortcutManager.Initialize(FocusSearchBox);
 
-                if (ToolbarSettings.User.IsReplaceStartMenuSearch)
-                    StartMenuIntegration.Instance.Enable();
+                StartMenuIntegration.Instance.Initialize();
 
                 SearchWindow.Instance.Hiding += OnSearchWindowHiding;
 

EverythingToolbar/Data/SearchResult.cs

@@ -133,10 +133,18 @@ public ImageSource? PreviewImage
                     Action<ImageSource>? onExactIconLoaced = null;
                     if (!requiresThumbnail)
                     {
-                        onExactIconLoaced = source => { PreviewImage = source; };
+                        onExactIconLoaced = source =>
+                        {
+                            PreviewImage = source;
+                        };
                     }
 
-                    ImageSource? image = IconProvider.GetImage(FullPathAndFileName, IsFile, PreviewIconSize, onExactIconLoaced);
+                    ImageSource? image = IconProvider.GetImage(
+                        FullPathAndFileName,
+                        IsFile,
+                        PreviewIconSize,
+                        onExactIconLoaced
+                    );
                     if (image != null && _previewImage == null)
                         PreviewImage = image;
                 });

EverythingToolbar/Helpers/IconProvider.cs

@@ -99,12 +99,7 @@ private struct Size
                 int scaledSize = ImageScalingHelper.GetScaledSize(imageSize);
 
                 Guid shellItemImageFactoryGuid = new("BCC18B79-BA16-442F-80C4-8A59C30C463B");
-                SHCreateItemFromParsingName(
-                    filePath,
-                    IntPtr.Zero,
-                    shellItemImageFactoryGuid,
-                    out imageFactory
-                );
+                SHCreateItemFromParsingName(filePath, IntPtr.Zero, shellItemImageFactoryGuid, out imageFactory);
 
                 Size size = new() { cx = scaledSize, cy = scaledSize };
                 imageFactory.GetImage(size, SiigbfResizetofit, out IntPtr hBitmap);
@@ -184,7 +179,12 @@ uint uFlags
         private const uint FileAttributeNormal = 0x00000080;
         private const uint FileAttributeDirectory = 0x00000010;
 
-        public static ImageSource? GetImage(string path, bool isFile, int iconSize, Action<ImageSource>? onUpdated = null)
+        public static ImageSource? GetImage(
+            string path,
+            bool isFile,
+            int iconSize,
+            Action<ImageSource>? onUpdated = null
+        )
         {
             int iconIndexByExt;
             if (isFile)
@@ -201,7 +201,7 @@ uint uFlags
                 iconIndexByExt = _fallbackDirectoryIconIndex;
             }
 
-            var iconByIndexAndScaleCacheKey  = iconIndexByExt + "_" + iconSize;
+            var iconByIndexAndScaleCacheKey = iconIndexByExt + "_" + iconSize;
             if (!IconByIndexAndScaleCache.TryGetValue(iconByIndexAndScaleCacheKey, out var iconByExtAndScale))
             {
                 iconByExtAndScale = GetIconFromSystemImageList(iconIndexByExt, iconSize);
@@ -244,7 +244,8 @@ private static int GetIconIndex(string path, IconIndexType indexType)
             {
                 fileAttributes = FileAttributeNormal;
                 flags |= ShgfiUsefileattributes;
-            } else if (indexType == IconIndexType.DirectoryName)
+            }
+            else if (indexType == IconIndexType.DirectoryName)
             {
                 fileAttributes = FileAttributeDirectory;
                 flags |= ShgfiUsefileattributes;
@@ -257,9 +258,9 @@ enum IconIndexType
         {
             ByFileName,
             ByFilePath,
-            DirectoryName
+            DirectoryName,
         }
-        
+
         private const int IldTransparent = 0x00000001;
         private const int ShilLarge = 0;
         private const int ShilSmall = 1;

EverythingToolbar/Helpers/StartMenuIntegration.cs

@@ -38,6 +38,12 @@ private StartMenuIntegration()
             ToolbarSettings.User.PropertyChanged += OnSettingsChanged;
         }
 
+        public void Initialize()
+        {
+            if (ToolbarSettings.User.IsReplaceStartMenuSearch)
+                Enable();
+        }
+
         private void OnSettingsChanged(object? sender, PropertyChangedEventArgs e)
         {
             if (e.PropertyName == nameof(ToolbarSettings.User.IsReplaceStartMenuSearch))

EverythingToolbar/Settings/Shortcuts.xaml.cs

@@ -184,8 +184,7 @@ private void OnUnloaded(object sender, RoutedEventArgs e)
         {
             HotkeyManager.Current.IsEnabled = true;
             ReleaseKeyboard();
-            if (ToolbarSettings.User.IsReplaceStartMenuSearch)
-                StartMenuIntegration.Instance.Enable();
+            StartMenuIntegration.Instance.Initialize();
 
             if (Key != OriginalKey || Modifiers != OriginalModifiers)
             {