From ed668f371687b57c0eb7f1f38f1857447630d596 Mon Sep 17 00:00:00 2001
From: Hongtao Zhang <hongtao_zhang@outlook.com>
Date: Thu, 15 Jan 2026 23:41:11 -0800
Subject: [PATCH] Add glyph icon support for results

- Add Glyph and GlyphAvailable properties to ResultViewModel
- Set Glyph from plugin Result when creating result items
- Add resultGlyph style matching icon size (32x32)
- Update ResultListBox to show glyph or image icon based on ShowGlyph property
- ShowGlyph = true when UseGlyphIcons is enabled AND glyph is available
---
 Flow.Launcher.Avalonia/Themes/Base.axaml      | 11 ++++++++++
 .../ViewModel/MainViewModel.cs                |  6 ++++--
 .../ViewModel/ResultViewModel.cs              | 21 +++++++++++++++++++
 .../Views/ResultListBox.axaml                 | 17 ++++++++++-----
 4 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/Flow.Launcher.Avalonia/Themes/Base.axaml b/Flow.Launcher.Avalonia/Themes/Base.axaml
index 5f1845f96..c73dbd221 100644
--- a/Flow.Launcher.Avalonia/Themes/Base.axaml
+++ b/Flow.Launcher.Avalonia/Themes/Base.axaml
@@ -148,6 +148,17 @@
         <Setter Property="VerticalAlignment" Value="Center" />
     </Style>
 
+    <!-- Result Glyph -->
+    <Style Selector="TextBlock.resultGlyph">
+        <Setter Property="Width" Value="32" />
+        <Setter Property="Height" Value="32" />
+        <Setter Property="Margin" Value="12,0,0,0" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="TextAlignment" Value="Center" />
+        <Setter Property="FontSize" Value="20" />
+    </Style>
+
     <!-- Result Title -->
     <Style Selector="TextBlock.resultTitle">
         <Setter Property="Foreground" Value="#FFFFF8" />
diff --git a/Flow.Launcher.Avalonia/ViewModel/MainViewModel.cs b/Flow.Launcher.Avalonia/ViewModel/MainViewModel.cs
index 0ef2bd57f..0b35f37bf 100644
--- a/Flow.Launcher.Avalonia/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher.Avalonia/ViewModel/MainViewModel.cs
@@ -265,7 +265,8 @@ public partial class MainViewModel : ObservableObject
                         SubTitle = r.SubTitle ?? "",
                         IconPath = r.IcoPath ?? plugin.Metadata.IcoPath ?? "",
                         Score = r.Score,
-                        PluginResult = r
+                        PluginResult = r,
+                        Glyph = r.Glyph
                     });
                 }
             }
@@ -340,7 +341,8 @@ public partial class MainViewModel : ObservableObject
                 SubTitle = r.SubTitle ?? "",
                 IconPath = r.IcoPath ?? "",
                 Score = r.Score,
-                PluginResult = r
+                PluginResult = r,
+                Glyph = r.Glyph
             }).ToList();
 
             ContextMenu.ReplaceResults(contextMenuItems);
diff --git a/Flow.Launcher.Avalonia/ViewModel/ResultViewModel.cs b/Flow.Launcher.Avalonia/ViewModel/ResultViewModel.cs
index 56fa55fb4..76628091b 100644
--- a/Flow.Launcher.Avalonia/ViewModel/ResultViewModel.cs
+++ b/Flow.Launcher.Avalonia/ViewModel/ResultViewModel.cs
@@ -53,4 +53,25 @@ public partial class ResultViewModel : ObservableObject
     /// Returns a cached task to avoid re-loading on every property access.
     /// </summary>
     public Task<IImage?> Image => _imageTask ??= ImageLoader.LoadAsync(IconPath);
+
+    // Glyph support
+    private GlyphInfo? _glyph;
+
+    public GlyphInfo? Glyph
+    {
+        get => _glyph;
+        set
+        {
+            if (SetProperty(ref _glyph, value))
+            {
+                OnPropertyChanged(nameof(GlyphAvailable));
+                OnPropertyChanged(nameof(ShowGlyph));
+            }
+        }
+    }
+
+    public bool GlyphAvailable => Glyph != null;
+
+    public bool ShowGlyph => 
+        Settings?.UseGlyphIcons == true && GlyphAvailable;
 }
diff --git a/Flow.Launcher.Avalonia/Views/ResultListBox.axaml b/Flow.Launcher.Avalonia/Views/ResultListBox.axaml
index e643cec4d..3daddfd13 100644
--- a/Flow.Launcher.Avalonia/Views/ResultListBox.axaml
+++ b/Flow.Launcher.Avalonia/Views/ResultListBox.axaml
@@ -7,7 +7,7 @@
              mc:Ignorable="d" d:DesignWidth="580" d:DesignHeight="300"
              x:Class="Flow.Launcher.Avalonia.Views.ResultListBox"
              x:DataType="vm:ResultsViewModel">
-    
+     
     <ListBox Name="ResultsList"
              Classes="resultListBox"
              ItemsSource="{Binding Results}"
@@ -17,7 +17,7 @@
              SelectionMode="Single"
              ScrollViewer.HorizontalScrollBarVisibility="Disabled"
              ScrollViewer.VerticalScrollBarVisibility="Auto">
-        
+         
         <!-- Enable virtualization for better performance -->
         <ListBox.ItemsPanel>
             <ItemsPanelTemplate>
@@ -37,13 +37,20 @@
                     <!-- Icon and Text -->
                     <Grid Grid.Column="1" ColumnDefinitions="Auto,*" Margin="6,0,0,0">
                         
-                        <!-- Icon (async loaded via ^ stream operator) -->
+                        <!-- Glyph Icon (shown when UseGlyphIcons is enabled and glyph is available) -->
+                        <TextBlock Grid.Column="0"
+                                   Classes="resultGlyph"
+                                   Text="{Binding Glyph.Glyph}"
+                                   IsVisible="{Binding ShowGlyph}"
+                                   FontFamily="{Binding Glyph.FontFamily}" />
+                        
+                        <!-- Image Icon (shown when no glyph or UseGlyphIcons is disabled) -->
                         <Image Grid.Column="0"
                                Classes="resultIcon"
                                Source="{Binding Image^, FallbackValue={x:Static helper:ImageLoader.DefaultImage}}"
-                               IsVisible="{Binding ShowIcon}"
+                               IsVisible="{Binding !ShowGlyph}"
                                RenderOptions.BitmapInterpolationMode="HighQuality" />
-                        
+
                         <!-- Title and SubTitle -->
                         <Grid Grid.Column="1" 
                               RowDefinitions="Auto,Auto"