Merge branch 'dev' into feature/4149-diacritics-insensitive-search

4yinn · web-flow · commit 99f2b3b1ad70 · 2026-03-28T19:14:51.000-03:00
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v6
       - name: Set Flow.Launcher.csproj version
         id: update
-        uses: vers-one/dotnet-project-version-updater@v1.7
+        uses: vers-one/dotnet-project-version-updater@v1.8
         with:
           file: |
             "**/SolutionAssemblyInfo.cs"
diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs
@@ -418,11 +418,6 @@ public bool ChangeTheme(string theme = null)
                 if (string.IsNullOrEmpty(path))
                     throw new DirectoryNotFoundException($"Theme path can't be found <{path}>");
 
-                // Retrieve theme resource – always use the resource with font settings applied.
-                var resourceDict = GetResourceDictionary(theme);
-
-                UpdateResourceDictionary(resourceDict);
-
                 _settings.Theme = theme;
 
                 // Always allow re-loading default theme, in case of failure of switching to a new theme from default theme
@@ -432,7 +427,8 @@ public bool ChangeTheme(string theme = null)
                 }
 
                 // Check if blur is enabled
-                BlurEnabled = Win32Helper.IsBackdropSupported() && IsThemeBlurEnabled(resourceDict);
+                var dict = GetThemeResourceDictionary(theme);
+                BlurEnabled = Win32Helper.IsBackdropSupported() && IsThemeBlurEnabled(dict);
 
                 // Apply blur and drop shadow effect so that we do not need to call it again
                 _ = RefreshFrameAsync();
@@ -706,30 +702,27 @@ private void SetBlurForWindow(string theme, BackdropTypes backdropType)
 
         private void AutoDropShadow(bool useDropShadowEffect)
         {
-            SetWindowCornerPreference("Default");
-            RemoveDropShadowEffectFromCurrentTheme();
             if (useDropShadowEffect)
             {
                 if (BlurEnabled && Win32Helper.IsBackdropSupported())
                 {
+                    // For themes with blur enabled, the window border is rendered by the system,
+                    // so we set corner preference to round and remove drop shadow effect to avoid rendering issues.
                     SetWindowCornerPreference("Round");
+                    RemoveDropShadowEffectFromCurrentTheme();
                 }
                 else
                 {
+                    // For themes without blur, we set corner preference to default and add drop shadow effect.
                     SetWindowCornerPreference("Default");
                     AddDropShadowEffectToCurrentTheme();
                 }
             }
             else
             {
-                if (BlurEnabled && Win32Helper.IsBackdropSupported())
-                {
-                    SetWindowCornerPreference("Default");
-                }
-                else
-                {
-                    RemoveDropShadowEffectFromCurrentTheme();
-                }
+                // When drop shadow effect is disabled, we set corner preference to default and remove drop shadow effect.
+                SetWindowCornerPreference("Default");
+                RemoveDropShadowEffectFromCurrentTheme();
             }
         }
 
diff --git a/Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj b/Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj
@@ -66,7 +66,7 @@
     <PackageReference Include="InputSimulator" Version="1.0.4" />
     <PackageReference Include="MemoryPack" Version="1.21.4" />
     <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.14.15" />
-    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.205">
+    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.269">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/Flow.Launcher.Infrastructure/Win32Helper.cs b/Flow.Launcher.Infrastructure/Win32Helper.cs
@@ -849,10 +849,10 @@ public static unsafe void OpenFolderAndSelectFile(string filePath)
 
             try
             {
-                var hrFolder = PInvoke.SHParseDisplayName(folderPath, null, out pidlFolder, 0, null);
+                var hrFolder = PInvoke.SHParseDisplayName(folderPath, null, out pidlFolder, 0, out _);
                 if (hrFolder.Failed) throw new COMException("Failed to parse folder path", hrFolder);
 
-                var hrFile = PInvoke.SHParseDisplayName(filePath, null, out pidlFile, 0, null);
+                var hrFile = PInvoke.SHParseDisplayName(filePath, null, out pidlFile, 0, out _);
                 if (hrFile.Failed) throw new COMException("Failed to parse file path", hrFile);
 
                 var hrSelect = PInvoke.SHOpenFolderAndSelectItems(pidlFolder, 1, &pidlFile, 0);
diff --git a/Flow.Launcher.Infrastructure/packages.lock.json b/Flow.Launcher.Infrastructure/packages.lock.json
@@ -70,13 +70,13 @@
       },
       "Microsoft.Windows.CsWin32": {
         "type": "Direct",
-        "requested": "[0.3.205, )",
-        "resolved": "0.3.205",
-        "contentHash": "U5wGAnyKd7/I2YMd43nogm81VMtjiKzZ9dsLMVI4eAB7jtv5IEj0gprj0q/F3iRmAIaGv5omOf8iSYx2+nE6BQ==",
+        "requested": "[0.3.269, )",
+        "resolved": "0.3.269",
+        "contentHash": "O4GVJ0ymxcoFRGS07VcoEClj7A9PIciHIjWDrPymzonhYlOfM7V0ZqGBUK19cUH3BPca9MfSOH0KLK/9JzQ8+Q==",
         "dependencies": {
           "Microsoft.Windows.SDK.Win32Docs": "0.1.42-alpha",
-          "Microsoft.Windows.SDK.Win32Metadata": "61.0.15-preview",
-          "Microsoft.Windows.WDK.Win32Metadata": "0.12.8-experimental"
+          "Microsoft.Windows.SDK.Win32Metadata": "69.0.7-preview",
+          "Microsoft.Windows.WDK.Win32Metadata": "0.13.25-experimental"
         }
       },
       "NHotkey.Wpf": {
@@ -178,15 +178,15 @@
       },
       "Microsoft.Windows.SDK.Win32Metadata": {
         "type": "Transitive",
-        "resolved": "61.0.15-preview",
-        "contentHash": "cysex3dazKtCPALCluC2XX3f5Aedy9H2pw5jb+TW5uas2rkem1Z7FRnbUrg2vKx0pk0Qz+4EJNr37HdYTEcvEQ=="
+        "resolved": "69.0.7-preview",
+        "contentHash": "RJoNjQJVCIDNLPbvYuaygCFknTyAxOUE45of1voj0jjOgJa9MB2m1/G8L8F3IYc+2EFG5aqa/9y8PEx7Tk2tLQ=="
       },
       "Microsoft.Windows.WDK.Win32Metadata": {
         "type": "Transitive",
-        "resolved": "0.12.8-experimental",
-        "contentHash": "3n8R44/Z96Ly+ty4eYVJfESqbzvpw96lRLs3zOzyDmr1x1Kw7FNn5CyE416q+bZQV3e1HRuMUvyegMeRE/WedA==",
+        "resolved": "0.13.25-experimental",
+        "contentHash": "IM50tb/+UIwBr9FMr6ZKcZjCMW+Axo6NjGqKxgjUfyCY8dRnYUfrJEXxAaXoWtYP4X8EmASmC1Jtwh4XucseZg==",
         "dependencies": {
-          "Microsoft.Windows.SDK.Win32Metadata": "61.0.15-preview"
+          "Microsoft.Windows.SDK.Win32Metadata": "63.0.31-preview"
         }
       },
       "NHotkey": {
diff --git a/Flow.Launcher.Test/Plugins/ExplorerTest.cs b/Flow.Launcher.Test/Plugins/ExplorerTest.cs
@@ -438,5 +438,49 @@ public void GivenPath_WhenHavingEnvironmentVariableOrNot_ThenShouldBeExpected(st
             // Then
             ClassicAssert.AreEqual(result, expectedResult);
         }
+
+        [Test]
+        public void GivenNonHomeFolderPaths_WhenCheckedWithIsHomeFolderPath_ThenShouldReturnFalse()
+        {
+            // Given
+            var nonHomeFolders = new[]
+            {
+                @"C:\SomeRandomFolder",
+                @"C:\Windows\System32",
+                @"C:\Program Files",
+            };
+
+            // When, Then
+            foreach (var folder in nonHomeFolders)
+            {
+                ClassicAssert.IsFalse(ResultManager.IsHomeFolderPath(folder),
+                    $"Expected '{folder}' to NOT be recognized as a home folder");
+            }
+        }
+
+        [Test]
+        public void GivenPathsInsideHomeDirectories_WhenCheckedWithIsHomeFolderPath_ThenShouldReturnTrue()
+{
+            var desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
+            
+            if (string.IsNullOrEmpty(desktopPath))
+            {
+                Assert.Ignore("Desktop special folder path is unavailable in this environment.");
+            }
+
+            var homeFolderVariants = new[]
+            {
+                Path.Combine(desktopPath, "dummy_desktop_file"),
+                Path.Combine(desktopPath, "dummy_desktop_folder") + "\\\\",
+                desktopPath + "\\\\dummy_desktop_folder\\\\",
+                Path.Combine(desktopPath, "dummy_desktop_folder", "dummy_desktop_file"),
+            };
+
+            foreach (var path in homeFolderVariants)
+            {
+                ClassicAssert.IsTrue(ResultManager.IsHomeFolderPath(path),
+                    $"Expected '{path}' to be recognized as inside a home folder");
+            }
+        }
     }
 }
