prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Adjust Layout

Browse source
This commit is contained in:
DB p 2022-11-04 20:34:49 +09:00
parent b1c8fa30ac
commit 1fe701fcfe
1 changed files with 43 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
Flow.Launcher/SettingWindow.xaml
View file

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