Skip to content

Commit d87d95e

Browse files
committed
Add plugin list last item bottom margin
2 parents 579f8c8 + 2d98dcb commit d87d95e

File tree

1 file changed

+8
-81
lines changed

1 file changed

+8
-81
lines changed

Flow.Launcher/SettingWindow.xaml

Lines changed: 8 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
<Style x:Key="PluginList" TargetType="ListBoxItem">
192192
<Setter Property="Background" Value="#ffffff" />
193193
<Setter Property="Padding" Value="0 12 0 12" />
194-
<Setter Property="Margin" Value="0 4 18 0" />
194+
<Setter Property="Margin" Value="0 0 18 4" />
195195
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
196196
<Setter Property="BorderBrush" Value="#e5e5e5" />
197197
<!--#region Template for blue highlight win10-->
@@ -537,14 +537,18 @@
537537
<Border Grid.Row="0" Background="#f3f3f3" Padding="5 18 0 0">
538538
<TextBlock Text="{DynamicResource plugin}" TextAlignment="left" FontSize="30" Margin="0 5 0 5"/>
539539
</Border>
540-
<Border Grid.Column="0" Grid.Row="1" Background="#f3f3f3">
540+
<Border Grid.Column="0" Grid.Row="1" Background="#f3f3f3" Padding="0 0 0 0">
541541
<ListBox SelectedItem="{Binding SelectedPlugin}"
542542
ItemsSource="{Binding PluginViewModels}"
543543
Margin="6, 0, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
544544
ItemContainerStyle="{StaticResource PluginList}"
545545
ScrollViewer.IsDeferredScrollingEnabled="True" ScrollViewer.CanContentScroll="False"
546-
Padding="0 0 0 18" Width="Auto" HorizontalAlignment="Stretch">
547-
546+
Padding="0 0 0 0" Width="Auto" HorizontalAlignment="Stretch">
547+
<ListBox.ItemsPanel>
548+
<ItemsPanelTemplate>
549+
<StackPanel Margin="0,0,0,18"/>
550+
</ItemsPanelTemplate>
551+
</ListBox.ItemsPanel>
548552
<ListBox.ItemTemplate>
549553
<DataTemplate>
550554
<Expander Grid.Column="4" x:Name="expanderHeader"
@@ -734,83 +738,6 @@
734738
</ListBox>
735739
</Border>
736740

737-
<!--
738-
<Border BorderThickness="1 2 0 0" BorderBrush="#f3f3f3" Grid.Column="2" Grid.RowSpan="2" Padding="12 12 12 12">
739-
<Grid Grid.Column="1" Grid.RowSpan="2">
740-
<Grid.RowDefinitions>
741-
<RowDefinition Height="Auto" />
742-
<RowDefinition Height="*" />
743-
</Grid.RowDefinitions>
744-
745-
<ContentControl DataContext="{Binding Path=SelectedPlugin}"
746-
Grid.ColumnSpan="1" Grid.Row="0" Margin="10 10 10 0">
747-
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
748-
<Grid.ColumnDefinitions>
749-
<ColumnDefinition Width="48" />
750-
<ColumnDefinition />
751-
</Grid.ColumnDefinitions>
752-
<Grid.RowDefinitions>
753-
<RowDefinition/>
754-
<RowDefinition/>
755-
<RowDefinition/>
756-
</Grid.RowDefinitions>
757-
758-
<Image Source="{Binding Image, IsAsync=True}"
759-
Width="48" Height="48"
760-
HorizontalAlignment="Left" VerticalAlignment="Top"
761-
Grid.RowSpan="2"/>
762-
<Grid Grid.Row="0" Grid.Column="1"
763-
Margin="20,0,0,0">
764-
<TextBlock Text="{Binding PluginPair.Metadata.Name}"
765-
Grid.Column="0"
766-
Cursor="Hand" MouseUp="OnPluginNameClick" FontSize="24"
767-
HorizontalAlignment="Left">
768-
<ToolTipService.ToolTip>
769-
<TextBlock>
770-
<Run Text="{DynamicResource author}" />
771-
<Run Text=": " />
772-
<Run Text="{Binding PluginPair.Metadata.Author}" />
773-
</TextBlock>
774-
</ToolTipService.ToolTip>
775-
</TextBlock>
776-
<ui:ToggleSwitch Grid.Column="1" OffContent="{DynamicResource disable}" OnContent="{DynamicResource enable}"
777-
MaxWidth="110" HorizontalAlignment="Right"
778-
IsOn="{Binding PluginState}"/>
779-
</Grid>
780-
<TextBlock Margin="20,0,0,0"
781-
Text="{Binding PluginPair.Metadata.Description}"
782-
Grid.Row="1" Opacity="0.5" Grid.Column="2" />
783-
<DockPanel Grid.ColumnSpan="2" Grid.Row="2" Margin="0 10 0 8" HorizontalAlignment="Right">
784-
<TextBlock Text="{DynamicResource priority}" Margin="15,0,0,0" MaxWidth="100"/>
785-
<TextBlock Text="{Binding Priority}"
786-
ToolTip="Change Plugin Results Priority"
787-
Margin="5 0 0 0" Cursor="Hand" Foreground="Blue"
788-
MouseUp="OnPluginPriorityClick"/>
789-
<TextBlock Text="{DynamicResource actionKeywords}"
790-
Visibility="{Binding ActionKeywordsVisibility}"
791-
Margin="5 0 0 0"/>
792-
<TextBlock Text="{Binding ActionKeywordsText}"
793-
Visibility="{Binding ActionKeywordsVisibility}"
794-
ToolTip="Change Action Keywords"
795-
Margin="5 0 0 0" Cursor="Hand" Foreground="Blue"
796-
MouseUp="OnPluginActionKeywordsClick" MaxWidth="100" />
797-
<TextBlock Text="{DynamicResource plugin_init_time}" Margin="10 0 0 0" MaxWidth="100"/>
798-
<TextBlock Text="{Binding InitilizaTime}" Margin="5 0 0 0" MaxWidth="100"/>
799-
<TextBlock Text="{DynamicResource plugin_query_time}" Margin="10 0 0 0" MaxWidth="100"/>
800-
<TextBlock Text="{Binding QueryTime}" Margin="5 0 0 0" MaxWidth="100"/>
801-
<TextBlock Text="{DynamicResource pluginDirectory}"
802-
MaxWidth="120" Cursor="Hand" Margin="10,0,0,0"
803-
MouseUp="OnPluginDirecotyClick" Foreground="Blue" />
804-
</DockPanel>
805-
</Grid>
806-
</ContentControl>
807-
808-
<ContentControl Content="{Binding SettingProvider}"
809-
Grid.ColumnSpan="1" Grid.Row="1"
810-
HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
811-
</Grid>
812-
</Border>
813-
-->
814741
</Grid>
815742
</TabItem>
816743

0 commit comments

Comments
 (0)