diff --git a/Flow.Launcher/MessageBoxEx.xaml b/Flow.Launcher/MessageBoxEx.xaml
@@ -88,7 +88,6 @@
                     MaxWidth="400"
                     Margin="0 0 26 0"
                     VerticalAlignment="Center"
-                    FontFamily="Segoe UI"
                     FontSize="20"
                     FontWeight="SemiBold"
                     TextAlignment="Left"
diff --git a/Flow.Launcher/ProgressBoxEx.xaml b/Flow.Launcher/ProgressBoxEx.xaml
@@ -95,7 +95,6 @@
                 MaxWidth="400"
                 Margin="0 0 26 12"
                 VerticalAlignment="Center"
-                FontFamily="Segoe UI"
                 FontSize="20"
                 FontWeight="SemiBold"
                 TextAlignment="Left"
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -515,8 +515,11 @@ private async Task OpenResultAsync(string index)
                 return;
             }
 
+            var hideWindow = false;
+            var isDialogJumpLeftClick = _isDialogJump && Settings.DialogJumpResultBehaviour == DialogJumpResultBehaviours.LeftClick;
+
             // For Dialog Jump and left click mode, we need to navigate to the path
-            if (_isDialogJump && Settings.DialogJumpResultBehaviour == DialogJumpResultBehaviours.LeftClick)
+            if (isDialogJumpLeftClick)
             {
                 if (result is DialogJumpResult dialogJumpResult)
                 {
@@ -531,26 +534,30 @@ private async Task OpenResultAsync(string index)
             // For query mode, we execute the result
             else
             {
-                var hideWindow = await result.ExecuteAsync(new ActionContext
+                hideWindow = await result.ExecuteAsync(new ActionContext
                 {
                     // not null means pressing modifier key + number, should ignore the modifier key
                     SpecialKeyState = index is not null ? SpecialKeyState.Default : GlobalHotkey.CheckModifiers()
                 }).ConfigureAwait(false);
-
-                if (hideWindow)
-                {
-                    Hide();
-                }
             }
 
-            // Record user selected result for result ranking
-            _userSelectedRecord.Add(result);
-            // Add item to history only if it is from results but not context menu or history
+            // New history result must be recorded before Hide() is called, otherwise when in 'Empty Last Query' query style mode
+            // the QueryAsync call will reconstruct the result list without the new item.
+            // Also, add item to history only if it is from results but not context menu or history.
             if (queryResultsSelected)
             {
                 _history.Add(result);
                 lastHistoryIndex = 1;
             }
+
+            // Only hide for query results (not Dialog Jump left-click mode)
+            if (!isDialogJumpLeftClick && hideWindow)
+            {
+                Hide();
+            }
+
+            // Record user selected result for result ranking
+            _userSelectedRecord.Add(result);
         }
 
         private static IReadOnlyList<Result> DeepCloneResults(IReadOnlyList<Result> results, bool isDialogJump, CancellationToken token = default)
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
@@ -110,7 +110,7 @@
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageReference Include="Flow.Launcher.Localization" Version="0.0.6" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.5" />
-    <PackageReference Include="Svg.Skia" Version="3.6.0" />
+    <PackageReference Include="Svg.Skia" Version="3.7.0" />
     <PackageReference Include="SkiaSharp" Version="3.119.1" />
   </ItemGroup>
 
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
@@ -51,6 +51,7 @@
     <system:String x:Key="plugin_explorer_use_location_as_working_dir">Use search result's location as the working directory of the executable</system:String>
     <system:String x:Key="plugin_explorer_display_more_info_in_tooltip">Display more information like size and age in tooltips</system:String>
     <system:String x:Key="plugin_explorer_default_open_in_file_manager">Hit Enter to open folder in Default File Manager</system:String>
+    <system:String x:Key="plugin_explorer_boost_home_folder_score">Prioritize home folders (Documents, Desktop, Downloads, etc.) in search results</system:String>
     <system:String x:Key="plugin_explorer_usewindowsindexfordirectorysearch">Use Index Search For Path Search</system:String>
     <system:String x:Key="plugin_explorer_manageindexoptions">Indexing Options</system:String>
     <system:String x:Key="plugin_explorer_actionkeywordview_search">Search:</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingAPI.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingAPI.cs
@@ -157,7 +157,8 @@ public static async IAsyncEnumerable<SearchResult> SearchAsync(EverythingSearchO
                         Type = EverythingApiDllImport.Everything_IsFolderResult(idx) ? ResultType.Folder :
                             EverythingApiDllImport.Everything_IsFileResult(idx) ? ResultType.File :
                             ResultType.Volume,
-                        Score = (int)EverythingApiDllImport.Everything_GetResultRunCount( (uint)idx) 
+                        Score = Convert.ToInt32(EverythingApiDllImport.Everything_GetResultRunCount((uint)idx)),
+                        HighlightData = EverythingHighlightStringToHighlightList(EverythingApiDllImport.Everything_GetResultHighlightedFileName((uint)idx))
                     };
 
                     yield return result;
@@ -208,5 +209,55 @@ public static async Task IncrementRunCounterAsync(string fileOrFolder)
             }
             finally { _semaphore.Release(); }
         }
