Merge branch 'feature/pinned-results' of https://github.com/01Dri/Flow.Launcher into feature/pinned-results

01Dri · 01Dri · commit ee106e587ccb · 2026-04-15T23:57:27.000-03:00
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
@@ -108,3 +108,7 @@ Msix
 dummyprofile
 browserbookmark
 copyurl
+uninstaller
+taskbar
+taskbars
+ikw
diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml
@@ -72,7 +72,7 @@ jobs:
     steps:
     - name: check-spelling
       id: spelling
-      uses: check-spelling/check-spelling@v0.0.25
+      uses: check-spelling/check-spelling@v0.0.26
       with:
         suppress_push_for_open_pull_request: 1
         checkout: true
@@ -128,7 +128,7 @@ jobs:
     if: (success() || failure()) && needs.spelling.outputs.followup && contains(github.event_name, 'pull_request')
     steps:
     - name: comment
-      uses: check-spelling/check-spelling@v0.0.25
+      uses: check-spelling/check-spelling@v0.0.26
       with:
         checkout: true
         spell_check_this: check-spelling/spell-check-this@main
diff --git a/Flow.Launcher.Core/ExternalPlugins/Environments/AbstractPluginEnvironment.cs b/Flow.Launcher.Core/ExternalPlugins/Environments/AbstractPluginEnvironment.cs
@@ -40,6 +40,12 @@ internal AbstractPluginEnvironment(List<PluginMetadata> pluginMetadataList, Plug
             PluginSettings = pluginSettings;
         }
 
+        /// <summary>
+        /// Resolves the configured runtime executable path to an absolute path.
+        /// Supports both absolute paths and relative paths (relative to ProgramDirectory).
+        /// </summary>
+        private string ResolvedPluginsSettingsFilePath => FilesFolders.ResolveAbsolutePath(PluginsSettingsFilePath);
+
         internal IEnumerable<PluginPair> Setup()
         {
             // If no plugin is using the language, return empty list
@@ -48,13 +54,16 @@ internal IEnumerable<PluginPair> Setup()
                 return new List<PluginPair>();
             }
 
-            if (!string.IsNullOrEmpty(PluginsSettingsFilePath) && FilesFolders.FileExists(PluginsSettingsFilePath))
+            var resolvedPath = ResolvedPluginsSettingsFilePath;
+            if (!string.IsNullOrEmpty(resolvedPath) && FilesFolders.FileExists(resolvedPath))
             {
                 // Ensure latest only if user is using Flow's environment setup.
-                if (PluginsSettingsFilePath.StartsWith(EnvPath, StringComparison.OrdinalIgnoreCase))
-                    EnsureLatestInstalled(ExecutablePath, PluginsSettingsFilePath, EnvPath);
+                if (resolvedPath.StartsWith(EnvPath, StringComparison.OrdinalIgnoreCase))
+                    EnsureLatestInstalled(ExecutablePath, resolvedPath, EnvPath);
 
-                return SetPathForPluginPairs(PluginsSettingsFilePath, Language);
+                // Ensure the path is updated in settings in case environment was updated
+                resolvedPath = ResolvedPluginsSettingsFilePath;
+                return SetPathForPluginPairs(resolvedPath, Language);
             }
 
             var noRuntimeMessage = Localize.runtimePluginInstalledChooseRuntimePrompt(Language, EnvName, Environment.NewLine);
@@ -103,9 +112,11 @@ internal IEnumerable<PluginPair> Setup()
                 InstallEnvironment();
             }
 
-            if (FilesFolders.FileExists(PluginsSettingsFilePath))
+            // Ensure the path is updated when user has chosen to install or select environment executable
+            resolvedPath = ResolvedPluginsSettingsFilePath;
+            if (FilesFolders.FileExists(resolvedPath))
             {
-                return SetPathForPluginPairs(PluginsSettingsFilePath, Language);
+                return SetPathForPluginPairs(resolvedPath, Language);
             }
             else
             {
diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs
@@ -318,6 +318,30 @@ private ResourceDictionary GetResourceDictionary(string theme)
                     => Array.ForEach(setters, p => o.Setters.Add(p)));
             }
 
