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/4] 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 35c491d35..a9dda4ff4 100644
--- a/Flow.Launcher.Plugin/Result.cs
+++ b/Flow.Launcher.Plugin/Result.cs
@@ -66,6 +66,10 @@ namespace Flow.Launcher.Plugin
                 }
             }
         }
+        /// <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/4] 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 2a7f9c494..3728b868d 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 4d32d792d..279aca27b 100644
--- a/Flow.Launcher/ViewModel/ResultViewModel.cs
+++ b/Flow.Launcher/ViewModel/ResultViewModel.cs
@@ -165,6 +165,8 @@ namespace Flow.Launcher.ViewModel
 
         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/4] 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 3728b868d..e4051c536 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 279aca27b..079ea0621 100644
--- a/Flow.Launcher/ViewModel/ResultViewModel.cs
+++ b/Flow.Launcher/ViewModel/ResultViewModel.cs
@@ -84,6 +84,19 @@ namespace Flow.Launcher.ViewModel
             }
         }
 
+        public double IconRadius
+        {
+            get
+            {
+                if (Result.RoundedIcon)
+                {
+                    return IconXY / 2;
+                }
+                return IconXY;
+            }
+
+        }
+
         public Visibility ShowGlyph
         {
             get

From 3facf3f5ad573bd729fc5b77a9a90d8603aa3549 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Tue, 27 Sep 2022 11:16:19 +0900
Subject: [PATCH 4/4] Add Uninstall Button

---
 Flow.Launcher/Languages/en.xaml     |  1 +
 Flow.Launcher/SettingWindow.xaml    | 11 +++++++++++
 Flow.Launcher/SettingWindow.xaml.cs | 15 ++++++++++++++-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index bdf745052..f6e7ace62 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -77,6 +77,7 @@
     <system:String x:Key="plugin_query_time">Query time:</system:String>
     <system:String x:Key="plugin_query_version">| Version</system:String>
     <system:String x:Key="plugin_query_web">Website</system:String>
+    <system:String x:Key="plugin_uninstall">Uninstall</system:String>
 
 
     <!--  Setting Plugin Store  -->
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index ba6569771..49488de15 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1203,6 +1203,17 @@
                                                                         </Hyperlink>
                                                                     </TextBlock>
 
+                                                                    <TextBlock
+                                                                        Margin="10,0,0,0"
+                                                                        HorizontalAlignment="Right"
+                                                                        VerticalAlignment="Center"
+                                                                        Cursor="Hand"
+                                                                        FontSize="11"
+                                                                        Foreground="{DynamicResource PluginInfoColor}"
+                                                                        MouseUp="OnExternalPluginUninstallClick"
+                                                                        Text="{DynamicResource plugin_uninstall}"
+                                                                        TextDecorations="Underline" />
+
                                                                     <TextBlock
                                                                         Margin="10,0,0,0"
                                                                         HorizontalAlignment="Right"
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 10c9aeffe..069457d01 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -1,4 +1,5 @@
-using Flow.Launcher.Core.ExternalPlugins;
+using Droplex;
+using Flow.Launcher.Core.ExternalPlugins;
 using Flow.Launcher.Core.Plugin;
 using Flow.Launcher.Core.Resource;
 using Flow.Launcher.Helper;
@@ -348,5 +349,17 @@ namespace Flow.Launcher
         {
             Plugins.ScrollIntoView(Plugins.SelectedItem);
         }
+
+        private void OnExternalPluginUninstallClick(object sender, MouseButtonEventArgs e)
+        {
+            if (e.ChangedButton == MouseButton.Left)
+            {
+                var id = viewModel.SelectedPlugin.PluginPair.Metadata.Name;
+                var pluginsManagerPlugin = PluginManager.GetPluginForId("9f8f9b14-2518-4907-b211-35ab6290dee7");
+                var actionKeyword = pluginsManagerPlugin.Metadata.ActionKeywords.Count == 0 ? "" : pluginsManagerPlugin.Metadata.ActionKeywords[0];
+                API.ChangeQuery($"{actionKeyword} uninstall {id}");
+                API.ShowMainWindow();
+            }
+        }
     }
 }