Skip to content

Commit 1fe701f

Browse files
onesoundsonesounds
committed
Adjust Layout
1 parent b1c8fa3 commit 1fe701f

File tree

1 file changed

+43
-91
lines changed

1 file changed

+43
-91
lines changed

‎Flow.Launcher/SettingWindow.xaml

Lines changed: 43 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@
320320
<Style x:Key="StoreList" TargetType="ListViewItem">
321321
<Setter Property="Padding" Value="0,0,0,0" />
322322
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
323-
323+
<Setter Property="HorizontalAlignment" Value="Stretch" />
324324
<Setter Property="Margin" Value="0,0,8,8" />
325325
<Setter Property="VerticalContentAlignment" Value="Stretch" />
326326
<!--#region Template for blue highlight win10-->
@@ -1468,7 +1468,6 @@
14681468
ItemContainerStyle="{StaticResource StoreList}"
14691469
ItemsSource="{Binding ExternalPlugins}"
14701470
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
1471-
ScrollViewer.VerticalScrollBarVisibility="Auto"
14721471
SelectionMode="Single"
14731472
VirtualizingPanel.CacheLength="1,1"
14741473
VirtualizingPanel.CacheLengthUnit="Page"
@@ -1480,7 +1479,7 @@
14801479
<wpftk:VirtualizingWrapPanel
14811480
x:Name="ItemWrapPanel"
14821481
Margin="0,0,0,10"
1483-
ItemSize="216,194"
1482+
ItemSize="216,184"
14841483
MouseWheelDelta="48"
14851484
Orientation="Vertical"
14861485
ScrollLineDelta="16"
@@ -1522,19 +1521,21 @@
15221521
</GroupStyle>
15231522
</ListView.GroupStyle>
15241523

1525-
<ListBox.ItemTemplate>
1524+
<ListView.ItemTemplate>
15261525
<DataTemplate>
15271526
<!-- Hover Layout Style -->
15281527

15291528
<ToggleButton
15301529
x:Name="StoreListItem"
1531-
Width="200"
1532-
HorizontalAlignment="Left"
1533-
HorizontalContentAlignment="left"
1534-
IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}"
1535-
Style="{StaticResource StoreItem}">
1530+
Margin="0"
1531+
Padding="0"
1532+
HorizontalAlignment="Stretch"
1533+
VerticalAlignment="Stretch"
1534+
HorizontalContentAlignment="Stretch"
1535+
VerticalContentAlignment="Stretch"
1536+
IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}">
15361537
<ToggleButton.Template>
1537-
<ControlTemplate TargetType="{x:Type ButtonBase}">
1538+
<ControlTemplate x:Name="StoreListItemTemplate" TargetType="{x:Type ButtonBase}">
15381539
<ContentPresenter
15391540
x:Name="contentPresenter"
15401541
Margin="{TemplateBinding Padding}"
@@ -1550,94 +1551,45 @@
15501551
</ControlTemplate>
15511552
</ToggleButton.Template>
15521553