+
+        /// <summary>
+        /// Convert the highlighted string from Everything API to a list of highlight indexes for our Result.
+        /// </summary>
+        /// <param name="highlightString">Text inside a * quote is highlighted, two consecutive *'s is a single literal *. For example, in the highlighted text: abc*123* the 123 part is highlighted.</param>
+        /// <returns>A list of zero-based character indices that should be highlighted.</returns>
+        public static List<int> EverythingHighlightStringToHighlightList(string highlightString)
+        {
+            var highlightData = new List<int>();
+
+            if (string.IsNullOrEmpty(highlightString))
+                return highlightData;
+
+            var isHighlighted = false;
+            var actualIndex = 0; // Index in the actual string (without * markers)
+            var length = highlightString.Length;
+
+            for (var i = 0; i < length; i++)
+            {
+                if (highlightString[i] == '*')
+                {
+                    // Check if it's a literal * (two consecutive *)
+                    if (i + 1 < length && highlightString[i + 1] == '*')
+                    {
+                        // Two consecutive *'s represent a single literal *
+                        if (isHighlighted)
+                        {
+                            highlightData.Add(actualIndex);
+                        }
+                        actualIndex++;
+                        i++; // Skip the next *
+                    }
+                    else
+                    {
+                        isHighlighted = !isHighlighted;
+                    }
+                }
+                else
+                {
+                    // Regular character
+                    if (isHighlighted)
+                    {
+                        highlightData.Add(actualIndex);
+                    }
+                    actualIndex++;
+                }
+            }
+
+            return highlightData;
+        }
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingApiDllImport.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingApiDllImport.cs
@@ -126,7 +126,7 @@ public static void Load(string directory)
         public static extern uint Everything_GetRequestFlags();
         [DllImport(DLL)]
         public static extern uint Everything_GetResultListRequestFlags();
-        [DllImport("Everything64.dll", CharSet = CharSet.Unicode)]
+        [DllImport(DLL, CharSet = CharSet.Unicode)]
         public static extern IntPtr Everything_GetResultExtension(uint nIndex);
         [DllImport(DLL)]
         public static extern bool Everything_GetResultSize(uint nIndex, out long lpFileSize);
@@ -147,7 +147,7 @@ public static void Load(string directory)
         [DllImport(DLL)]
         public static extern bool Everything_GetResultDateRecentlyChanged(uint nIndex, out long lpFileTime);
         [DllImport(DLL, CharSet = CharSet.Unicode)]
