Merge branch 'dev' into 250412-ImportThemePreset

Author: onesounds

Flow.Launcher.Infrastructure/Image/ImageLoader.cs

@@ -171,8 +171,8 @@ private static async ValueTask<ImageResult> LoadInternalAsync(string path, bool
                 }
                 catch (System.Exception e2)
                 {
-                    Log.Exception(ClassName, $"|ImageLoader.Load|Failed to get thumbnail for {path} on first try", e);
-                    Log.Exception(ClassName, $"|ImageLoader.Load|Failed to get thumbnail for {path} on second try", e2);
+                    Log.Exception(ClassName, $"Failed to get thumbnail for {path} on first try", e);
+                    Log.Exception(ClassName, $"Failed to get thumbnail for {path} on second try", e2);
 
                     ImageSource image = ImageCache[Constant.MissingImgIcon, false];
                     ImageCache[path, false] = image;

Flow.Launcher.Infrastructure/Image/ThumbnailReader.cs

@@ -12,7 +12,7 @@
 namespace Flow.Launcher.Infrastructure.Image
 {
     /// <summary>
-    /// Subclass of <see cref="Windows.Win32.UI.Shell.SIIGBF"/>
+    /// Subclass of <see cref="SIIGBF"/>
     /// </summary>
     [Flags]
     public enum ThumbnailOptions
@@ -31,7 +31,9 @@ public class WindowsThumbnailProvider
 
         private static readonly Guid GUID_IShellItem = typeof(IShellItem).GUID;
 
-        private static readonly HRESULT S_ExtractionFailed = (HRESULT)0x8004B200;
+        private static readonly HRESULT S_EXTRACTIONFAILED = (HRESULT)0x8004B200;
+
+        private static readonly HRESULT S_PATHNOTFOUND = (HRESULT)0x8004B205;
 
         public static BitmapSource GetThumbnail(string fileName, int width, int height, ThumbnailOptions options)
         {
@@ -79,16 +81,22 @@ private static unsafe HBITMAP GetHBitmap(string fileName, int width, int height,
                 {
                     imageFactory.GetImage(size, (SIIGBF)options, &hBitmap);
                 }
-                catch (COMException ex) when (ex.HResult == S_ExtractionFailed && options == ThumbnailOptions.ThumbnailOnly)
+                catch (COMException ex) when (options == ThumbnailOptions.ThumbnailOnly &&
+                    (ex.HResult == S_PATHNOTFOUND || ex.HResult == S_EXTRACTIONFAILED))
                 {
-                    // Fallback to IconOnly if ThumbnailOnly fails
+                    // Fallback to IconOnly if extraction fails or files cannot be found
                     imageFactory.GetImage(size, (SIIGBF)ThumbnailOptions.IconOnly, &hBitmap);
                 }
                 catch (FileNotFoundException) when (options == ThumbnailOptions.ThumbnailOnly)
                 {
                     // Fallback to IconOnly if files cannot be found
                     imageFactory.GetImage(size, (SIIGBF)ThumbnailOptions.IconOnly, &hBitmap);
                 }
+                catch (System.Exception ex)
+                {
+                    // Handle other exceptions
+                    throw new InvalidOperationException("Failed to get thumbnail", ex);
+                }
             }
             finally
             {

Flow.Launcher.Infrastructure/Win32Helper.cs

@@ -365,21 +365,10 @@ public static unsafe void SwitchToEnglishKeyboardLayout(bool backupPrevious)
             // No installed English layout found
             if (enHKL == HKL.Null) return;
 
-            // When application is exiting, the Application.Current will be null
-            if (Application.Current == null) return;
-
-            // Get the FL main window
-            var hwnd = GetWindowHandle(Application.Current.MainWindow, true);
+            // Get the foreground window
+            var hwnd = PInvoke.GetForegroundWindow();
             if (hwnd == HWND.Null) return;
 
-            // Check if the FL main window is the current foreground window
-            if (!IsForegroundWindow(hwnd))
-            {
-                var result = PInvoke.SetForegroundWindow(hwnd);
-                // If we cannot set the foreground window, we can use the foreground window and switch the layout
-                if (!result) hwnd = PInvoke.GetForegroundWindow();
-            }
-
             // Get the current foreground window thread ID
             var threadId = PInvoke.GetWindowThreadProcessId(hwnd);
             if (threadId == 0) throw new Win32Exception(Marshal.GetLastWin32Error());

Flow.Launcher.Plugin/Result.cs

@@ -128,12 +128,12 @@ public string BadgeIcoPath
         /// <summary>
         /// Delegate to load an icon for this result.
         /// </summary>
-        public IconDelegate Icon { get; set; }
+        public IconDelegate Icon = null;
 
         /// <summary>
         /// Delegate to load an icon for the badge of this result.
         /// </summary>
-        public IconDelegate BadgeIcon { get; set; }
+        public IconDelegate BadgeIcon = null;
 
         /// <summary>
         /// Information for Glyph Icon (Prioritized than IcoPath/Icon if user enable Glyph Icons)

Flow.Launcher/HotkeyControl.xaml.cs

@@ -1,6 +1,4 @@
-#nullable enable
-
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
@@ -9,6 +7,8 @@
 using Flow.Launcher.Infrastructure.Hotkey;
 using Flow.Launcher.Infrastructure.UserSettings;
 
+#nullable enable
+
 namespace Flow.Launcher
 {
     public partial class HotkeyControl
@@ -242,7 +242,11 @@ private async Task OpenHotkeyDialogAsync()
                 HotKeyMapper.RemoveHotkey(Hotkey);
             }
 
-            var dialog = new HotkeyControlDialog(Hotkey, DefaultHotkey, WindowTitle);
+            var dialog = new HotkeyControlDialog(Hotkey, DefaultHotkey, WindowTitle)
+            {
+                Owner = Window.GetWindow(this)
+            };
+
             await dialog.ShowAsync();
             switch (dialog.ResultType)
             {

Flow.Launcher/Msg.xaml.cs

@@ -59,6 +59,7 @@ private void fadeOutStoryboard_Completed(object sender, EventArgs e)
             Close();
         }
 
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "VSTHRD100:Avoid async void methods", Justification = "<Pending>")]
         public async void Show(string title, string subTitle, string iconPath)
         {
             tbTitle.Text = title;

Flow.Launcher/ReportWindow.xaml.cs

@@ -15,8 +15,6 @@ namespace Flow.Launcher
 {
     internal partial class ReportWindow
     {
-        private static readonly string ClassName = nameof(ReportWindow);
-
         public ReportWindow(Exception exception)
         {
             InitializeComponent();

Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginsViewModel.cs

@@ -5,7 +5,6 @@
 using System.Windows;
 using CommunityToolkit.Mvvm.Input;
 using Flow.Launcher.Core.Plugin;
-using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.ViewModel;
@@ -112,10 +111,11 @@ public SettingsPanePluginsViewModel(Settings settings)
         .ToList();
 
     [RelayCommand]
-    private async Task OpenHelperAsync()
+    private async Task OpenHelperAsync(Button button)
     {
         var helpDialog = new ContentDialog()
         {
+            Owner = Window.GetWindow(button),
             Content = new StackPanel
             {
                 Children =
@@ -146,7 +146,6 @@ private async Task OpenHelperAsync()
                     }
                 }
             },
-
             PrimaryButtonText = (string)Application.Current.Resources["commonOK"],
             CornerRadius = new CornerRadius(8),
             Style = (Style)Application.Current.Resources["ContentDialog"]

Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml

@@ -57,6 +57,7 @@
                     Height="34"
                     Margin="0 0 20 0"
                     Command="{Binding OpenHelperCommand}"
+                    CommandParameter="{Binding RelativeSource={RelativeSource Self}}"
                     Content=""
                     FontFamily="{DynamicResource SymbolThemeFontFamily}"
                     FontSize="14" />

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs

@@ -1,8 +1,8 @@
-using System.Windows.Navigation;
+using System.Windows.Navigation;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.SettingPages.ViewModels;
-using Page = ModernWpf.Controls.Page;
 using Flow.Launcher.Infrastructure.UserSettings;
+using Page = ModernWpf.Controls.Page;
 
 namespace Flow.Launcher.SettingPages.Views;