From 617d2f5efb85c193cd6c1943f1b15e12614bf069 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Wed, 28 Dec 2022 21:37:53 +0800
Subject: [PATCH] Use separate variable for preview image

---
 Flow.Launcher/MainWindow.xaml              |  2 +-
 Flow.Launcher/ViewModel/ResultViewModel.cs | 28 +++++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index d6aec2a60..82f297b70 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -438,7 +438,7 @@
                                         HorizontalAlignment="Center"
                                         Source="{Binding PreviewImage}"
                                         StretchDirection="DownOnly"
-                                        Visibility="{Binding ShowIcon}">
+                                        Visibility="{Binding ShowPreviewImage, Converter={StaticResource BoolToVisibilityConverter}}">
                                         <Image.Style>
                                             <Style TargetType="{x:Type Image}">
                                                 <Setter Property="MaxWidth" Value="96" />
diff --git a/Flow.Launcher/ViewModel/ResultViewModel.cs b/Flow.Launcher/ViewModel/ResultViewModel.cs
index be5dacbfb..f23937345 100644
--- a/Flow.Launcher/ViewModel/ResultViewModel.cs
+++ b/Flow.Launcher/ViewModel/ResultViewModel.cs
@@ -90,6 +90,30 @@ namespace Flow.Launcher.ViewModel
             }
         }
 
+        public bool ShowPreviewImage
+        {
+            get
+            {
+                if (!string.IsNullOrEmpty(Result.Preview.PreviewImagePath) || Result.Preview.PreviewDelegate != null)
+                {
+                    return true;
+                }
+                else
+                {
+                    // Fall back to Icon
+                    if (!ImgIconAvailable && !GlyphAvailable)
+                        return true;
+
+                    // Although user can choose to use glyph icons, plugins may choose to supply only image icons.
+                    // In this case we ignore the setting because otherwise icons will not display as intended
+                    if (Settings.UseGlyphIcons && !GlyphAvailable && ImgIconAvailable)
+                        return true;
+
+                    return !Settings.UseGlyphIcons && ImgIconAvailable;
+                }
+            }
+        }
+
         public double IconRadius
         {
             get
@@ -120,6 +144,8 @@ namespace Flow.Launcher.ViewModel
 
         private bool ImgIconAvailable => !string.IsNullOrEmpty(Result.IcoPath) || Result.Icon is not null;
 
+        private bool PreviewImageAvailable => !string.IsNullOrEmpty(Result.Preview.PreviewImagePath) || Result.Preview.PreviewDelegate != null;
+
         public string OpenResultModifiers => Settings.OpenResultModifiers;
 
         public string ShowTitleToolTip => string.IsNullOrEmpty(Result.TitleToolTip)
@@ -218,7 +244,7 @@ namespace Flow.Launcher.ViewModel
         {
             if (ShowDefaultPreview == Visibility.Visible)
             {
-                if (!PreviewImageLoaded && ShowIcon == Visibility.Visible)
+                if (!PreviewImageLoaded && ShowPreviewImage)
                 {
                     PreviewImageLoaded = true;
                     _ = LoadPreviewImageAsync();