Skip to content

Commit 3dd8017

Browse files
onesoundsonesounds
committed
Merge branch 'PluginNotice' into PluginSearchTextBox
2 parents 26e3f2a + 2e54bc0 commit 3dd8017

File tree

3 files changed

+65
-26
lines changed

3 files changed

+65
-26
lines changed

‎Flow.Launcher/Images/installed.png

1.9 KB
Loading

‎Flow.Launcher/Images/new.png

2.62 KB
Loading

‎Flow.Launcher/SettingWindow.xaml

Lines changed: 65 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,8 @@
321321
<Setter Property="Padding" Value="0,0,0,0" />
322322
<Setter Property="Margin" Value="0,0,8,5" />
323323
<Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
324-
<Setter Property="MinWidth" Value="330" />
325-
<Setter Property="Height" Value="98" />
324+
<Setter Property="MinWidth" Value="100" />
325+
<Setter Property="Height" Value="Auto" />
326326
<!--#region Template for blue highlight win10-->
327327
<Setter Property="Template">
328328
<Setter.Value>
@@ -1400,7 +1400,7 @@
14001400
Margin="0,0,6,18"
14011401
HorizontalAlignment="Left"
14021402
VerticalAlignment="Top"
1403-
Columns="2"
1403+
Columns="3"
14041404
IsItemsHost="True"
14051405
SnapsToDevicePixels="True" />
14061406
</ItemsPanelTemplate>
@@ -1433,15 +1433,46 @@
14331433
</ControlTemplate>
14341434
</ToggleButton.Template>
14351435

1436-
<Grid HorizontalAlignment="Left" VerticalAlignment="Stretch">
1437-
<Grid.ColumnDefinitions>
1438-
<ColumnDefinition Width="72" />
1439-
<ColumnDefinition Width="*" />
1440-
</Grid.ColumnDefinitions>
1436+
<Grid
1437+
Height="160"
1438+
HorizontalAlignment="Left"
1439+
VerticalAlignment="Top">
1440+
<Grid.RowDefinitions>
1441+
<RowDefinition Height="56" />
1442+
<RowDefinition Height="*" />
1443+
</Grid.RowDefinitions>
14411444
<StackPanel
1445+
Grid.Row="0"
1446+
Grid.RowSpan="2"
14421447
Grid.Column="0"
1448+
Grid.ColumnSpan="2"
1449+
HorizontalAlignment="Right"
1450+
Orientation="Horizontal">
1451+
<Image
1452+
Width="32"
1453+
Height="32"
1454+
Margin="0,0,8,0"
1455+
HorizontalAlignment="Right"
1456+
VerticalAlignment="Top"
1457+
RenderOptions.BitmapScalingMode="HighQuality"
1458+
Source="/Images/new.png"
1459+
Stretch="Uniform" />
1460+
<Image
1461+
Width="28"
1462+
Height="28"
1463+
Margin="0,-2,8,0"
1464+
HorizontalAlignment="Right"
1465+
VerticalAlignment="Top"
1466+
RenderOptions.BitmapScalingMode="HighQuality"
1467+
Source="/Images/installed.png"
1468+
Stretch="Uniform"
1469+
Visibility="Visible" />
1470+
</StackPanel>
1471+
1472+
<StackPanel
1473+
Grid.Row="0"
14431474
Margin="0,0,0,0"
1444-
VerticalAlignment="Center">
1475+
VerticalAlignment="Top">
14451476
<StackPanel.Style>
14461477
<Style>
14471478
<Setter Property="StackPanel.Visibility" Value="Visible" />
@@ -1455,16 +1486,18 @@
14551486
<Image
14561487
Width="32"
14571488
Height="32"
1458-
Margin="8,0,6,0"
1459-
VerticalAlignment="Center"
1489+
Margin="20,20,6,0"
1490+
HorizontalAlignment="Left"
1491+
VerticalAlignment="Top"
14601492
RenderOptions.BitmapScalingMode="HighQuality"
14611493
Source="{Binding IcoPath, IsAsync=True}"
14621494
Stretch="Uniform" />
14631495
</StackPanel>
14641496
<StackPanel
1465-
Grid.Column="1"
1466-
Margin="0,0,8,0"
1467-
VerticalAlignment="Center"
1497+
Grid.Row="1"
1498+
Width="{Binding ActualWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}}"
1499+
Margin="0,6,0,0"
1500+
VerticalAlignment="Top"
14681501
Panel.ZIndex="0">
14691502
<StackPanel.Style>
14701503
<Style>
@@ -1477,14 +1510,16 @@
14771510
</Style>
14781511
</StackPanel.Style>
14791512
<TextBlock
1480-
Padding="0,0,20,0"
1513+
Padding="20,0,20,0"
1514+
VerticalAlignment="Top"
1515+
FontWeight="SemiBold"
14811516
Foreground="{DynamicResource Color05B}"
14821517
Text="{Binding Name}"
14831518
TextWrapping="WrapWithOverflow"
14841519
ToolTip="{Binding Version}" />
14851520
<TextBlock
1486-
Margin="0,2,0,0"
1487-
Padding="0,0,20,0"
1521+
Margin="0,6,0,0"
1522+
Padding="20,0,22,20"
14881523
Foreground="{DynamicResource Color04B}"
14891524
TextWrapping="WrapWithOverflow">
14901525
<Run
@@ -1495,6 +1530,7 @@
14951530