+            var baseHomeIconStyle = dict["BaseHomeIconFontStyle"] as Style;
+            var itemTitleStyle = (dict["ItemTitleStyle"] ?? dict["BaseItemTitleStyle"]) as Style;
+            var homeIconFontStyle = dict["HomeIconFontStyle"] as Style;
+
+            if (homeIconFontStyle == null && itemTitleStyle != null)
+            {
+                var styleToExtend = baseHomeIconStyle ?? itemTitleStyle;
+                var dynamicHomeStyle = new Style(typeof(TextBlock), styleToExtend);
+
+                var foregroundSetter = itemTitleStyle.Setters
+                    .OfType<Setter>()
+                    .FirstOrDefault(s => s.Property == TextBlock.ForegroundProperty);
+
+                if (foregroundSetter != null)
+                {
+                    dynamicHomeStyle.Setters.Add(new Setter(TextBlock.ForegroundProperty, foregroundSetter.Value));
+                }
+                else if (baseHomeIconStyle != null)
+                {
+                    dynamicHomeStyle.Setters.Add(new Setter(TextBlock.ForegroundProperty, new DynamicResourceExtension("ItemTitleStyle")));
+                }
+                dict["HomeIconFontStyle"] = dynamicHomeStyle;
+            }
+
             /* Ignore Theme Window Width and use setting */
             var windowStyle = dict["WindowStyle"] as Style;
             var width = _settings.WindowSize;
diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -126,6 +126,7 @@ public string Theme
         public double QueryBoxFontSize { get; set; } = 16;
         public double ResultItemFontSize { get; set; } = 16;
         public double ResultSubItemFontSize { get; set; } = 13;
+        public double HomeScreenFontSize { get; set; } = 12;
         public string QueryBoxFont { get; set; } = Win32Helper.GetSystemDefaultFont();
         public string QueryBoxFontStyle { get; set; }
         public string QueryBoxFontWeight { get; set; }
diff --git a/Flow.Launcher.Plugin/SharedCommands/FilesFolders.cs b/Flow.Launcher.Plugin/SharedCommands/FilesFolders.cs
@@ -2,6 +2,8 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Reflection;
+
 #pragma warning disable IDE0005
 using System.Windows;
 #pragma warning restore IDE0005
@@ -487,5 +489,34 @@ public static void ValidateDataDirectory(string bundledDataDirectory, string dat
                 }
             }
         }
+
+        /// <summary>
+        /// Resolves a path that may be relative to an absolute path.
+        /// If the path is already absolute, returns it as-is.
+        /// If the path is not rooted (as determined by <see cref="Path.IsPathRooted(string)"/>), resolves it relative to ProgramDirectory.
+        /// </summary>
+        /// <param name="path">The path to resolve</param>
+        /// <returns>An absolute path</returns>
+        public static string ResolveAbsolutePath(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+                return path;
+
+            // If already absolute, return as-is
+            if (Path.IsPathFullyQualified(path))
+                return path;
+
+            // Resolve relative to ProgramDirectory, handling invalid path formats gracefully
+            try
+            {
+                return Path.GetFullPath(Path.Combine(Directory.GetParent(Assembly.GetExecutingAssembly().Location).ToString(), path));
+            }
+            catch (Exception)
+            {
+                // If the path cannot be resolved (invalid characters, format, or too long),
+                // return the original path to avoid crashing the application.
+                return path;
+            }
+        }
     }
 }
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
@@ -253,6 +253,11 @@
     <system:String x:Key="pluginStore_RecentlyUpdated">Recently Updated</system:String>
     <system:String x:Key="pluginStore_None">Plugins</system:String>
     <system:String x:Key="pluginStore_Installed">Installed</system:String>