-        public static extern IntPtr Everything_GetResultHighlightedFileName(uint nIndex);
+        public static extern string Everything_GetResultHighlightedFileName(uint nIndex);
         [DllImport(DLL, CharSet = CharSet.Unicode)]
         public static extern IntPtr Everything_GetResultHighlightedPath(uint nIndex);
         [DllImport(DLL, CharSet = CharSet.Unicode)]
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLinks/QuickAccess.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLinks/QuickAccess.cs
@@ -21,7 +21,7 @@ internal static List<Result> AccessLinkListMatched(Query query, IEnumerable<Acce
                     {
                         ResultType.Volume => ResultManager.CreateDriveSpaceDisplayResult(l.Path, query.ActionKeyword, QuickAccessResultScore),
                         ResultType.Folder => ResultManager.CreateFolderResult(l.Name, l.Path, l.Path, query, QuickAccessResultScore),
-                        ResultType.File => ResultManager.CreateFileResult(l.Path, query, QuickAccessResultScore),
+                        ResultType.File => ResultManager.CreateFileResult(l.Path, query, QuickAccessResultScore, name: l.Name),
                         _ => throw new ArgumentOutOfRangeException()
                     })
                 .ToList();
@@ -35,7 +35,7 @@ internal static List<Result> AccessLinkListAll(Query query, IEnumerable<AccessLi
                 {
                     ResultType.Volume => ResultManager.CreateDriveSpaceDisplayResult(l.Path, query.ActionKeyword, QuickAccessResultScore),
                     ResultType.Folder => ResultManager.CreateFolderResult(l.Name, l.Path, l.Path, query, QuickAccessResultScore),
-                    ResultType.File => ResultManager.CreateFileResult(l.Path, query, QuickAccessResultScore),
+                    ResultType.File => ResultManager.CreateFileResult(l.Path, query, QuickAccessResultScore, name: l.Name),
                     _ => throw new ArgumentOutOfRangeException()
                 }).ToList();
     }
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchResult.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchResult.cs
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Flow.Launcher.Plugin.Program.csproj b/Plugins/Flow.Launcher.Plugin.Program/Flow.Launcher.Plugin.Program.csproj
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml

Original file line number	Diff line number	Diff line change
`@@ -418,11 +418,6 @@ public bool ChangeTheme(string theme = null)`
`418`	`418`	`if (string.IsNullOrEmpty(path))`
`419`	`419`	`throw new DirectoryNotFoundException($"Theme path can't be found <{path}>");`
`420`	`420`
`421`		`- // Retrieve theme resource – always use the resource with font settings applied.`
`422`		`- var resourceDict = GetResourceDictionary(theme);`
`423`		`-`
`424`		`- UpdateResourceDictionary(resourceDict);`
`425`		`-`
`426`	`421`	`_settings.Theme = theme;`
`427`	`422`
`428`	`423`	`// Always allow re-loading default theme, in case of failure of switching to a new theme from default theme`
`@@ -432,7 +427,8 @@ public bool ChangeTheme(string theme = null)`
`432`	`427`	`}`
`433`	`428`
`434`	`429`	`// Check if blur is enabled`
`435`		`- BlurEnabled = Win32Helper.IsBackdropSupported() && IsThemeBlurEnabled(resourceDict);`
	`430`	`+ var dict = GetThemeResourceDictionary(theme);`
	`431`	`+ BlurEnabled = Win32Helper.IsBackdropSupported() && IsThemeBlurEnabled(dict);`
`436`	`432`
`437`	`433`	`// Apply blur and drop shadow effect so that we do not need to call it again`
`438`	`434`	`_ = RefreshFrameAsync();`
`@@ -706,30 +702,27 @@ private void SetBlurForWindow(string theme, BackdropTypes backdropType)`
`706`	`702`
`707`	`703`	`private void AutoDropShadow(bool useDropShadowEffect)`
`708`	`704`	`{`
`709`		`- SetWindowCornerPreference("Default");`
`710`		`- RemoveDropShadowEffectFromCurrentTheme();`
`711`	`705`	`if (useDropShadowEffect)`
`712`	`706`	`{`
`713`	`707`	`if (BlurEnabled && Win32Helper.IsBackdropSupported())`
`714`	`708`	`{`
	`709`	`+ // For themes with blur enabled, the window border is rendered by the system,`
	`710`	`+ // so we set corner preference to round and remove drop shadow effect to avoid rendering issues.`
