Skip to content

Commit d7d567e

Browse files
committed
Change Searchsource Window layout to responsive (in WebSearch Plugin)
1 parent 70e4414 commit d7d567e

File tree

1 file changed

+102
-94
lines changed

1 file changed

+102
-94
lines changed

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

Lines changed: 102 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
Text="{DynamicResource flowlauncher_plugin_websearch_window_title}"
7070
TextAlignment="Left" />
7171
</StackPanel>
72-
<StackPanel Orientation="Vertical">
72+
<StackPanel>
7373
<TextBlock
7474
FontSize="14"
7575
Text="{DynamicResource flowlauncher_plugin_websearch_guide_1}"
@@ -90,96 +90,103 @@
9090
TextWrapping="WrapWithOverflow" />
9191
</StackPanel>
9292
<StackPanel Orientation="Horizontal">
93-
<TextBlock
94-
Width="100"
95-
Margin="10"
96-
HorizontalAlignment="Stretch"
97-
VerticalAlignment="Center"
98-
FontSize="14"
99-
Text="{DynamicResource flowlauncher_plugin_websearch_title}" />
100-
<TextBox
101-
Width="330"
102-
Margin="10"
103-
HorizontalAlignment="Left"
104-
VerticalAlignment="Center"
105-
Text="{Binding SearchSource.Title}" />
106-
107-
</StackPanel>
108-
<StackPanel Orientation="Horizontal">
109-
<TextBlock
110-
Grid.Row="4"
111-
Grid.Column="0"
112-
Width="100"
113-
Margin="10"
114-
HorizontalAlignment="Left"
115-
VerticalAlignment="Center"
116-
FontSize="14"
117-
Text="{DynamicResource flowlauncher_plugin_websearch_icon}" />
118-
<Button
119-
Height="35"
120-
Margin="10,0,0,0"
121-
VerticalAlignment="Center"
122-
Click="OnSelectIconClick"
123-
Content="{DynamicResource flowlauncher_plugin_websearch_select_icon}" />
124-
<Image
125-
Name="imgPreviewIcon"
126-
Width="24"
127-
Height="24"
128-
Margin="14,0,0,0"
129-
VerticalAlignment="Center" />
130-
</StackPanel>
131-
<StackPanel Orientation="Horizontal">
132-
<TextBlock
133-
Width="100"
134-
Margin="10"
135-
HorizontalAlignment="Left"
136-
VerticalAlignment="Center"
137-
FontSize="14"
138-
Text="{DynamicResource flowlauncher_plugin_websearch_url}" />
139-
<TextBox
140-
Grid.Row="1"
141-
Grid.Column="1"
142-
Width="330"
143-
Margin="10"
144-
HorizontalAlignment="Left"
145-
VerticalAlignment="Center"
146-
Text="{Binding SearchSource.Url}" />
147-
</StackPanel>
148-
<StackPanel Orientation="Horizontal">
149-
<TextBlock
150-
Grid.Row="2"
151-
Grid.Column="0"
152-
Width="100"
153-
Margin="10"
154-
HorizontalAlignment="Left"
155-
VerticalAlignment="Center"
156-
FontSize="14"
157-
Text="{DynamicResource flowlauncher_plugin_websearch_action_keyword}" />
158-
<TextBox
159-
Grid.Row="2"
160-
Grid.Column="1"
161-
Width="330"
162-
Margin="10,0,10,0"
163-
HorizontalAlignment="Left"
164-
VerticalAlignment="Center"
165-
Text="{Binding SearchSource.ActionKeyword}" />
166-
</StackPanel>
167-
<StackPanel Orientation="Horizontal">
168-
<TextBlock
169-
Grid.Row="3"
170-
Grid.Column="0"
171-
Width="100"
172-
Margin="10"
173-
HorizontalAlignment="Left"
174-
VerticalAlignment="Center"
175-
FontSize="14"
176-
Text="{DynamicResource flowlauncher_plugin_websearch_enable}" />
177-
<CheckBox
178-
Grid.Row="3"
179-
Grid.Column="1"
180-
Margin="10"
181-
VerticalAlignment="Center"
182-
IsChecked="{Binding SearchSource.Enabled}" />
93+
<Grid Width="500">
94+
<Grid.ColumnDefinitions>
95+
<ColumnDefinition Width="Auto" />
96+
<ColumnDefinition Width="*" />
97+
</Grid.ColumnDefinitions>
98+
<Grid.RowDefinitions>
99+
<RowDefinition />
100+
<RowDefinition />
101+
<RowDefinition />
102+
<RowDefinition />
103+
<RowDefinition />
104+
</Grid.RowDefinitions>
105+
<TextBlock
106+
Grid.Row="0"
107+
Grid.Column="0"
108+
Margin="10,10,15,10"
109+
HorizontalAlignment="Stretch"
110+
VerticalAlignment="Center"
111+
FontSize="14"
112+
Text="{DynamicResource flowlauncher_plugin_websearch_title}" />
113+
<TextBox
114+
Grid.Row="0"
115+
Grid.Column="1"
116+
Margin="10"
117+
HorizontalAlignment="Stretch"
118+
VerticalAlignment="Center"
119+
Text="{Binding SearchSource.Title}" />
120+
<TextBlock
121+
Grid.Row="1"
122+
Grid.Column="0"
123+
Margin="10,10,15,10"
124+
HorizontalAlignment="Left"
125+
VerticalAlignment="Center"
126+
FontSize="14"
127+
Text="{DynamicResource flowlauncher_plugin_websearch_icon}" />
128+
<StackPanel
129+
Grid.Row="1"
130+
Grid.Column="1"
131+
Orientation="Horizontal">
132+
<Button
133+
Height="35"
134+
Margin="10,0,0,0"
135+
VerticalAlignment="Center"
136+
Click="OnSelectIconClick"
137+
Content="{DynamicResource flowlauncher_plugin_websearch_select_icon}" />
138+
<Image
139+
Name="imgPreviewIcon"
140+
Width="24"
141+
Height="24"
142+
Margin="14,0,0,0"
143+
VerticalAlignment="Center" />
144+
</StackPanel>
145+
<TextBlock
146+
Grid.Row="2"
147+
Grid.Column="0"
148+
Margin="10,10,15,10"
149+
HorizontalAlignment="Left"
150+
VerticalAlignment="Center"
151+
FontSize="14"
152+
Text="{DynamicResource flowlauncher_plugin_websearch_url}" />
153+
<TextBox
154+
Grid.Row="2"
155+
Grid.Column="1"
156+
Margin="10"
157+
HorizontalAlignment="Stretch"
158+
VerticalAlignment="Center"
159+
Text="{Binding SearchSource.Url}" />
160+
<TextBlock
161+
Grid.Row="3"
162+
Grid.Column="0"
163+
Margin="10,10,15,10"
164+
HorizontalAlignment="Left"
165+
VerticalAlignment="Center"
166+
FontSize="14"
167+
Text="{DynamicResource flowlauncher_plugin_websearch_action_keyword}" />
168+
<TextBox
169+
Grid.Row="3"
170+
Grid.Column="1"
171+
Margin="10,0,10,0"
172+
HorizontalAlignment="Stretch"
173+
VerticalAlignment="Center"
174+
Text="{Binding SearchSource.ActionKeyword}" />
175+
<TextBlock
176+
Grid.Row="4"
177+
Grid.Column="0"
178+
Margin="10,10,15,15"
179+
HorizontalAlignment="Left"
180+
VerticalAlignment="Center"
181+
FontSize="14"
182+
Text="{DynamicResource flowlauncher_plugin_websearch_enable}" />
183+
<CheckBox
184+
Grid.Row="4"
185+
Grid.Column="1"
186+
Margin="10,10,10,15"
187+
VerticalAlignment="Center"
188+
IsChecked="{Binding SearchSource.Enabled}" />
189+
</Grid>
183190
</StackPanel>
184191
</StackPanel>
185192
</Grid>
@@ -192,15 +199,16 @@
192199
BorderThickness="0,1,0,0">
193200
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
194201
<Button
195-
Width="100"
202+
MinWidth="140"
196203
Margin="10,0,5,0"
197204
Click="OnCancelButtonClick"
198205
Content="{DynamicResource flowlauncher_plugin_websearch_cancel}" />
199206
<Button
200-
Width="100"
207+
MinWidth="140"
201208
Margin="5,0,10,0"
202209
Click="OnConfirmButtonClick"
203-
Content="{DynamicResource flowlauncher_plugin_websearch_confirm}" />
210+
Content="{DynamicResource flowlauncher_plugin_websearch_confirm}"
211+
Style="{DynamicResource AccentButtonStyle}" />
204212
</StackPanel>
205213
</Border>
206214
</Grid>

0 commit comments

Comments
 (0)