From 239c9d7a93b08c5a575d9dd1837d2973b15f0086 Mon Sep 17 00:00:00 2001
From: Garulf <535299+Garulf@users.noreply.github.com>
Date: Tue, 30 Aug 2022 04:26:22 -0400
Subject: [PATCH 1/3] Add field to control if Icon uses rounded mask

---
 Flow.Launcher.Plugin/Result.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Flow.Launcher.Plugin/Result.cs b/Flow.Launcher.Plugin/Result.cs
index 35c491d35f8..a9dda4ff481 100644
--- a/Flow.Launcher.Plugin/Result.cs
+++ b/Flow.Launcher.Plugin/Result.cs
@@ -66,6 +66,10 @@ public string IcoPath
                 }
             }
         }
+        /// <summary>
+        /// Determines if Icon has a border radius
+        /// </summary>
+        public bool RoundedIcon { get; set; } = false;
 
         /// <summary>
         /// Delegate function, see <see cref="Icon"/>

From 70ea6a89e3b8bff59a0b1c122102d54c322df3f6 Mon Sep 17 00:00:00 2001
From: Garulf <535299+Garulf@users.noreply.github.com>
Date: Tue, 30 Aug 2022 04:27:17 -0400
Subject: [PATCH 2/3] Remove Icon X & Y hard coded dependency

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

diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
index 2a7f9c49440..3728b868d9b 100644
--- a/Flow.Launcher/ResultListBox.xaml
+++ b/Flow.Launcher/ResultListBox.xaml
@@ -82,8 +82,8 @@
                             BorderThickness="0">
                             <Image
                                 x:Name="ImageIcon"
-                                Width="32"
-                                Height="32"
+                                Width="{Binding IconXY}"
+                                Height="{Binding IconXY}"
                                 Margin="0,0,0,0"
                                 HorizontalAlignment="Center"
                                 Source="{Binding Image, TargetNullValue={x:Null}}"
diff --git a/Flow.Launcher/ViewModel/ResultViewModel.cs b/Flow.Launcher/ViewModel/ResultViewModel.cs
index 4d32d792dd0..279aca27bc2 100644
--- a/Flow.Launcher/ViewModel/ResultViewModel.cs
+++ b/Flow.Launcher/ViewModel/ResultViewModel.cs
@@ -165,6 +165,8 @@ private async ValueTask LoadImageAsync()
 
         public string QuerySuggestionText { get; set; }
 
+        public double IconXY { get; set; } = 32;
+
         public override bool Equals(object obj)
         {
             return obj is ResultViewModel r && Result.Equals(r.Result);

From bd1499b2d3e8e36f27903c4572d681abe5fe064b Mon Sep 17 00:00:00 2001
From: Garulf <535299+Garulf@users.noreply.github.com>
Date: Tue, 30 Aug 2022 04:27:37 -0400
Subject: [PATCH 3/3] Add clip mask

---
 Flow.Launcher/ResultListBox.xaml           |  6 +++++-
 Flow.Launcher/ViewModel/ResultViewModel.cs | 13 +++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
index 3728b868d9b..e4051c5362d 100644
--- a/Flow.Launcher/ResultListBox.xaml
+++ b/Flow.Launcher/ResultListBox.xaml
@@ -88,7 +88,11 @@
                                 HorizontalAlignment="Center"
                                 Source="{Binding Image, TargetNullValue={x:Null}}"
                                 Stretch="Uniform"
-                                Visibility="{Binding ShowIcon}" />
+                                Visibility="{Binding ShowIcon}">
+                                <Image.Clip>
+                                    <EllipseGeometry RadiusX="{Binding IconRadius}" RadiusY="{Binding IconRadius}" Center="16 16"/>
+                                </Image.Clip>
+                            </Image>
                         </Border>
                         <Border
                             Margin="9,0,0,0"
diff --git a/Flow.Launcher/ViewModel/ResultViewModel.cs b/Flow.Launcher/ViewModel/ResultViewModel.cs
index 279aca27bc2..079ea062134 100644
--- a/Flow.Launcher/ViewModel/ResultViewModel.cs
+++ b/Flow.Launcher/ViewModel/ResultViewModel.cs
@@ -84,6 +84,19 @@ public Visibility ShowIcon
             }
         }
 
+        public double IconRadius
+        {
+            get
+            {
+                if (Result.RoundedIcon)
+                {
+                    return IconXY / 2;
+                }
+                return IconXY;
+            }
+
+        }
+
         public Visibility ShowGlyph
         {
             get