+    <system:String x:Key="PluginStoreSortModeDefault">Default</system:String>
+    <system:String x:Key="PluginStoreSortModeName">Name</system:String>
+    <system:String x:Key="PluginStoreSortModeReleaseDate">Release Date</system:String>
+    <system:String x:Key="PluginStoreSortModeUpdatedDate">Updated Date</system:String>
+    <system:String x:Key="PluginStoreSortingModeComboboxLabel">Sorting Mode:</system:String>
     <system:String x:Key="refresh">Refresh</system:String>
     <system:String x:Key="installbtn">Install</system:String>
     <system:String x:Key="uninstallbtn">Uninstall</system:String>
@@ -309,6 +314,7 @@
     <system:String x:Key="queryBoxFont">Query Box Font</system:String>
     <system:String x:Key="resultItemFont">Result Title Font</system:String>
     <system:String x:Key="resultSubItemFont">Result Subtitle Font</system:String>
+    <system:String x:Key="homeScreenFontSize">Home Font Size</system:String>
     <system:String x:Key="resetCustomize">Reset</system:String>
     <system:String x:Key="resetCustomizeToolTip">Reset to the recommended font and size settings.</system:String>
     <system:String x:Key="ImportThemeSize">Import Theme Size</system:String>
diff --git a/Flow.Launcher/PinnedResultGrid.xaml b/Flow.Launcher/PinnedResultGrid.xaml
@@ -9,8 +9,8 @@
     d:DataContext="{d:DesignInstance Type=vm:MainViewModel}"
     mc:Ignorable="d">
     <Border
-        Margin="8 10 8 10"
-        Padding="8 8"
+        Margin="8 8 8 8"
+        Padding="0"
         CornerRadius="8">
         <Border.Style>
             <Style TargetType="Border">
diff --git a/Flow.Launcher/ResultGrid.xaml b/Flow.Launcher/ResultGrid.xaml
@@ -34,11 +34,11 @@
                 <EventSetter Event="MouseEnter" Handler="OnMouseEnter" />
                 <EventSetter Event="MouseMove" Handler="OnMouseMove" />
                 <Setter Property="Background" Value="Transparent" />
-                <Setter Property="Width" Value="64" />
-                <Setter Property="Height" Value="64" />
-                <Setter Property="Margin" Value="5" />
+                <Setter Property="Width" Value="84" />
+                <Setter Property="Height" Value="84" />
+                <Setter Property="Margin" Value="2" />
                 <Setter Property="BorderThickness" Value="0" />
-                <Setter Property="Padding" Value="0" />
+                <Setter Property="Padding" Value="10" />
                 <Setter Property="HorizontalContentAlignment" Value="Stretch" />
                 <Setter Property="Template">
                     <Setter.Value>
@@ -98,11 +98,9 @@
                         </Grid>
                     </Border>
                     <TextBlock
-                        Margin="2 0 2 1"
                         HorizontalAlignment="Center"
-                        FontSize="9"
-                        Foreground="White"
-                        Opacity="0.9"
+                        FontSize="{Binding Settings.HomeScreenFontSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        Style="{DynamicResource HomeIconFontStyle}"
                         Text="{Binding Result.Title}"
                         TextTrimming="CharacterEllipsis"
                         ToolTip="{Binding ShowTitleToolTip}" />
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginStoreViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginStoreViewModel.cs
@@ -12,6 +12,31 @@ namespace Flow.Launcher.SettingPages.ViewModels;
 
 public partial class SettingsPanePluginStoreViewModel : BaseModel
 {
+    public class SortModeData : DropdownDataGeneric<PluginStoreSortMode> { }
+
+    public List<SortModeData> SortModes { get; } =
+        DropdownDataGeneric<PluginStoreSortMode>.GetValues<SortModeData>("PluginStoreSortMode");
+
+    public SettingsPanePluginStoreViewModel()
+    {
+        UpdateEnumDropdownLocalizations();
+    }
+
+    private PluginStoreSortMode _selectedSortMode = PluginStoreSortMode.Default;
+    public PluginStoreSortMode SelectedSortMode
+    {
+        get => _selectedSortMode;
+        set
+        {
+            if (_selectedSortMode != value)
+            {
+                _selectedSortMode = value;
+                OnPropertyChanged();
+                OnPropertyChanged(nameof(ExternalPlugins));
+            }
+        }
+    }
+
     private string filterText = string.Empty;
     public string FilterText
     {
@@ -82,13 +107,8 @@ public bool ShowExecutable
         }
     }
 
