mirror of
https://github.com/Flow-Launcher/Flow.Launcher.git
synced 2026-03-11 08:54:32 +00:00
Merge branch 'dev' into plugin_store_item_vm_null
This commit is contained in:
commit
4e4b59ebda
2 changed files with 72 additions and 77 deletions
|
|
@ -553,9 +553,9 @@ namespace Flow.Launcher.Core.Plugin
|
||||||
InstallPlugin(plugin, zipFilePath, checkModified: true);
|
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
|
#endregion
|
||||||
|
|
|
||||||
|
|
@ -8,10 +8,7 @@
|
||||||
d:DesignHeight="300"
|
d:DesignHeight="300"
|
||||||
d:DesignWidth="300"
|
d:DesignWidth="300"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
<Grid
|
<Grid x:Name="PreviewGrid" VerticalAlignment="Stretch">
|
||||||
x:Name="PreviewGrid"
|
|
||||||
Margin="0 0 0 0"
|
|
||||||
VerticalAlignment="Stretch">
|
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition />
|
<RowDefinition />
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
|
|
@ -47,7 +44,7 @@
|
||||||
TextWrapping="Wrap" />
|
TextWrapping="Wrap" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
<StackPanel Grid.Row="2">
|
<StackPanel Grid.Row="1">
|
||||||
<StackPanel.Style>
|
<StackPanel.Style>
|
||||||
<Style TargetType="StackPanel">
|
<Style TargetType="StackPanel">
|
||||||
<Style.Triggers>
|
<Style.Triggers>
|
||||||
|
|
@ -90,8 +87,7 @@
|
||||||
</Style>
|
</Style>
|
||||||
</Rectangle.Style>
|
</Rectangle.Style>
|
||||||
</Rectangle>
|
</Rectangle>
|
||||||
<StackPanel Visibility="{Binding FileInfoVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}">
|
<Grid Margin="0 10 0 0" Visibility="{Binding FileInfoVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}">
|
||||||
<Grid Margin="0 10 0 10">
|
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="100" />
|
<ColumnDefinition Width="100" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
|
|
@ -162,6 +158,5 @@
|
||||||
Visibility="{Binding LastModifiedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
|
Visibility="{Binding LastModifiedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</StackPanel>
|
|
||||||
</Grid>
|
</Grid>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue