Merge branch 'dev' into dev4

Author: Jack251970

Flow.Launcher.Core/Resource/Theme.cs

@@ -8,6 +8,7 @@
 using System.Windows.Markup;
 using System.Windows.Media;
 using System.Windows.Media.Effects;
+using System.Windows.Shell;
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Infrastructure.UserSettings;
@@ -309,12 +310,15 @@ public void AddDropShadowEffectToCurrentTheme()
             var marginSetter = windowBorderStyle.Setters.FirstOrDefault(setterBase => setterBase is Setter setter && setter.Property == Border.MarginProperty) as Setter;
             if (marginSetter == null)
             {
+                var margin = new Thickness(ShadowExtraMargin, 12, ShadowExtraMargin, ShadowExtraMargin);
                 marginSetter = new Setter()
                 {
                     Property = Border.MarginProperty,
-                    Value = new Thickness(ShadowExtraMargin, 12, ShadowExtraMargin, ShadowExtraMargin),
+                    Value = margin,
                 };
                 windowBorderStyle.Setters.Add(marginSetter);
+
+                SetResizeBoarderThickness(margin);
             }
             else
             {
@@ -325,6 +329,8 @@ public void AddDropShadowEffectToCurrentTheme()
                     baseMargin.Right + ShadowExtraMargin,
                     baseMargin.Bottom + ShadowExtraMargin);
                 marginSetter.Value = newMargin;
+
+                SetResizeBoarderThickness(newMargin);
             }
 
             windowBorderStyle.Setters.Add(effectSetter);
@@ -355,9 +361,36 @@ public void RemoveDropShadowEffectFromCurrentTheme()
                 marginSetter.Value = newMargin;
             }
 
+            SetResizeBoarderThickness(null);
+
             UpdateResourceDictionary(dict);
         }
 
+        // because adding drop shadow effect will change the margin of the window,
+        // we need to update the window chrome thickness to correct set the resize border
+        private static void SetResizeBoarderThickness(Thickness? effectMargin)
+        {
+            var window = Application.Current.MainWindow;
+            if (WindowChrome.GetWindowChrome(window) is WindowChrome windowChrome)
+            {
+                Thickness thickness;
+                if (effectMargin == null)
+                {
+                    thickness = SystemParameters.WindowResizeBorderThickness;
+                }
+                else
+                {
+                    thickness = new Thickness(
+                        effectMargin.Value.Left + SystemParameters.WindowResizeBorderThickness.Left,
+                        effectMargin.Value.Top + SystemParameters.WindowResizeBorderThickness.Top,
+                        effectMargin.Value.Right + SystemParameters.WindowResizeBorderThickness.Right,
+                        effectMargin.Value.Bottom + SystemParameters.WindowResizeBorderThickness.Bottom);
+                }
+
+                windowChrome.ResizeBorderThickness = thickness;
+            }
+        }
+
         public record ThemeData(string FileNameWithoutExtension, string Name, bool? IsDark = null, bool? HasBlur = null);
     }
 }

Flow.Launcher.Infrastructure/Image/ThumbnailReader.cs

@@ -84,6 +84,11 @@ private static unsafe HBITMAP GetHBitmap(string fileName, int width, int height,
                     // Fallback to IconOnly if ThumbnailOnly fails
                     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);
