mirror of
https://github.com/Flow-Launcher/Flow.Launcher.git
synced 2026-03-11 08:54:32 +00:00
Adjust the alignment of the right margin of the entire page.
This commit is contained in:
Dobin Park
parent
0fc1d159b2
commit
dc6babed4d
1 changed files with 19 additions and 20 deletions
|
|
@ -62,6 +62,8 @@
|
|||
<Setter Property="CornerRadius" Value="5" />
|
||||
<Setter Property="Margin" Value="0 5 0 0" />
|
||||
<Setter Property="Padding" Value="0 15 0 15" />
|
||||
<Setter Property="SnapsToDevicePixels" Value="True" />
|
||||
|
||||
</Style>
|
||||
<Style x:Key="SettingTitleLabel" TargetType="{x:Type TextBlock}">
|
||||
<Setter Property="Margin" Value="0 0 0 0" />
|
||||
|
|
@ -190,7 +192,7 @@
|
|||
<Style x:Key="PluginList" TargetType="ListBoxItem">
|
||||
<Setter Property="Background" Value="#ffffff" />
|
||||
<Setter Property="Padding" Value="0 12 0 12" />
|
||||
<Setter Property="Margin" Value="0 0 18 4" />
|
||||
<Setter Property="Margin" Value="0 0 18 5" />
|
||||
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
|
||||
<Setter Property="BorderBrush" Value="#e5e5e5" />
|
||||
<!--#region Template for blue highlight win10-->
|
||||
|
|
@ -260,7 +262,7 @@
|
|||
<Style x:Key="StoreList" TargetType="ListBoxItem">
|
||||
<Setter Property="Background" Value="#ffffff" />
|
||||
<Setter Property="Padding" Value="0 0 0 0" />
|
||||
<Setter Property="Margin" Value="0 0 8 4" />
|
||||
<Setter Property="Margin" Value="0 0 8 5" />
|
||||
<Setter Property="BorderBrush" Value="#e5e5e5" />
|
||||
<Setter Property="MinWidth" Value="330"/>
|
||||
<Setter Property="Height" Value="98"/>
|
||||
|
|
@ -631,19 +633,19 @@
|
|||
<ColumnDefinition></ColumnDefinition>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="74"></RowDefinition>
|
||||
<RowDefinition Height="73"></RowDefinition>
|
||||
<RowDefinition Height="*"></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
<Border Grid.Row="0" Background="#f3f3f3" Padding="5 18 0 0">
|
||||
<TextBlock Text="{DynamicResource plugin}" TextAlignment="left" FontSize="30" Margin="0 5 0 5"/>
|
||||
<TextBlock Text="{DynamicResource plugin}" TextAlignment="left" FontSize="30" Margin="0 5 0 0"/>
|
||||
</Border>
|
||||
<Border Grid.Column="0" Grid.Row="1" Background="#f3f3f3" Padding="0 0 0 0">
|
||||
<ListBox SelectedItem="{Binding SelectedPlugin}"
|
||||
ItemsSource="{Binding PluginViewModels}"
|
||||
Margin="6, 0, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
|
||||
Margin="5, 0, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
|
||||
ItemContainerStyle="{StaticResource PluginList}"
|
||||
ScrollViewer.IsDeferredScrollingEnabled="True" ScrollViewer.CanContentScroll="False"
|
||||
Padding="0 0 0 0" Width="Auto" HorizontalAlignment="Stretch">
|
||||
Padding="0 0 7 0" Width="Auto" HorizontalAlignment="Stretch" SnapsToDevicePixels="True">
|
||||
<ListBox.ItemsPanel>
|
||||
<ItemsPanelTemplate>
|
||||
<StackPanel Margin="0,0,0,18"/>
|
||||
|
|
@ -862,7 +864,7 @@
|
|||
<ColumnDefinition></ColumnDefinition>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="74"></RowDefinition>
|
||||
<RowDefinition Height="72"></RowDefinition>
|
||||
<RowDefinition Height="*"></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
<Border Grid.Row="0" Background="#f3f3f3" Padding="5 18 0 0">
|
||||
|
|
@ -871,17 +873,14 @@
|
|||
<Border Grid.Column="0" Grid.Row="1" Background="#f3f3f3" Padding="0 0 0 0">
|
||||
<ListBox x:Name="StoreListBox"
|
||||
ItemsSource="{Binding PluginViewModels}"
|
||||
Margin="6, 0, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
|
||||
Margin="5, 1, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
|
||||
ItemContainerStyle="{StaticResource StoreList}"
|
||||
ScrollViewer.IsDeferredScrollingEnabled="True" ScrollViewer.CanContentScroll="False"
|
||||
Padding="0 0 0 0" Width="Auto" VerticalContentAlignment="Center" HorizontalAlignment="Stretch">
|
||||
<ListBox.ItemsPanel>
|
||||
<ItemsPanelTemplate>
|
||||
<UniformGrid IsItemsHost="True" HorizontalAlignment="Left" Columns="2" Margin="0 0 12 18" VerticalAlignment="Top" />
|
||||
<UniformGrid IsItemsHost="True" HorizontalAlignment="Left" Columns="2" Margin="0 0 6 18" VerticalAlignment="Top" SnapsToDevicePixels="True"/>
|
||||
</ItemsPanelTemplate>
|
||||
|
||||
|
||||
|
||||
</ListBox.ItemsPanel>
|
||||
<ListBox.ItemTemplate>
|
||||
<DataTemplate>
|
||||
|
|
@ -998,7 +997,7 @@
|
|||
<Border Padding=" 0 0 0 0 ">
|
||||
<ScrollViewer ScrollViewer.CanContentScroll="False"
|
||||
ui:ScrollViewerHelper.AutoHideScrollBars="{Binding AutoHideScrollBar, Mode=OneWay}"
|
||||
Margin="0,0,0,0" Background="#f3f3f3" Padding="0 0 18 0">
|
||||
Margin="0,0,0,0" Background="#f3f3f3" Padding="6 0 24 0">
|
||||
<Grid Margin="0 0 0 0" Background="#f3f3f3">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="0" />
|
||||
|
|
@ -1275,11 +1274,11 @@
|
|||
</TabItem.Header>
|
||||
<ScrollViewer ScrollViewer.CanContentScroll="False"
|
||||
ui:ScrollViewerHelper.AutoHideScrollBars="{Binding AutoHideScrollBar, Mode=OneWay}"
|
||||
Margin="0,0,0,0" Background="#f3f3f3">
|
||||
Margin="0,0,0,0" Background="#f3f3f3" Padding="0 0 6 0">
|
||||
<Border Background="#f3f3f3">
|
||||
<Grid Margin="5 18 18 10">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="50" />
|
||||
<RowDefinition Height="43" />
|
||||
<RowDefinition Height="80" />
|
||||
<RowDefinition Height="150" />
|
||||
<RowDefinition Height="50" />
|
||||
|
|
@ -1287,7 +1286,7 @@
|
|||
<RowDefinition Height="70" />
|
||||
</Grid.RowDefinitions>
|
||||
<TextBlock Text="{DynamicResource hotkey}" Grid.Row="0" TextAlignment="left" FontSize="30"
|
||||
Margin="0 5 0 5" />
|
||||
Margin="0 5 0 2" />
|
||||
|
||||
<StackPanel Grid.Row="1">
|
||||
<Border Style="{DynamicResource SettingGroupBox}" Margin="0 12 0 0">
|
||||
|
|
@ -1358,7 +1357,7 @@
|
|||
</DataTemplate>
|
||||
</GridViewColumn.CellTemplate>
|
||||
</GridViewColumn>
|
||||
<GridViewColumn Header="{DynamicResource customQuery}" Width="546">
|
||||
<GridViewColumn Header="{DynamicResource customQuery}" Width="540">
|
||||
<GridViewColumn.CellTemplate>
|
||||
<DataTemplate DataType="userSettings:CustomPluginHotkey">
|
||||
<TextBlock Text="{Binding ActionKeyword}" />
|
||||
|
|
@ -1399,18 +1398,18 @@
|
|||
</TabItem.Header>
|
||||
<ScrollViewer ScrollViewer.CanContentScroll="False"
|
||||
ui:ScrollViewerHelper.AutoHideScrollBars="{Binding AutoHideScrollBar, Mode=OneWay}"
|
||||
Margin="0,0,0,0" Background="#f3f3f3" Padding="5 0 18 0">
|
||||
Margin="0,0,0,0" Background="#f3f3f3" Padding="5 0 24 0">
|
||||
<Border Background="#f3f3f3">
|
||||
|
||||
<StackPanel>
|
||||
<Border Margin="0 18 0 0">
|
||||
<TextBlock Text="{DynamicResource proxy}" Grid.Row="0" TextAlignment="left" FontSize="30"
|
||||
Margin="0 5 0 5" />
|
||||
Margin="0 5 0 0" />
|
||||
</Border>
|
||||
|
||||
|
||||
<Border Style="{DynamicResource SettingGroupBox}" Padding="0" CornerRadius="5"
|
||||
Margin="0 12 0 0">
|
||||
Margin="0 10 0 0">
|
||||
<StackPanel Orientation="Vertical">
|
||||
<Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
|
||||
<ItemsControl Style="{StaticResource SettingGrid}">
|
||||
|
|
|
|||
Loading…
Reference in a new issue