Skip to content

Commit dc6babe

Browse files
onesoundsonesounds
committed
Adjust the alignment of the right margin of the entire page.
1 parent 0fc1d15 commit dc6babe

File tree

1 file changed

+19
-20
lines changed

1 file changed

+19
-20
lines changed

‎Flow.Launcher/SettingWindow.xaml

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@
6262
<Setter Property="CornerRadius" Value="5" />
6363
<Setter Property="Margin" Value="0 5 0 0" />
6464
<Setter Property="Padding" Value="0 15 0 15" />
65+
<Setter Property="SnapsToDevicePixels" Value="True" />
66+
6567
</Style>
6668
<Style x:Key="SettingTitleLabel" TargetType="{x:Type TextBlock}">
6769
<Setter Property="Margin" Value="0 0 0 0" />
@@ -190,7 +192,7 @@
190192
<Style x:Key="PluginList" TargetType="ListBoxItem">
191193
<Setter Property="Background" Value="#ffffff" />
192194
<Setter Property="Padding" Value="0 12 0 12" />
193-
<Setter Property="Margin" Value="0 0 18 4" />
195+
<Setter Property="Margin" Value="0 0 18 5" />
194196
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
195197
<Setter Property="BorderBrush" Value="#e5e5e5" />
196198
<!--#region Template for blue highlight win10-->
@@ -260,7 +262,7 @@
260262
<Style x:Key="StoreList" TargetType="ListBoxItem">
261263
<Setter Property="Background" Value="#ffffff" />
262264
<Setter Property="Padding" Value="0 0 0 0" />
263-
<Setter Property="Margin" Value="0 0 8 4" />
265+
<Setter Property="Margin" Value="0 0 8 5" />
264266
<Setter Property="BorderBrush" Value="#e5e5e5" />
265267
<Setter Property="MinWidth" Value="330"/>
266268
<Setter Property="Height" Value="98"/>
@@ -631,19 +633,19 @@
631633
<ColumnDefinition></ColumnDefinition>
632634
</Grid.ColumnDefinitions>
633635
<Grid.RowDefinitions>
634-
<RowDefinition Height="74"></RowDefinition>
636+
<RowDefinition Height="73"></RowDefinition>
635637
<RowDefinition Height="*"></RowDefinition>
636638
</Grid.RowDefinitions>
637639
<Border Grid.Row="0" Background="#f3f3f3" Padding="5 18 0 0">
638-
<TextBlock Text="{DynamicResource plugin}" TextAlignment="left" FontSize="30" Margin="0 5 0 5"/>
640+
<TextBlock Text="{DynamicResource plugin}" TextAlignment="left" FontSize="30" Margin="0 5 0 0"/>
639641
</Border>
640642
<Border Grid.Column="0" Grid.Row="1" Background="#f3f3f3" Padding="0 0 0 0">
641643
<ListBox SelectedItem="{Binding SelectedPlugin}"
642644
ItemsSource="{Binding PluginViewModels}"
643-
Margin="6, 0, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
645+
Margin="5, 0, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
644646
ItemContainerStyle="{StaticResource PluginList}"
645647
ScrollViewer.IsDeferredScrollingEnabled="True" ScrollViewer.CanContentScroll="False"
646-
Padding="0 0 0 0" Width="Auto" HorizontalAlignment="Stretch">
648+
Padding="0 0 7 0" Width="Auto" HorizontalAlignment="Stretch" SnapsToDevicePixels="True">
647649
<ListBox.ItemsPanel>
648650
<ItemsPanelTemplate>
649651
<StackPanel Margin="0,0,0,18"/>
@@ -862,7 +864,7 @@
862864
<ColumnDefinition></ColumnDefinition>
863865
</Grid.ColumnDefinitions>
864866
<Grid.RowDefinitions>
865-
<RowDefinition Height="74"></RowDefinition>
867+
<RowDefinition Height="72"></RowDefinition>
866868
<RowDefinition Height="*"></RowDefinition>
867869
</Grid.RowDefinitions>
868870
<Border Grid.Row="0" Background="#f3f3f3" Padding="5 18 0 0">
@@ -871,17 +873,14 @@
871873
<Border Grid.Column="0" Grid.Row="1" Background="#f3f3f3" Padding="0 0 0 0">
872874
<ListBox x:Name="StoreListBox"
873875
ItemsSource="{Binding PluginViewModels}"
874-
Margin="6, 0, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
876+
Margin="5, 1, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
875877
ItemContainerStyle="{StaticResource StoreList}"
876878
ScrollViewer.IsDeferredScrollingEnabled="True" ScrollViewer.CanContentScroll="False"
877879
Padding="0 0 0 0" Width="Auto" VerticalContentAlignment="Center" HorizontalAlignment="Stretch">
878880
<ListBox.ItemsPanel>
879881
<ItemsPanelTemplate>
880-
<UniformGrid IsItemsHost="True" HorizontalAlignment="Left" Columns="2" Margin="0 0 12 18" VerticalAlignment="Top" />
882+
<UniformGrid IsItemsHost="True" HorizontalAlignment="Left" Columns="2" Margin="0 0 6 18" VerticalAlignment="Top" SnapsToDevicePixels="True"/>
881883
</ItemsPanelTemplate>
882-
883-
884-
885884
</ListBox.ItemsPanel>
886885
<ListBox.ItemTemplate>
887886
<DataTemplate>
@@ -998,7 +997,7 @@
998997
<Border Padding=" 0 0 0 0 ">
999998
<ScrollViewer ScrollViewer.CanContentScroll="False"
1000999
ui:ScrollViewerHelper.AutoHideScrollBars="{Binding AutoHideScrollBar, Mode=OneWay}"
1001-
Margin="0,0,0,0" Background="#f3f3f3" Padding="0 0 18 0">
1000+
Margin="0,0,0,0" Background="#f3f3f3" Padding="6 0 24 0">
10021001
<Grid Margin="0 0 0 0" Background="#f3f3f3">
10031002
<Grid.RowDefinitions>
10041003
<RowDefinition Height="0" />
@@ -1275,19 +1274,19 @@
12751274
</TabItem.Header>
12761275
<ScrollViewer ScrollViewer.CanContentScroll="False"
12771276
ui:ScrollViewerHelper.AutoHideScrollBars="{Binding AutoHideScrollBar, Mode=OneWay}"
1278-
Margin="0,0,0,0" Background="#f3f3f3">
1277+
Margin="0,0,0,0" Background="#f3f3f3" Padding="0 0 6 0">
12791278
<Border Background="#f3f3f3">
12801279
<Grid Margin="5 18 18 10">
12811280
<Grid.RowDefinitions>
1282-
<RowDefinition Height="50" />
1281+
<RowDefinition Height="43" />
12831282
<RowDefinition Height="80" />
12841283
<RowDefinition Height="150" />
12851284
<RowDefinition Height="50" />
12861285
<RowDefinition Height="250" />
12871286
<RowDefinition Height="70" />
12881287
</Grid.RowDefinitions>
12891288
<TextBlock Text="{DynamicResource hotkey}" Grid.Row="0" TextAlignment="left" FontSize="30"
1290-
Margin="0 5 0 5" />
1289+
Margin="0 5 0 2" />
12911290

