Skip to content
This repository was archived by the owner on Jul 18, 2023. It is now read-only.

Commit 0fc142d

Browse files
authored
Merge pull request #47 from Flow-Launcher/fix_settings_layout
Fix settings layout not visible
2 parents 226d485 + 4548543 commit 0fc142d

File tree

2 files changed

+20
-17
lines changed

2 files changed

+20
-17
lines changed

EverythingSettings.xaml

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<UserControl
1+
<UserControl
22
x:Class="Flow.Launcher.Plugin.Everything.EverythingSettings"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -19,8 +19,8 @@
1919
<RowDefinition Height="Auto" />
2020
</Grid.RowDefinitions>
2121
<Grid.ColumnDefinitions>
22+
<ColumnDefinition Width="150"/>
2223
<ColumnDefinition />
23-
<ColumnDefinition Width="2*" />
2424
<ColumnDefinition />
2525
</Grid.ColumnDefinitions>
2626
<Grid.Resources>
@@ -33,6 +33,7 @@
3333
Margin="10,6,18,6"
3434
HorizontalAlignment="Left"
3535
Content="{DynamicResource flowlauncher_plugin_everything_use_location_as_working_dir}" />
36+
3637
<CheckBox
3738
x:Name="LaunchHidden"
3839
Grid.Row="1"
@@ -55,22 +56,25 @@
5556
HorizontalAlignment="Left"
5657
VerticalAlignment="Center"
5758
Content="{DynamicResource flowlauncher_plugin_everything_editor_path}" />
58-
<Label
59-
x:Name="EditorPath"
60-
Grid.Row="3"
61-
Grid.Column="1"
62-
Margin="10"
63-
HorizontalAlignment="Left"
64-
VerticalAlignment="Center" />
59+
6560
<Button
6661
x:Name="OpenEditorPath"
6762
Grid.Row="3"
68-
Grid.Column="2"
69-
MinWidth="80"
70-
Margin="10"
63+
Grid.Column="1"
64+
MinWidth="50"
7165
HorizontalAlignment="Left"
7266
Click="EditorPath_Clicked"
7367
Content="..." />
68+
69+
<Label
70+
x:Name="EditorPath"
71+
Grid.Row="3"
72+
Grid.Column="1"
73+
Margin="70 0 0 0"
74+
Grid.ColumnSpan="2"
75+
HorizontalAlignment="Left"
76+
VerticalAlignment="Center" />
77+
7478
<TextBlock
7579
Grid.Row="4"
7680
Margin="10"
@@ -81,11 +85,10 @@
8185
Grid.Row="4"
8286
Grid.Column="1"
8387
Width="200"
84-
Margin="10"
88+
VerticalAlignment="Center"
8589
ItemsSource="{Binding GetSortOptions, Mode=OneWay}"
8690
SelectedItem="{Binding SortOption}"
8791
SelectionChanged="onSelectionChange">
88-
ItemsSource="{Binding GetSortOptions, Mode=OneWay}"
8992
<ComboBox.ItemTemplate>
9093
<DataTemplate>
9194
<Grid>
@@ -98,9 +101,9 @@
98101
<TextBlock
99102
Name="tbFastSortWarning"
100103
Grid.Row="4"
101-
Grid.Column="0"
104+
Grid.Column="2"
102105
Grid.ColumnSpan="3"
103-
Margin="10,20,10,20"
106+
Margin="0 0 10 0"
104107
VerticalAlignment="Center"
105108
Foreground="Orange"
106109
Text="{Binding GetSortOptionWarningMessage}"

plugin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Name": "Everything",
55
"Description": "Search Everything",
66
"Author": "qianlifeng, orzfly",
7-
"Version": "1.7.0",
7+
"Version": "1.7.1",
88
"Language": "csharp",
99
"Website": "https://github.com/Flow-Launcher/Flow.Launcher.Plugin.Everything",
1010
"IcoPath": "Images\\find.png",

0 commit comments

Comments
 (0)