From 1fe701fcfeea4c745e9bf9b6119974468b130d30 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 4 Nov 2022 20:34:49 +0900
Subject: [PATCH] Adjust Layout

---
 Flow.Launcher/SettingWindow.xaml | 134 ++++++++++---------------------
 1 file changed, 43 insertions(+), 91 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 4118e5654..7c735e963 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -320,7 +320,7 @@
         <Style x:Key="StoreList" TargetType="ListViewItem">
             <Setter Property="Padding" Value="0,0,0,0" />
             <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
             <Setter Property="Margin" Value="0,0,8,8" />
             <Setter Property="VerticalContentAlignment" Value="Stretch" />
             <!--#region Template for blue highlight win10-->
@@ -1468,7 +1468,6 @@
                             ItemContainerStyle="{StaticResource StoreList}"
                             ItemsSource="{Binding ExternalPlugins}"
                             ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                            ScrollViewer.VerticalScrollBarVisibility="Auto"
                             SelectionMode="Single"
                             VirtualizingPanel.CacheLength="1,1"
                             VirtualizingPanel.CacheLengthUnit="Page"
@@ -1480,7 +1479,7 @@
                                     <wpftk:VirtualizingWrapPanel
                                         x:Name="ItemWrapPanel"
                                         Margin="0,0,0,10"
-                                        ItemSize="216,194"
+                                        ItemSize="216,184"
                                         MouseWheelDelta="48"
                                         Orientation="Vertical"
                                         ScrollLineDelta="16"
@@ -1522,19 +1521,21 @@
                                 </GroupStyle>
                             </ListView.GroupStyle>
 
-                            <ListBox.ItemTemplate>
+                            <ListView.ItemTemplate>
                                 <DataTemplate>
                                     <!--  Hover Layout Style  -->
 
                                     <ToggleButton
                                         x:Name="StoreListItem"
-                                        Width="200"
-                                        HorizontalAlignment="Left"
-                                        HorizontalContentAlignment="left"
-                                        IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}"
-                                        Style="{StaticResource StoreItem}">
+                                        Margin="0"
+                                        Padding="0"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Stretch"
+                                        HorizontalContentAlignment="Stretch"
+                                        VerticalContentAlignment="Stretch"
+                                        IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}">
                                         <ToggleButton.Template>
-                                            <ControlTemplate TargetType="{x:Type ButtonBase}">
+                                            <ControlTemplate x:Name="StoreListItemTemplate" TargetType="{x:Type ButtonBase}">
                                                 <ContentPresenter
                                                     x:Name="contentPresenter"
                                                     Margin="{TemplateBinding Padding}"
@@ -1550,94 +1551,45 @@
                                             </ControlTemplate>
                                         </ToggleButton.Template>
 
-                                        <Grid HorizontalAlignment="Left" VerticalAlignment="Top">
-                                            <Grid.RowDefinitions>
-                                                <RowDefinition Height="56" />
-                                                <RowDefinition Height="*" />
-                                            </Grid.RowDefinitions>
-                                            <StackPanel
-                                                Grid.Row="0"
-                                                Grid.RowSpan="2"
-                                                Grid.Column="0"
-                                                Grid.ColumnSpan="2"
-                                                Margin="0,0,2,0"
+                                        <Grid x:Name="StoreListItemGrid" Width="204">
+                                            <Border
+                                                x:Name="LabelUpdate"
+                                                Height="12"
+                                                Margin="0,10,8,0"
+                                                Padding="6,2,6,2"
                                                 HorizontalAlignment="Right"
-                                                Orientation="Horizontal">
-                                                <Border
-                                                    x:Name="LabelUpdate"
-                                                    Height="12"
-                                                    Margin="0,10,8,0"
-                                                    Padding="6,2,6,2"
-                                                    HorizontalAlignment="Right"
-                                                    VerticalAlignment="Top"
-                                                    Background="#45BD59"
-                                                    CornerRadius="36"
-                                                    ToolTip="{DynamicResource LabelUpdateToolTip}"
-                                                    Visibility="{Binding LabelUpdate, Converter={StaticResource BoolToVisibilityConverter}}" />
-                                            </StackPanel>
-
-                                            <StackPanel
-                                                Grid.Row="0"
-                                                Margin="0,0,0,0"
-                                                VerticalAlignment="Top">
-                                                <StackPanel.Style>
-                                                    <Style>
-                                                        <Setter Property="StackPanel.Visibility" Value="Visible" />
-                                                        <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding Mode=TwoWay, Path=IsSelected, RelativeSource={RelativeSource AncestorType=ListBoxItem, Mode=FindAncestor}}" Value="true">
-                                                                <Setter Property="StackPanel.Opacity" Value="1" />
-                                                            </DataTrigger>
-                                                        </Style.Triggers>
-                                                    </Style>
-                                                </StackPanel.Style>
+                                                VerticalAlignment="Top"
+                                                Background="#45BD59"
+                                                CornerRadius="36"
+                                                ToolTip="{DynamicResource LabelUpdateToolTip}"
+                                                Visibility="{Binding LabelUpdate, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                            <StackPanel>
                                                 <Image