+                }
             }
             finally
             {

Flow.Launcher.Plugin/Query.cs

@@ -1,23 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Flow.Launcher.Plugin
 {
     public class Query
     {
         public Query() { }
 
-        [Obsolete("Use the default Query constructor.")]
-        public Query(string rawQuery, string search, string[] terms, string[] searchTerms, string actionKeyword = "")
-        {
-            Search = search;
-            RawQuery = rawQuery;
-            SearchTerms = searchTerms;
-            ActionKeyword = actionKeyword;
-        }
-
         /// <summary>
         /// Raw query, this includes action keyword if it has
         /// We didn't recommend use this property directly. You should always use Search property.

Flow.Launcher/MainWindow.xaml

@@ -38,7 +38,7 @@
     mc:Ignorable="d">
     <!--  WindowChrome  -->
     <WindowChrome.WindowChrome>
-        <WindowChrome CaptionHeight="9" ResizeBorderThickness="32 4 32 32" />
+        <WindowChrome CaptionHeight="9" />
     </WindowChrome.WindowChrome>
     <Window.Resources>
         <converters:QuerySuggestionBoxConverter x:Key="QuerySuggestionBoxConverter" />

Flow.Launcher/Storage/TopMostRecord.cs

@@ -12,6 +12,8 @@ public class TopMostRecord
 
         internal bool IsTopMost(Result result)
         {
+            // origin query is null when user select the context menu item directly of one item from query list
+            // in this case, we do not need to check if the result is top most
             if (records.IsEmpty || result.OriginQuery == null ||
                 !records.TryGetValue(result.OriginQuery.RawQuery, out var value))
             {
@@ -24,11 +26,25 @@ internal bool IsTopMost(Result result)
 
         internal void Remove(Result result)
         {
+            // origin query is null when user select the context menu item directly of one item from query list
+            // in this case, we do not need to remove the record
+            if (result.OriginQuery == null)
+            {
+                return;
+            }
+
             records.Remove(result.OriginQuery.RawQuery, out _);
         }
 
         internal void AddOrUpdate(Result result)
         {
+            // origin query is null when user select the context menu item directly of one item from query list
+            // in this case, we do not need to add or update the record
+            if (result.OriginQuery == null)
+            {
+                return;
+            }
+
             var record = new Record
             {
                 PluginID = result.PluginID,
@@ -38,11 +54,6 @@ internal void AddOrUpdate(Result result)
             };
             records.AddOrUpdate(result.OriginQuery.RawQuery, record, (key, oldValue) => record);
         }
-
-        public void Load(Dictionary<string, Record> dictionary)
-        {
-            records = new ConcurrentDictionary<string, Record>(dictionary);
-        }
     }
 
     public class Record

Flow.Launcher/Storage/UserSelectedRecord.cs

@@ -57,6 +57,8 @@ private static int GenerateResultHashCode(Result result)
 
         private static int GenerateQueryAndResultHashCode(Query query, Result result)
         {
+            // query is null when user select the context menu item directly of one item from query list
+            // so we only need to consider the result
             if (query == null)
             {
                 return GenerateResultHashCode(result);

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -35,8 +35,6 @@ public partial class MainViewModel : BaseModel, ISavable
 
         private bool _isQueryRunning;
         private Query _lastQuery;
-        private Result lastContextMenuResult = new Result();
-        private List<Result> lastContextMenuResults = new List<Result>();
         private string _queryTextBeforeLeaveResults;
 
         private readonly FlowLauncherJsonStorage<History> _historyItemsStorage;
@@ -399,11 +397,15 @@ private async Task OpenResultAsync(string index)
                 })
                 .ConfigureAwait(false);
 
-
             if (SelectedIsFromQueryResults())
             {
                 _userSelectedRecord.Add(result);
-                _history.Add(result.OriginQuery.RawQuery);
+                // origin query is null when user select the context menu item directly of one item from query list
+                // so we don't want to add it to history
+                if (result.OriginQuery != null)
+                {
+                    _history.Add(result.OriginQuery.RawQuery);
+                }
                 lastHistoryIndex = 1;
             }
 
@@ -987,19 +989,10 @@ private void QueryContextMenu()
             if (selected != null) // SelectedItem returns null if selection is empty.
             {
                 List<Result> results;
-                if (selected == lastContextMenuResult)
-                {
-                    results = lastContextMenuResults;
-                }
-                else
-                {
-                    results = PluginManager.GetContextMenusForPlugin(selected);
-                    lastContextMenuResults = results;
-                    lastContextMenuResult = selected;
-                    results.Add(ContextMenuTopMost(selected));
-                    results.Add(ContextMenuPluginInfo(selected.PluginID));
-                }
 
+                results = PluginManager.GetContextMenusForPlugin(selected);
+                results.Add(ContextMenuTopMost(selected));
+                results.Add(ContextMenuPluginInfo(selected.PluginID));
 
                 if (!string.IsNullOrEmpty(query))
                 {
@@ -1274,6 +1267,8 @@ private Result ContextMenuTopMost(Result result)
                     {
                         _topMostRecord.Remove(result);
                         App.API.ShowMsg(InternationalizationManager.Instance.GetTranslation("success"));
+                        App.API.BackToQueryResults();
+                        App.API.ReQuery();
                         return false;
                     }
                 };
@@ -1290,6 +1285,8 @@ private Result ContextMenuTopMost(Result result)
                     {
                         _topMostRecord.AddOrUpdate(result);
                         App.API.ShowMsg(InternationalizationManager.Instance.GetTranslation("success"));
+                        App.API.BackToQueryResults();
+                        App.API.ReQuery();
                         return false;
                     }
                 };
@@ -1378,8 +1375,6 @@ public async void Hide()
             lastHistoryIndex = 1;
             // Trick for no delay
             MainWindowOpacity = 0;
-            lastContextMenuResult = new Result();
-            lastContextMenuResults = new List<Result>();
 
             if (ExternalPreviewVisible)
                 CloseExternalPreview();

Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs

@@ -242,6 +242,7 @@ public List<Result> LoadContextMenus(Result selectedResult)
                                 var name = "Plugin: Folder";
                                 var message = $"File not found: {e.Message}";
                                 Context.API.ShowMsgError(name, message);
+                                return false;
                             }
 
                             return true;

Plugins/Flow.Launcher.Plugin.Program/Main.cs

@@ -264,6 +264,8 @@ public List<Result> LoadContextMenus(Result selectedResult)
                             Context.API.GetTranslation("flowlauncher_plugin_program_disable_dlgtitle_success"),
                             Context.API.GetTranslation(
                                 "flowlauncher_plugin_program_disable_dlgtitle_success_message"));
+                        Context.API.BackToQueryResults();
+                        Context.API.ReQuery();
                         return false;
                     },
                     IcoPath = "Images/disable.png",