From 0290675e1100fa2eab509cd4e2227efe68172e30 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Mon, 30 Jun 2025 12:12:47 +0800
Subject: [PATCH 1/3] Fix explorer plugin preview margin

---
 .../Views/PreviewPanel.xaml                   | 143 +++++++++---------
 1 file changed, 69 insertions(+), 74 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml
index e200a187f..284ad32ad 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml
@@ -8,10 +8,7 @@
     d:DesignHeight="300"
     d:DesignWidth="300"
     mc:Ignorable="d">
-    <Grid
-        x:Name="PreviewGrid"
-        Margin="0 0 0 0"
-        VerticalAlignment="Stretch">
+    <Grid x:Name="PreviewGrid" VerticalAlignment="Stretch">
         <Grid.RowDefinitions>
             <RowDefinition />
             <RowDefinition Height="Auto" />
@@ -90,78 +87,76 @@
                     </Style>
                 </Rectangle.Style>
             </Rectangle>
-            <StackPanel Visibility="{Binding FileInfoVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}">
-                <Grid Margin="0 10 0 10">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="100" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <TextBlock
-                        Grid.Row="0"
-                        Grid.Column="0"
-                        Margin="5 0 0 0"
-                        VerticalAlignment="Top"
-                        Style="{DynamicResource PreviewItemSubTitleStyle}"
-                        Text="{DynamicResource FileSize}"
-                        TextWrapping="Wrap"
-                        Visibility="{Binding FileSizeVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
-                    <TextBlock
-                        Grid.Row="0"
-                        Grid.Column="1"
-                        Margin="0 0 13 0"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Top"
-                        Style="{DynamicResource PreviewItemSubTitleStyle}"
-                        Text="{Binding FileSize, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}, Mode=OneWay}"
-                        TextWrapping="Wrap"
-                        Visibility="{Binding FileSizeVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
+            <Grid Margin="0 10 0 0" Visibility="{Binding FileInfoVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="100" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <TextBlock
+                    Grid.Row="0"
+                    Grid.Column="0"
+                    Margin="5 0 0 0"
+                    VerticalAlignment="Top"
+                    Style="{DynamicResource PreviewItemSubTitleStyle}"
+                    Text="{DynamicResource FileSize}"
+                    TextWrapping="Wrap"
+                    Visibility="{Binding FileSizeVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
+                <TextBlock
+                    Grid.Row="0"
+                    Grid.Column="1"
+                    Margin="0 0 13 0"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
+                    Style="{DynamicResource PreviewItemSubTitleStyle}"
+                    Text="{Binding FileSize, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}, Mode=OneWay}"
+                    TextWrapping="Wrap"
+                    Visibility="{Binding FileSizeVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
 
-                    <TextBlock
-                        Grid.Row="1"
-                        Grid.Column="0"
-                        Margin="5 0 8 0"
-                        VerticalAlignment="Top"
-                        Style="{DynamicResource PreviewItemSubTitleStyle}"
-                        Text="{DynamicResource Created}"
-                        TextWrapping="Wrap"
-                        Visibility="{Binding CreatedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
-                    <TextBlock
-                        Grid.Row="1"
-                        Grid.Column="1"
-                        Margin="0 0 13 0"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Top"
-                        Style="{DynamicResource PreviewItemSubTitleStyle}"
-                        Text="{Binding CreatedAt, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
-                        TextWrapping="Wrap"
-                        Visibility="{Binding CreatedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
+                <TextBlock
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Margin="5 0 8 0"
+                    VerticalAlignment="Top"
+                    Style="{DynamicResource PreviewItemSubTitleStyle}"
+                    Text="{DynamicResource Created}"
+                    TextWrapping="Wrap"
+                    Visibility="{Binding CreatedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
+                <TextBlock
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    Margin="0 0 13 0"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
+                    Style="{DynamicResource PreviewItemSubTitleStyle}"
+                    Text="{Binding CreatedAt, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
+                    TextWrapping="Wrap"
+                    Visibility="{Binding CreatedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
 
-                    <TextBlock
-                        Grid.Row="2"
-                        Grid.Column="0"
-                        Margin="5 0 8 0"
-                        VerticalAlignment="Top"
-                        Style="{DynamicResource PreviewItemSubTitleStyle}"
-                        Text="{DynamicResource LastModified}"
-                        TextWrapping="Wrap"
-                        Visibility="{Binding LastModifiedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
-                    <TextBlock
-                        Grid.Row="2"
-                        Grid.Column="1"
-                        Margin="0 0 13 0"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Top"
-                        Style="{DynamicResource PreviewItemSubTitleStyle}"
-                        Text="{Binding LastModifiedAt, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
-                        TextWrapping="Wrap"
-                        Visibility="{Binding LastModifiedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
-                </Grid>
-            </StackPanel>
+                <TextBlock
+                    Grid.Row="2"
+                    Grid.Column="0"
+                    Margin="5 0 8 0"
+                    VerticalAlignment="Top"
+                    Style="{DynamicResource PreviewItemSubTitleStyle}"
+                    Text="{DynamicResource LastModified}"
+                    TextWrapping="Wrap"
+                    Visibility="{Binding LastModifiedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
+                <TextBlock
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    Margin="0 0 13 0"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
+                    Style="{DynamicResource PreviewItemSubTitleStyle}"
+                    Text="{Binding LastModifiedAt, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
+                    TextWrapping="Wrap"
+                    Visibility="{Binding LastModifiedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
+            </Grid>
         </StackPanel>
     </Grid>
 </UserControl>

From 0c1fcad06f8df0a654b4b476fcf9c22321db41b5 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Mon, 30 Jun 2025 14:39:29 +0800
Subject: [PATCH 2/3] Fix grid row issue

---
 Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml
index 284ad32ad..0daa36e63 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml
@@ -44,7 +44,7 @@
                     TextWrapping="Wrap" />
             </Grid>
         </Grid>
-        <StackPanel Grid.Row="2">
+        <StackPanel Grid.Row="1">
             <StackPanel.Style>
                 <Style TargetType="StackPanel">
                     <Style.Triggers>

From 3fc0abfbab875c9f6db55ab40e4d6ce82171c6d8 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Mon, 30 Jun 2025 20:26:14 +0800
Subject: [PATCH 3/3] Fix removePluginSettings parameter pass issue

---
 Flow.Launcher.Core/Plugin/PluginManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/PluginManager.cs b/Flow.Launcher.Core/Plugin/PluginManager.cs
index 9b525f331..b487b26f6 100644
--- a/Flow.Launcher.Core/Plugin/PluginManager.cs
+++ b/Flow.Launcher.Core/Plugin/PluginManager.cs
@@ -552,9 +552,9 @@ namespace Flow.Launcher.Core.Plugin
             InstallPlugin(plugin, zipFilePath, checkModified: true);
         }
 
-        public static async Task UninstallPluginAsync(PluginMetadata plugin, bool removePluginFromSettings = true, bool removePluginSettings = false)
+        public static async Task UninstallPluginAsync(PluginMetadata plugin, bool removePluginSettings = false)
         {
-            await UninstallPluginAsync(plugin, removePluginFromSettings, removePluginSettings, true);
+            await UninstallPluginAsync(plugin, removePluginFromSettings: true, removePluginSettings: removePluginSettings, checkModified: true);
         }
 
         #endregion