`715`	`711`	`SetWindowCornerPreference("Round");`
	`712`	`+ RemoveDropShadowEffectFromCurrentTheme();`
`716`	`713`	`}`
`717`	`714`	`else`
`718`	`715`	`{`
	`716`	`+ // For themes without blur, we set corner preference to default and add drop shadow effect.`
`719`	`717`	`SetWindowCornerPreference("Default");`
`720`	`718`	`AddDropShadowEffectToCurrentTheme();`
`721`	`719`	`}`
`722`	`720`	`}`
`723`	`721`	`else`
`724`	`722`	`{`
`725`		`- if (BlurEnabled && Win32Helper.IsBackdropSupported())`
`726`		`- {`
`727`		`- SetWindowCornerPreference("Default");`
`728`		`- }`
`729`		`- else`
`730`		`- {`
`731`		`- RemoveDropShadowEffectFromCurrentTheme();`
`732`		`- }`
	`723`	`+ // When drop shadow effect is disabled, we set corner preference to default and remove drop shadow effect.`
	`724`	`+ SetWindowCornerPreference("Default");`
	`725`	`+ RemoveDropShadowEffectFromCurrentTheme();`
`733`	`726`	`}`
`734`	`727`	`}`
`735`	`728`
Original file line number	Diff line number	Diff line change
`@@ -515,8 +515,11 @@ private async Task OpenResultAsync(string index)`
`515`	`515`	`return;`
`516`	`516`	`}`
`517`	`517`
	`518`	`+ var hideWindow = false;`
	`519`	`+ var isDialogJumpLeftClick = _isDialogJump && Settings.DialogJumpResultBehaviour == DialogJumpResultBehaviours.LeftClick;`
	`520`	`+`
`518`	`521`	`// For Dialog Jump and left click mode, we need to navigate to the path`
`519`		`- if (_isDialogJump && Settings.DialogJumpResultBehaviour == DialogJumpResultBehaviours.LeftClick)`
	`522`	`+ if (isDialogJumpLeftClick)`
`520`	`523`	`{`
`521`	`524`	`if (result is DialogJumpResult dialogJumpResult)`
`522`	`525`	`{`
`@@ -531,26 +534,30 @@ private async Task OpenResultAsync(string index)`
`531`	`534`	`// For query mode, we execute the result`
`532`	`535`	`else`
`533`	`536`	`{`
`534`		`- var hideWindow = await result.ExecuteAsync(new ActionContext`
	`537`	`+ hideWindow = await result.ExecuteAsync(new ActionContext`
`535`	`538`	`{`
`536`	`539`	`// not null means pressing modifier key + number, should ignore the modifier key`
`537`	`540`	`SpecialKeyState = index is not null ? SpecialKeyState.Default : GlobalHotkey.CheckModifiers()`
`538`	`541`	`}).ConfigureAwait(false);`
`539`		`-`
`540`		`- if (hideWindow)`
`541`		`- {`
`542`		`- Hide();`
`543`		`- }`
`544`	`542`	`}`
`545`	`543`
`546`		`- // Record user selected result for result ranking`
`547`		`- _userSelectedRecord.Add(result);`
`548`		`- // Add item to history only if it is from results but not context menu or history`
	`544`	`+ // New history result must be recorded before Hide() is called, otherwise when in 'Empty Last Query' query style mode`
	`545`	`+ // the QueryAsync call will reconstruct the result list without the new item.`
	`546`	`+ // Also, add item to history only if it is from results but not context menu or history.`
`549`	`547`	`if (queryResultsSelected)`
`550`	`548`	`{`
`551`	`549`	`_history.Add(result);`
`552`	`550`	`lastHistoryIndex = 1;`
`553`	`551`	`}`
	`552`	`+`
	`553`	`+ // Only hide for query results (not Dialog Jump left-click mode)`
	`554`	`+ if (!isDialogJumpLeftClick && hideWindow)`
	`555`	`+ {`
	`556`	`+ Hide();`
	`557`	`+ }`
	`558`	`+`
	`559`	`+ // Record user selected result for result ranking`
	`560`	`+ _userSelectedRecord.Add(result);`
`554`	`561`	`}`
`555`	`562`
`556`	`563`	`private static IReadOnlyList<Result> DeepCloneResults(IReadOnlyList<Result> results, bool isDialogJump, CancellationToken token = default)`