Merge 63b492aa92 into 10fcbb9990

Merge v2.1.0 back to dev

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -497,6 +497,21 @@ namespace Flow.Launcher.Infrastructure.UserSettings
             }
         }
 
+        private bool _autoTopmostLastOpenedResults = false;
+        public bool AutoTopmostLastOpenedResult
+        {
+            get => _autoTopmostLastOpenedResults;
+            set
+            {
+                if (_autoTopmostLastOpenedResults != value)
+                {
+                    _autoTopmostLastOpenedResults = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+
         public bool SearchQueryResultsWithDelay { get; set; }
         public int SearchDelayTime { get; set; } = 150;
 

Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj

@@ -15,10 +15,10 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>5.1.0</Version>
-    <PackageVersion>5.1.0</PackageVersion>
-    <AssemblyVersion>5.1.0</AssemblyVersion>
-    <FileVersion>5.1.0</FileVersion>
+    <Version>5.2.0</Version>
+    <PackageVersion>5.2.0</PackageVersion>
+    <AssemblyVersion>5.2.0</AssemblyVersion>
+    <FileVersion>5.2.0</FileVersion>
     <PackageId>Flow.Launcher.Plugin</PackageId>
     <Authors>Flow-Launcher</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

Flow.Launcher/Helper/AutoStartup.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Linq;
 using System.Security.Principal;
 using Flow.Launcher.Infrastructure;
@@ -64,7 +65,9 @@ public class AutoStartup
                 if (task.Definition.Actions.FirstOrDefault() is Microsoft.Win32.TaskScheduler.Action taskAction)
                 {
                     var action = taskAction.ToString().Trim();
-                    if (!action.Equals(Constant.ExecutablePath, StringComparison.OrdinalIgnoreCase))
+                    var needsRecreation = !action.Equals(Constant.ExecutablePath, StringComparison.OrdinalIgnoreCase)
+                        || task.Definition.Settings.Priority != ProcessPriorityClass.Normal;
+                    if (needsRecreation)
                     {
                         UnscheduleLogonTask();
                         ScheduleLogonTask();
@@ -184,6 +187,7 @@ public class AutoStartup
         td.Settings.StopIfGoingOnBatteries = false;
         td.Settings.DisallowStartIfOnBatteries = false;
         td.Settings.ExecutionTimeLimit = TimeSpan.Zero;
+        td.Settings.Priority = ProcessPriorityClass.Normal;
 
         try
         {

Flow.Launcher/Languages/en.xaml

@@ -179,6 +179,8 @@
     <system:String x:Key="homeToggleBoxToolTip">This can only be edited if plugin supports Home feature and Home Page is enabled.</system:String>
     <system:String x:Key="showAtTopmost">Show Search Window at Foremost</system:String>
     <system:String x:Key="showAtTopmostToolTip">Overrides other programs' 'Always on Top' setting and displays Flow in the foremost position.</system:String>
+    <system:String x:Key="autoTopmostLastOpenedResult">Auto Topmost Results</system:String>
+    <system:String x:Key="autoTopmostLastOpenedResultToolTip">Automatically mark selected results as topmost in their queries for faster access in future searches.</system:String>
     <system:String x:Key="autoRestartAfterChanging">Restart after modifying plugin via Plugin Store</system:String>
     <system:String x:Key="autoRestartAfterChangingToolTip">Restart Flow Launcher automatically after installing/uninstalling/updating plugin via Plugin Store</system:String>
     <system:String x:Key="showUnknownSourceWarning">Show unknown source warning</system:String>

Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml

@@ -106,6 +106,20 @@
                     OnContent="{DynamicResource enable}" />
             </ui:SettingsCard>
 
+            <ui:SettingsCard
+                Margin="0 4 0 0"
+                Description="{DynamicResource autoTopmostLastOpenedResultToolTip}"
+                Header="{DynamicResource autoTopmostLastOpenedResult}">
+                <ui:SettingsCard.HeaderIcon>
+                    <ui:FontIcon Glyph="&#xf5ed;" />
+                </ui:SettingsCard.HeaderIcon>
+
+                <ui:ToggleSwitch
+                    IsOn="{Binding Settings.AutoTopmostLastOpenedResult}"
+                    OffContent="{DynamicResource disable}"
+                    OnContent="{DynamicResource enable}" />
+            </ui:SettingsCard>
+
             <ui:SettingsCard Margin="0 4 0 0" Header="{DynamicResource SearchWindowPosition}">
                 <ui:SettingsCard.HeaderIcon>
                     <ui:FontIcon Glyph="&#xe7f4;" />

Flow.Launcher/Storage/QueryHistory.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json.Serialization;

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -545,12 +545,14 @@ namespace Flow.Launcher.ViewModel
 
             // 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
+            // Add item to history and topmost only if it is from results but not context menu or history
             if (queryResultsSelected)
             {
                 _history.Add(result);
                 lastHistoryIndex = 1;
-            }
+                if (Settings.AutoTopmostLastOpenedResult)
+                    _topMostRecord.AddOrUpdate(result);
+            } 
         }
 
         private static IReadOnlyList<Result> DeepCloneResults(IReadOnlyList<Result> results, bool isDialogJump, CancellationToken token = default)

appveyor.yml

@@ -1,4 +1,4 @@
-version: '2.0.3.{build}'
+version: '2.1.0.{build}'
 
 # Do not build on tags because we create a release on merge to master. Otherwise will upload artifacts twice changing the hash, as well as triggering duplicate GitHub release action & NuGet deployments.
 skip_tags: true