-    public IList<PluginStoreItemViewModel> ExternalPlugins => App.API.GetPluginManifest()
-        .Select(p => new PluginStoreItemViewModel(p))
-        .OrderByDescending(p => p.Category == PluginStoreItemViewModel.NewRelease)
-        .ThenByDescending(p => p.Category == PluginStoreItemViewModel.RecentlyUpdated)
-        .ThenByDescending(p => p.Category == PluginStoreItemViewModel.None)
-        .ThenByDescending(p => p.Category == PluginStoreItemViewModel.Installed)
-        .ToList();
+    public IList<PluginStoreItemViewModel> ExternalPlugins => GetSortedPlugins(
+        App.API.GetPluginManifest().Select(p => new PluginStoreItemViewModel(p)));
 
     [RelayCommand]
     private async Task RefreshExternalPluginsAsync()
@@ -168,4 +188,48 @@ public bool SatisfiesFilter(PluginStoreItemViewModel plugin)
             App.API.FuzzySearch(FilterText, plugin.Name).IsSearchPrecisionScoreMet() ||
             App.API.FuzzySearch(FilterText, plugin.Description).IsSearchPrecisionScoreMet();
     }
+
+    private void UpdateEnumDropdownLocalizations()
+    {
+        DropdownDataGeneric<PluginStoreSortMode>.UpdateLabels(SortModes);
+    }
+
+    private IList<PluginStoreItemViewModel> GetSortedPlugins(IEnumerable<PluginStoreItemViewModel> plugins)
+    {
+        return SelectedSortMode switch
+        {
+            PluginStoreSortMode.Name => plugins
+                .OrderBy(p => p.LabelInstalled)
+                .ThenBy(p => p.Name)
+                .ToList(),
+
+            PluginStoreSortMode.ReleaseDate => plugins
+                .OrderBy(p => p.LabelInstalled)
+                .ThenByDescending(p => p.DateAdded.HasValue)
+                .ThenByDescending(p => p.DateAdded)
+                .ToList(),
+
+            PluginStoreSortMode.UpdatedDate => plugins
+                .OrderBy(p => p.LabelInstalled)
+                .ThenByDescending(p => p.UpdatedDate.HasValue)
+                .ThenByDescending(p => p.UpdatedDate)
+                .ToList(),
+
+            _ => plugins
+                .OrderByDescending(p => p.DefaultCategory == PluginStoreItemViewModel.NewRelease)
+                .ThenByDescending(p => p.DefaultCategory == PluginStoreItemViewModel.RecentlyUpdated)
+                .ThenByDescending(p => p.DefaultCategory == PluginStoreItemViewModel.None)
+                .ThenByDescending(p => p.DefaultCategory == PluginStoreItemViewModel.Installed)
+                .ToList(),
+        };
+    }
+
+}
+
+public enum PluginStoreSortMode
+{
+    Default,
+    Name,
+    ReleaseDate,
+    UpdatedDate
 }
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
@@ -122,6 +122,12 @@ public double ResultSubItemFontSize
         set => Settings.ResultSubItemFontSize = value;
     }
 
