Skip to content

Commit e6c4ca1

Browse files
committed
- Adjust Content Control Margin
- Adjust Calc/webseearch plugin setting Margin
2 parents 234816d + 2dc8bb3 commit e6c4ca1

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

Flow.Launcher/SettingWindow.xaml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@
538538
<TextBlock Text="{DynamicResource plugin}" TextAlignment="left" FontSize="30" Margin="0 5 0 5"/>
539539
</Border>
540540
<Border Grid.Column="0" Grid.Row="1" Background="#f3f3f3">
541-
<ListBox SelectedIndex="0" SelectedItem="{Binding SelectedPlugin}"
541+
<ListBox SelectedItem="{Binding SelectedPlugin}"
542542
ItemsSource="{Binding PluginViewModels}"
543543
Margin="6, 0, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
544544
ItemContainerStyle="{StaticResource PluginList}"
@@ -656,18 +656,19 @@
656656

657657
<StackPanel>
658658

659-
<!--#region SubInfo Styling -->
660-
<Border Background="White" Padding="14 0 14 0"
659+
660+
<Border Background="White" Padding="0"
661661
BorderThickness="0 1 0 0" BorderBrush="#e6e6e6"
662-
VerticalAlignment="Center" HorizontalAlignment="Stretch"
663-
MaxHeight="480">
662+
VerticalAlignment="Center" HorizontalAlignment="Stretch">
663+
<!--#region SubInfo Styling -->
664664
<Border.Style>
665665
<Style TargetType="{x:Type Border}">
666666
<Setter Property="Visibility" Value="Visible" />
667667
<Style.Triggers>
668668
<DataTrigger Binding="{Binding ElementName=SettingControl, Path=ActualHeight}" Value="0">
669669
<Setter Property="Visibility" Value="Collapsed" />
670670
<Setter Property="BorderThickness" Value="0" />
671+
<Setter Property="Padding" Value="0" />
671672
</DataTrigger>
672673
</Style.Triggers>
673674
</Style>
@@ -676,8 +677,8 @@
676677
<!--#endregion-->
677678
<ContentControl x:Name="SettingControl"
678679
Content="{Binding SettingControl}"
679-
Padding="0 12 0 12" Margin="0 0 0 0" VerticalAlignment="Stretch"
680-
MaxWidth="750" >
680+
Padding="1" Margin="0" VerticalAlignment="Stretch"
681+
MaxWidth="750" MaxHeight="550">
681682
</ContentControl>
682683

683684
</StackPanel>

Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<core:LocalizationConverter x:Key="LocalizationConverter"/>
1616
</UserControl.Resources>
1717

18-
<Grid Margin="20 0 0 0">
18+
<Grid Margin="20 14 0 14">
1919
<Grid.RowDefinitions>
2020
<RowDefinition Height="auto"/>
2121
<RowDefinition Height="auto"/>

Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</DockPanel>
3333
</DataTemplate>
3434
</UserControl.Resources>
35-
<Grid Margin="10 10 0 0">
35+
<Grid Margin="14">
3636
<Grid.RowDefinitions>
3737
<RowDefinition Height="30" />
3838
<RowDefinition Height="48" />

0 commit comments

Comments
 (0)