Skip to content

Commit 08d5eaa

Browse files
onesoundsonesounds
committed
Redesign PluginStroe Item List
1 parent f6d8d3e commit 08d5eaa

File tree

1 file changed

+43
-26
lines changed

1 file changed

+43
-26
lines changed

‎Flow.Launcher/SettingWindow.xaml

Lines changed: 43 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,8 @@
319319
<Setter Property="Padding" Value="0,0,0,0" />
320320
<Setter Property="Margin" Value="0,0,8,5" />
321321
<Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
322-
<Setter Property="MinWidth" Value="330" />
323-
<Setter Property="Height" Value="98" />
322+
<Setter Property="MinWidth" Value="100" />
323+
<Setter Property="Height" Value="Auto" />
324324
<!--#region Template for blue highlight win10-->
325325
<Setter Property="Template">
326326
<Setter.Value>
@@ -1304,7 +1304,7 @@
13041304
Margin="0,0,6,18"
13051305
HorizontalAlignment="Left"
13061306
VerticalAlignment="Top"
1307-
Columns="2"
1307+
Columns="3"
13081308
IsItemsHost="True"
13091309
SnapsToDevicePixels="True" />
13101310
</ItemsPanelTemplate>
@@ -1337,15 +1337,24 @@
13371337
</ControlTemplate>
13381338
</ToggleButton.Template>
13391339

1340-
<Grid HorizontalAlignment="Left" VerticalAlignment="Stretch">
1341-
<Grid.ColumnDefinitions>
1342-
<ColumnDefinition Width="72" />
1343-
<ColumnDefinition Width="*" />
1344-
</Grid.ColumnDefinitions>
1340+
<Grid
1341+
Height="160"
1342+
HorizontalAlignment="Left"
1343+
VerticalAlignment="Top">
1344+
<Grid.RowDefinitions>
1345+
<RowDefinition Height="56" />
1346+
<RowDefinition Height="*" />
1347+
</Grid.RowDefinitions>
13451348
<StackPanel
1349+
Grid.Row="0"
1350+
Grid.RowSpan="2"
13461351
Grid.Column="0"
1352+
Grid.ColumnSpan="2" />
1353+
1354+
<StackPanel
1355+
Grid.Row="0"
13471356
Margin="0,0,0,0"
1348-
VerticalAlignment="Center">
1357+
VerticalAlignment="Top">
13491358
<StackPanel.Style>
13501359
<Style>
13511360
<Setter Property="StackPanel.Visibility" Value="Visible" />
@@ -1359,16 +1368,18 @@
13591368
<Image
13601369
Width="32"
13611370
Height="32"
1362-
Margin="8,0,6,0"
1363-
VerticalAlignment="Center"
1371+
Margin="20,20,6,0"
1372+
HorizontalAlignment="Left"
1373+
VerticalAlignment="Top"
13641374
RenderOptions.BitmapScalingMode="HighQuality"
13651375
Source="{Binding IcoPath, IsAsync=True}"
13661376
Stretch="Uniform" />
13671377
</StackPanel>
13681378
<StackPanel
1369-
Grid.Column="1"
1370-
Margin="0,0,8,0"
1371-
VerticalAlignment="Center"
1379+
Grid.Row="1"
1380+
Width="{Binding ActualWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}}"
1381+
Margin="0,6,0,0"
1382+
VerticalAlignment="Top"
13721383
Panel.ZIndex="0">
13731384
<StackPanel.Style>
13741385
<Style>
@@ -1381,14 +1392,16 @@
13811392
</Style>
13821393
</StackPanel.Style>
13831394
<TextBlock
1384-
Padding="0,0,20,0"
1395+
Padding="20,0,20,0"
1396+
VerticalAlignment="Top"
1397+
FontWeight="SemiBold"
13851398
Foreground="{DynamicResource Color05B}"
13861399
Text="{Binding Name}"
13871400
TextWrapping="WrapWithOverflow"
13881401
ToolTip="{Binding Version}" />
13891402
<TextBlock
1390-
Margin="0,2,0,0"
1391-
Padding="0,0,20,0"
1403+
Margin="0,6,0,0"
1404+
Padding="20,0,22,20"
13921405
Foreground="{DynamicResource Color04B}"
13931406
TextWrapping="WrapWithOverflow">
13941407
<Run
@@ -1399,6 +1412,7 @@
13991412

14001413
</StackPanel>
14011414
<StackPanel
1415+
Grid.RowSpan="2"
14021416
Grid.Column="0"
14031417
Grid.ColumnSpan="2"
14041418
HorizontalAlignment="Stretch"
@@ -1416,7 +1430,7 @@
14161430

14171431

14181432
<Grid
1419-
Height="94"
1433+
Height="180"
14201434
HorizontalAlignment="Stretch"
14211435
VerticalAlignment="Stretch"
14221436
Panel.ZIndex="1">
@@ -1428,27 +1442,28 @@
14281442
</Grid.ColumnDefinitions>
14291443

14301444
<StackPanel
1445+
Grid.Row="0"
14311446
Grid.Column="0"
14321447
HorizontalAlignment="Stretch"
1433-
VerticalAlignment="Center">
1434-
<StackPanel Orientation="Horizontal">
1448+
VerticalAlignment="Top">
1449+
<StackPanel Orientation="Vertical">
14351450
<TextBlock
1436-
Margin="20,0,0,0"
1451+
Margin="20,20,0,0"
14371452
Padding="0,0,0,0"
14381453
FontWeight="Bold"
14391454
Foreground="{DynamicResource Color05B}"
14401455
Text="{Binding Name}"
14411456
TextWrapping="WrapWithOverflow"
14421457
ToolTip="{Binding Name}" />
14431458
<TextBlock
1444-
Margin="10,0,0,0"
1459+
Margin="20,4,0,0"
14451460
Padding="0,0,20,0"
14461461
Foreground="{DynamicResource Color05B}"
14471462
Text="{Binding Version}"
14481463
TextWrapping="WrapWithOverflow"
14491464
ToolTip="{Binding Version}" />
14501465
</StackPanel>
1451-
<StackPanel Margin="20,2,120,0" Orientation="Vertical">
1466+
<StackPanel Margin="20,6,20,0" Orientation="Vertical">
14521467
<TextBlock Padding="0,0,0,0" TextWrapping="Wrap">
14531468
<Hyperlink
14541469
Foreground="{DynamicResource Color04B}"
@@ -1459,12 +1474,14 @@
14591474
</TextBlock>
14601475
</StackPanel>
14611476
</StackPanel>
1462-
<Border Padding="0,0,20,0">
1477+
<Border
1478+
Grid.Row="0"
1479+
Grid.Column="1"
1480+
Padding="0,0,0,0">
14631481
<Button
14641482
Name="ShortCutButtonPrev"
1465-
Grid.Column="1"
14661483
MinHeight="40"
1467-
Margin="0,0,0,0"
1484+
Margin="0,70,20,0"
14681485
Padding="15,5,15,5"
14691486
HorizontalAlignment="Right"
14701487
VerticalAlignment="Center"

0 commit comments

Comments
 (0)