+    public double HomeScreenFontSize
+    {
+        get => Settings.HomeScreenFontSize;
+        set => Settings.HomeScreenFontSize = value;
+    }
+
     public class ColorSchemeData : DropdownDataGeneric<ColorSchemes> { }
 
     public List<ColorSchemeData> ColorSchemes { get; } = DropdownDataGeneric<ColorSchemes>.GetValues<ColorSchemeData>("ColorScheme");
@@ -508,6 +514,7 @@ public void Reset()
 
         WindowHeightSize = 42;
         ItemHeightSize = 58;
+        HomeScreenFontSize = 12;
     }
     
     [RelayCommand]
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml b/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
diff --git a/Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs b/Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,12 @@ internal AbstractPluginEnvironment(List<PluginMetadata> pluginMetadataList, Plug`
`40`	`40`	`PluginSettings = pluginSettings;`
`41`	`41`	`}`
`42`	`42`
	`43`	`+ /// <summary>`
	`44`	`+ /// Resolves the configured runtime executable path to an absolute path.`
	`45`	`+ /// Supports both absolute paths and relative paths (relative to ProgramDirectory).`
	`46`	`+ /// </summary>`
	`47`	`+ private string ResolvedPluginsSettingsFilePath => FilesFolders.ResolveAbsolutePath(PluginsSettingsFilePath);`
	`48`	`+`
`43`	`49`	`internal IEnumerable<PluginPair> Setup()`
`44`	`50`	`{`
`45`	`51`	`// If no plugin is using the language, return empty list`
`@@ -48,13 +54,16 @@ internal IEnumerable<PluginPair> Setup()`
`48`	`54`	`return new List<PluginPair>();`
`49`	`55`	`}`
`50`	`56`
`51`		`- if (!string.IsNullOrEmpty(PluginsSettingsFilePath) && FilesFolders.FileExists(PluginsSettingsFilePath))`
	`57`	`+ var resolvedPath = ResolvedPluginsSettingsFilePath;`
	`58`	`+ if (!string.IsNullOrEmpty(resolvedPath) && FilesFolders.FileExists(resolvedPath))`
`52`	`59`	`{`
`53`	`60`	`// Ensure latest only if user is using Flow's environment setup.`
`54`		`- if (PluginsSettingsFilePath.StartsWith(EnvPath, StringComparison.OrdinalIgnoreCase))`
`55`		`- EnsureLatestInstalled(ExecutablePath, PluginsSettingsFilePath, EnvPath);`
	`61`	`+ if (resolvedPath.StartsWith(EnvPath, StringComparison.OrdinalIgnoreCase))`
	`62`	`+ EnsureLatestInstalled(ExecutablePath, resolvedPath, EnvPath);`
`56`	`63`
`57`		`- return SetPathForPluginPairs(PluginsSettingsFilePath, Language);`
	`64`	`+ // Ensure the path is updated in settings in case environment was updated`
	`65`	`+ resolvedPath = ResolvedPluginsSettingsFilePath;`
	`66`	`+ return SetPathForPluginPairs(resolvedPath, Language);`
`58`	`67`	`}`
`59`	`68`
`60`	`69`	`var noRuntimeMessage = Localize.runtimePluginInstalledChooseRuntimePrompt(Language, EnvName, Environment.NewLine);`
`@@ -103,9 +112,11 @@ internal IEnumerable<PluginPair> Setup()`
`103`	`112`	`InstallEnvironment();`
`104`	`113`	`}`
`105`	`114`
`106`		`- if (FilesFolders.FileExists(PluginsSettingsFilePath))`
	`115`	`+ // Ensure the path is updated when user has chosen to install or select environment executable`
	`116`	`+ resolvedPath = ResolvedPluginsSettingsFilePath;`
	`117`	`+ if (FilesFolders.FileExists(resolvedPath))`
`107`	`118`	`{`
`108`		`- return SetPathForPluginPairs(PluginsSettingsFilePath, Language);`
	`119`	`+ return SetPathForPluginPairs(resolvedPath, Language);`
`109`	`120`	`}`
`110`	`121`	`else`
`111`	`122`	`{`