+                                                    Grid.Column="0"
                                                     Width="32"
                                                     Height="32"
-                                                    Margin="20,20,6,0"
+                                                    Margin="18,24,0,0"
                                                     HorizontalAlignment="Left"
-                                                    VerticalAlignment="Top"
-                                                    Source="{Binding IcoPath, IsAsync=True}"
-                                                    Stretch="Uniform" />
-                                            </StackPanel>
-                                            <StackPanel
-                                                Grid.Row="1"
-                                                Margin="0,6,0,0"
-                                                VerticalAlignment="Top"
-                                                Panel.ZIndex="0">
-                                                <StackPanel.Style>
-                                                    <Style>
-                                                        <Setter Property="StackPanel.Visibility" Value="Visible" />
-                                                        <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding Mode=TwoWay, Path=IsSelected, RelativeSource={RelativeSource AncestorType=ListBoxItem, Mode=FindAncestor}}" Value="true">
-                                                                <Setter Property="StackPanel.Opacity" Value="1" />
-                                                            </DataTrigger>
-                                                        </Style.Triggers>
-                                                    </Style>
-                                                </StackPanel.Style>
+                                                    Source="{Binding IcoPath, IsAsync=True}" />
                                                 <TextBlock
-                                                    Padding="20,0,20,0"
-                                                    VerticalAlignment="Top"
+                                                    Grid.Column="0"
+                                                    Margin="18,10,18,0"
                                                     FontWeight="SemiBold"
                                                     Foreground="{DynamicResource Color05B}"
                                                     Text="{Binding Name}"
-                                                    TextWrapping="WrapWithOverflow"
+                                                    TextWrapping="Wrap"
                                                     ToolTip="{Binding Version}" />
                                                 <TextBlock
-                                                    Margin="0,6,0,0"
-                                                    Padding="20,0,22,20"
+                                                    Grid.Column="0"
+                                                    Margin="18,10,18,10"
+                                                    FontSize="12"
                                                     Foreground="{DynamicResource Color04B}"
-                                                    TextWrapping="WrapWithOverflow">
-                                                    <Run
-                                                        FontSize="12"
-                                                        Foreground="{DynamicResource Color04B}"
-                                                        Text="{Binding Description, Mode=OneWay}" />
-                                                </TextBlock>
-
+                                                    Text="{Binding Description, Mode=OneWay}"
+                                                    TextWrapping="Wrap" />
                                             </StackPanel>
+
                                             <StackPanel
-                                                Grid.RowSpan="2"
                                                 Grid.Column="0"
-                                                Grid.ColumnSpan="2"
                                                 HorizontalAlignment="Stretch"
                                                 VerticalAlignment="Stretch">
                                                 <StackPanel.Style>
@@ -1653,7 +1605,7 @@
 
 
                                                 <Grid
-                                                    Height="180"
+                                                    Height="{Binding ElementName=StoreListItem, Path=ActualHeight}"
                                                     HorizontalAlignment="Stretch"
                                                     VerticalAlignment="Stretch"
                                                     Panel.ZIndex="1">
@@ -1661,7 +1613,7 @@
                                                         <SolidColorBrush Opacity="1" Color="{DynamicResource HoverStoreGrid}" />
                                                     </Grid.Background>
                                                     <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="{Binding Path=ActualWidth, ElementName=StoreListItem}" />
+                                                        <ColumnDefinition />
                                                     </Grid.ColumnDefinitions>
 
                                                     <StackPanel
@@ -1699,20 +1651,21 @@
                                                     </StackPanel>
                                                     <Grid Grid.Row="0" Grid.Column="1">
                                                         <StackPanel
-                                                            Margin="0,70,20,0"
+                                                            Margin="0,105,5,0"
                                                             HorizontalAlignment="Right"
                                                             Orientation="Horizontal">
                                                             <Button
                                                                 MinHeight="40"
+                                                                Margin="5,0,5,0"
                                                                 Padding="15,5,15,5"
-                                                                HorizontalAlignment="Right"
+                                                                HorizontalAlignment="Stretch"
                                                                 VerticalAlignment="Center"
                                                                 Click="OnExternalPluginInstallClick"
                                                                 Content="{DynamicResource installbtn}"
                                                                 Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter='!'}" />
                                                             <Button
                                                                 MinHeight="40"
-                                                                Margin="5,0,0,0"
+                                                                Margin="5,0,5,0"
                                                                 Padding="15,5,15,5"
                                                                 HorizontalAlignment="Right"
                                                                 VerticalAlignment="Center"
@@ -1721,7 +1674,7 @@
                                                                 Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}}" />
                                                             <Button
                                                                 MinHeight="40"
-                                                                Margin="5,0,0,0"
+                                                                Margin="5,0,5,0"
                                                                 Padding="15,5,15,5"
                                                                 HorizontalAlignment="Right"
                                                                 VerticalAlignment="Center"
@@ -1734,10 +1687,9 @@
                                                 </Grid>
                                             </StackPanel>
                                         </Grid>
-
                                     </ToggleButton>
                                 </DataTemplate>
-                            </ListBox.ItemTemplate>
+                            </ListView.ItemTemplate>
                         </ListView>
                     </Grid>