12921291
<StackPanel Grid.Row="1">
12931292
<Border Style="{DynamicResource SettingGroupBox}" Margin="0 12 0 0">
@@ -1358,7 +1357,7 @@
13581357
</DataTemplate>
13591358
</GridViewColumn.CellTemplate>
13601359
</GridViewColumn>
1361-
<GridViewColumn Header="{DynamicResource customQuery}" Width="546">
1360+
<GridViewColumn Header="{DynamicResource customQuery}" Width="540">
13621361
<GridViewColumn.CellTemplate>
13631362
<DataTemplate DataType="userSettings:CustomPluginHotkey">
13641363
<TextBlock Text="{Binding ActionKeyword}" />
@@ -1399,18 +1398,18 @@
13991398
</TabItem.Header>
14001399
<ScrollViewer ScrollViewer.CanContentScroll="False"
14011400
ui:ScrollViewerHelper.AutoHideScrollBars="{Binding AutoHideScrollBar, Mode=OneWay}"
1402-
Margin="0,0,0,0" Background="#f3f3f3" Padding="5 0 18 0">
1401+
Margin="0,0,0,0" Background="#f3f3f3" Padding="5 0 24 0">
14031402
<Border Background="#f3f3f3">
14041403

14051404
<StackPanel>
14061405
<Border Margin="0 18 0 0">
14071406
<TextBlock Text="{DynamicResource proxy}" Grid.Row="0" TextAlignment="left" FontSize="30"
1408-
Margin="0 5 0 5" />
1407+
Margin="0 5 0 0" />
14091408
</Border>
14101409

14111410

14121411
<Border Style="{DynamicResource SettingGroupBox}" Padding="0" CornerRadius="5"
1413-
Margin="0 12 0 0">
1412+
Margin="0 10 0 0">
14141413
<StackPanel Orientation="Vertical">
14151414
<Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
14161415
<ItemsControl Style="{StaticResource SettingGrid}">

0 commit comments

Comments
 (0)