1553-
<Grid HorizontalAlignment="Left" VerticalAlignment="Top">
1554-
<Grid.RowDefinitions>
1555-
<RowDefinition Height="56" />
1556-
<RowDefinition Height="*" />
1557-
</Grid.RowDefinitions>
1558-
<StackPanel
1559-
Grid.Row="0"
1560-
Grid.RowSpan="2"
1561-
Grid.Column="0"
1562-
Grid.ColumnSpan="2"
1563-
Margin="0,0,2,0"
1554+
<Grid x:Name="StoreListItemGrid" Width="204">
1555+
<Border
1556+
x:Name="LabelUpdate"
1557+
Height="12"
1558+
Margin="0,10,8,0"
1559+
Padding="6,2,6,2"
15641560
HorizontalAlignment="Right"
1565-
Orientation="Horizontal">
1566-
<Border
1567-
x:Name="LabelUpdate"
1568-
Height="12"
1569-
Margin="0,10,8,0"
1570-
Padding="6,2,6,2"
1571-
HorizontalAlignment="Right"
1572-
VerticalAlignment="Top"
1573-
Background="#45BD59"
1574-
CornerRadius="36"
1575-
ToolTip="{DynamicResource LabelUpdateToolTip}"
1576-
Visibility="{Binding LabelUpdate, Converter={StaticResource BoolToVisibilityConverter}}" />
1577-
</StackPanel>
1578-
1579-
<StackPanel
1580-
Grid.Row="0"
1581-
Margin="0,0,0,0"
1582-
VerticalAlignment="Top">
1583-
<StackPanel.Style>
1584-
<Style>
1585-
<Setter Property="StackPanel.Visibility" Value="Visible" />
1586-
<Style.Triggers>
1587-
<DataTrigger Binding="{Binding Mode=TwoWay, Path=IsSelected, RelativeSource={RelativeSource AncestorType=ListBoxItem, Mode=FindAncestor}}" Value="true">
1588-
<Setter Property="StackPanel.Opacity" Value="1" />
1589-
</DataTrigger>
1590-
</Style.Triggers>
1591-
</Style>
1592-
</StackPanel.Style>
1561+
VerticalAlignment="Top"
1562+
Background="#45BD59"
1563+
CornerRadius="36"
1564+
ToolTip="{DynamicResource LabelUpdateToolTip}"
1565+
Visibility="{Binding LabelUpdate, Converter={StaticResource BoolToVisibilityConverter}}" />
1566+
<StackPanel>
15931567
<Image
1568+
Grid.Column="0"
15941569
Width="32"
15951570
Height="32"
1596-
Margin="20,20,6,0"
1571+
Margin="18,24,0,0"
15971572
HorizontalAlignment="Left"
1598-
VerticalAlignment="Top"
1599-
Source="{Binding IcoPath, IsAsync=True}"
1600-
Stretch="Uniform" />
1601-
</StackPanel>
1602-
<StackPanel
1603-
Grid.Row="1"
1604-
Margin="0,6,0,0"
1605-
VerticalAlignment="Top"
1606-
Panel.ZIndex="0">
1607-
<StackPanel.Style>
1608-
<Style>
1609-
<Setter Property="StackPanel.Visibility" Value="Visible" />
1610-
<Style.Triggers>
1611-
<DataTrigger Binding="{Binding Mode=TwoWay, Path=IsSelected, RelativeSource={RelativeSource AncestorType=ListBoxItem, Mode=FindAncestor}}" Value="true">
1612-
<Setter Property="StackPanel.Opacity" Value="1" />
1613-
</DataTrigger>
1614-
</Style.Triggers>
1615-
</Style>
1616-
</StackPanel.Style>
1573+
Source="{Binding IcoPath, IsAsync=True}" />
16171574
<TextBlock
1618-
Padding="20,0,20,0"
1619-
VerticalAlignment="Top"
1575+
Grid.Column="0"
1576+
Margin="18,10,18,0"
16201577
FontWeight="SemiBold"
16211578
Foreground="{DynamicResource Color05B}"
16221579
Text="{Binding Name}"
1623-
TextWrapping="WrapWithOverflow"
1580+
TextWrapping="Wrap"
16241581
ToolTip="{Binding Version}" />
16251582
<TextBlock
1626-
Margin="0,6,0,0"
1627-
Padding="20,0,22,20"
1583+
Grid.Column="0"
1584+
Margin="18,10,18,10"
1585+
FontSize="12"
16281586
Foreground="{DynamicResource Color04B}"
1629-
TextWrapping="WrapWithOverflow">
1630-
<Run
1631-
FontSize="12"
1632-
Foreground="{DynamicResource Color04B}"
1633-
Text="{Binding Description, Mode=OneWay}" />
1634-
</TextBlock>
1635-
1587+
Text="{Binding Description, Mode=OneWay}"
1588+
TextWrapping="Wrap" />
16361589
</StackPanel>
1590+
16371591
<StackPanel
1638-
Grid.RowSpan="2"
16391592
Grid.Column="0"
1640-
Grid.ColumnSpan="2"
16411593
HorizontalAlignment="Stretch"
16421594
VerticalAlignment="Stretch">
16431595
<StackPanel.Style>
@@ -1653,15 +1605,15 @@
16531605

16541606

16551607
<Grid
1656-
Height="180"
1608+
Height="{Binding ElementName=StoreListItem, Path=ActualHeight}"
16571609
HorizontalAlignment="Stretch"
16581610
VerticalAlignment="Stretch"
16591611
Panel.ZIndex="1">
16601612
<Grid.Background>
16611613
<SolidColorBrush Opacity="1" Color="{DynamicResource HoverStoreGrid}" />
16621614
</Grid.Background>
16631615
<Grid.ColumnDefinitions>
1664-
<ColumnDefinition Width="{Binding Path=ActualWidth, ElementName=StoreListItem}" />
1616+
<ColumnDefinition />
16651617
</Grid.ColumnDefinitions>
16661618

16671619
<StackPanel
@@ -1699,20 +1651,21 @@
16991651
</StackPanel>
17001652
<Grid Grid.Row="0" Grid.Column="1">
17011653
<StackPanel
1702-
Margin="0,70,20,0"
1654+
Margin="0,105,5,0"
17031655
HorizontalAlignment="Right"
17041656
Orientation="Horizontal">
17051657
<Button
17061658
MinHeight="40"
1659+
Margin="5,0,5,0"
17071660
Padding="15,5,15,5"
1708-
HorizontalAlignment="Right"
1661+
HorizontalAlignment="Stretch"
17091662
VerticalAlignment="Center"
17101663
Click="OnExternalPluginInstallClick"
17111664
Content="{DynamicResource installbtn}"
17121665
Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter='!'}" />
17131666
<Button
17141667
MinHeight="40"
1715-
Margin="5,0,0,0"
1668+
Margin="5,0,5,0"
17161669
Padding="15,5,15,5"
17171670
HorizontalAlignment="Right"
17181671
VerticalAlignment="Center"
@@ -1721,7 +1674,7 @@
17211674
Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}}" />
17221675
<Button
17231676
MinHeight="40"
1724-
Margin="5,0,0,0"
1677+
Margin="5,0,5,0"
17251678
Padding="15,5,15,5"
17261679
HorizontalAlignment="Right"
17271680
VerticalAlignment="Center"
@@ -1734,10 +1687,9 @@
17341687
</Grid>
17351688
</StackPanel>
17361689
</Grid>
1737-
17381690
</ToggleButton>
17391691
</DataTemplate>
1740-
</ListBox.ItemTemplate>
1692+
</ListView.ItemTemplate>
17411693
</ListView>
17421694
</Grid>
17431695

0 commit comments

Comments
 (0)