14961531
</StackPanel>
14971532
<StackPanel
1533+
Grid.RowSpan="2"
14981534
Grid.Column="0"
14991535
Grid.ColumnSpan="2"
15001536
HorizontalAlignment="Stretch"
@@ -1512,7 +1548,7 @@
15121548

15131549

15141550
<Grid
1515-
Height="94"
1551+
Height="180"
15161552
HorizontalAlignment="Stretch"
15171553
VerticalAlignment="Stretch"
15181554
Panel.ZIndex="1">
@@ -1524,27 +1560,28 @@
15241560
</Grid.ColumnDefinitions>
15251561

15261562
<StackPanel
1563+
Grid.Row="0"
15271564
Grid.Column="0"
15281565
HorizontalAlignment="Stretch"
1529-
VerticalAlignment="Center">
1530-
<StackPanel Orientation="Horizontal">
1566+
VerticalAlignment="Top">
1567+
<StackPanel Orientation="Vertical">
15311568
<TextBlock
1532-
Margin="20,0,0,0"
1569+
Margin="20,20,0,0"
15331570
Padding="0,0,0,0"
15341571
FontWeight="Bold"
15351572
Foreground="{DynamicResource Color05B}"
15361573
Text="{Binding Name}"
15371574
TextWrapping="WrapWithOverflow"
15381575
ToolTip="{Binding Name}" />
15391576
<TextBlock
1540-
Margin="10,0,0,0"
1577+
Margin="20,4,0,0"
15411578
Padding="0,0,20,0"
15421579
Foreground="{DynamicResource Color05B}"
15431580
Text="{Binding Version}"
15441581
TextWrapping="WrapWithOverflow"
15451582
ToolTip="{Binding Version}" />
15461583
</StackPanel>
1547-
<StackPanel Margin="20,2,120,0" Orientation="Vertical">
1584+
<StackPanel Margin="20,6,20,0" Orientation="Vertical">
15481585
<TextBlock Padding="0,0,0,0" TextWrapping="Wrap">
15491586
<Hyperlink
15501587
Foreground="{DynamicResource Color04B}"
@@ -1555,12 +1592,14 @@
15551592
</TextBlock>
15561593
</StackPanel>
15571594
</StackPanel>
1558-
<Border Padding="0,0,20,0">
1595+
<Border
1596+
Grid.Row="0"
1597+
Grid.Column="1"
1598+
Padding="0,0,0,0">
15591599
<Button
15601600
Name="ShortCutButtonPrev"
1561-
Grid.Column="1"
15621601
MinHeight="40"
1563-
Margin="0,0,0,0"
1602+
Margin="0,70,20,0"
15641603
Padding="15,5,15,5"
15651604
HorizontalAlignment="Right"
15661605
VerticalAlignment="Center"

0 commit comments

Comments
 (0)