mirror of
https://github.com/Flow-Launcher/Flow.Launcher.git
synced 2026-03-11 08:54:32 +00:00
Remove Binding VirtualizingStackPanel Orientation at pluginstore
This commit is contained in:
DB p
parent
a9f7935b32
commit
ca58cc2e83
1 changed files with 48 additions and 42 deletions
|
|
@ -6,17 +6,20 @@
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:sys="clr-namespace:System;assembly=mscorlib"
|
xmlns:sys="clr-namespace:System;assembly=mscorlib"
|
||||||
xmlns:ui="http://schemas.modernwpf.com/2019"
|
xmlns:ui="http://schemas.modernwpf.com/2019"
|
||||||
xmlns:wpftk="clr-namespace:WpfToolkit.Controls;assembly=VirtualizingWrapPanel"
|
|
||||||
xmlns:viewModels="clr-namespace:Flow.Launcher.SettingPages.ViewModels"
|
xmlns:viewModels="clr-namespace:Flow.Launcher.SettingPages.ViewModels"
|
||||||
|
xmlns:wpftk="clr-namespace:WpfToolkit.Controls;assembly=VirtualizingWrapPanel"
|
||||||
Title="PluginStore"
|
Title="PluginStore"
|
||||||
FocusManager.FocusedElement="{Binding ElementName=PluginStoreFilterTextbox}"
|
|
||||||
KeyDown="SettingsPanePlugins_OnKeyDown"
|
|
||||||
d:DataContext="{d:DesignInstance viewModels:SettingsPanePluginStoreViewModel}"
|
d:DataContext="{d:DesignInstance viewModels:SettingsPanePluginStoreViewModel}"
|
||||||
d:DesignHeight="450"
|
d:DesignHeight="450"
|
||||||
d:DesignWidth="800"
|
d:DesignWidth="800"
|
||||||
|
FocusManager.FocusedElement="{Binding ElementName=PluginStoreFilterTextbox}"
|
||||||
|
KeyDown="SettingsPanePlugins_OnKeyDown"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
<ui:Page.Resources>
|
<ui:Page.Resources>
|
||||||
<CollectionViewSource x:Key="PluginStoreCollectionView" Source="{Binding ExternalPlugins}" Filter="PluginStoreCollectionView_OnFilter">
|
<CollectionViewSource
|
||||||
|
x:Key="PluginStoreCollectionView"
|
||||||
|
Filter="PluginStoreCollectionView_OnFilter"
|
||||||
|
Source="{Binding ExternalPlugins}">
|
||||||
<CollectionViewSource.GroupDescriptions>
|
<CollectionViewSource.GroupDescriptions>
|
||||||
<PropertyGroupDescription PropertyName="Category" />
|
<PropertyGroupDescription PropertyName="Category" />
|
||||||
</CollectionViewSource.GroupDescriptions>
|
</CollectionViewSource.GroupDescriptions>
|
||||||
|
|
@ -34,9 +37,9 @@
|
||||||
<Border
|
<Border
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Padding="5 18 0 0">
|
Padding="5,18,0,0">
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="0 5"
|
Margin="0,5"
|
||||||
FontSize="30"
|
FontSize="30"
|
||||||
Style="{StaticResource PageTitle}"
|
Style="{StaticResource PageTitle}"
|
||||||
Text="{DynamicResource pluginStore}"
|
Text="{DynamicResource pluginStore}"
|
||||||
|
|
@ -46,13 +49,13 @@
|
||||||
<DockPanel
|
<DockPanel
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Margin="5 24 0 0">
|
Margin="5,24,0,0">
|
||||||
|
|
||||||
<TextBox
|
<TextBox
|
||||||
Name="PluginStoreFilterTextbox"
|
Name="PluginStoreFilterTextbox"
|
||||||
Width="150"
|
Width="150"
|
||||||
Height="34"
|
Height="34"
|
||||||
Margin="0 0 26 0"
|
Margin="0,0,26,0"
|
||||||
HorizontalAlignment="Right"
|
HorizontalAlignment="Right"
|
||||||
ContextMenu="{StaticResource TextBoxContextMenu}"
|
ContextMenu="{StaticResource TextBoxContextMenu}"
|
||||||
DockPanel.Dock="Right"
|
DockPanel.Dock="Right"
|
||||||
|
|
@ -72,7 +75,7 @@
|
||||||
Stretch="None">
|
Stretch="None">
|
||||||
<VisualBrush.Visual>
|
<VisualBrush.Visual>
|
||||||
<Label
|
<Label
|
||||||
Padding="10 0 0 0"
|
Padding="10,0,0,0"
|
||||||
Content="{DynamicResource searchplugin}"
|
Content="{DynamicResource searchplugin}"
|
||||||
Foreground="{DynamicResource CustomContextDisabled}" />
|
Foreground="{DynamicResource CustomContextDisabled}" />
|
||||||
</VisualBrush.Visual>
|
</VisualBrush.Visual>
|
||||||
|
|
@ -94,8 +97,8 @@
|
||||||
</TextBox>
|
</TextBox>
|
||||||
<Button
|
<Button
|
||||||
Height="34"
|
Height="34"
|
||||||
Margin="0 5 10 5"
|
Margin="0,5,10,5"
|
||||||
Padding="12 4"
|
Padding="12,4"
|
||||||
HorizontalAlignment="Right"
|
HorizontalAlignment="Right"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Command="{Binding RefreshExternalPluginsCommand}"
|
Command="{Binding RefreshExternalPluginsCommand}"
|
||||||
|
|
@ -108,8 +111,8 @@
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Grid.ColumnSpan="2"
|
Grid.ColumnSpan="2"
|
||||||
Margin="4 0 0 0"
|
Margin="4,0,0,0"
|
||||||
Padding="0 0 18 0"
|
Padding="0,0,18,0"
|
||||||
FontSize="14"
|
FontSize="14"
|
||||||
ItemContainerStyle="{StaticResource StoreList}"
|
ItemContainerStyle="{StaticResource StoreList}"
|
||||||
ItemsSource="{Binding Source={StaticResource PluginStoreCollectionView}}"
|
ItemsSource="{Binding Source={StaticResource PluginStoreCollectionView}}"
|
||||||
|
|
@ -124,7 +127,7 @@
|
||||||
<ItemsPanelTemplate>
|
<ItemsPanelTemplate>
|
||||||
<wpftk:VirtualizingWrapPanel
|
<wpftk:VirtualizingWrapPanel
|
||||||
x:Name="ItemWrapPanel"
|
x:Name="ItemWrapPanel"
|
||||||
Margin="0 0 0 10"
|
Margin="0,0,0,10"
|
||||||
ItemSize="216,184"
|
ItemSize="216,184"
|
||||||
MouseWheelDelta="48"
|
MouseWheelDelta="48"
|
||||||
Orientation="Vertical"
|
Orientation="Vertical"
|
||||||
|
|
@ -143,7 +146,7 @@
|
||||||
<Grid>
|
<Grid>
|
||||||
<StackPanel Orientation="Vertical">
|
<StackPanel Orientation="Vertical">
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="2 0 0 10"
|
Margin="2,0,0,10"
|
||||||
VerticalAlignment="Top"
|
VerticalAlignment="Top"
|
||||||
FontSize="16"
|
FontSize="16"
|
||||||
FontWeight="Bold"
|
FontWeight="Bold"
|
||||||
|
|
@ -159,7 +162,7 @@
|
||||||
</GroupStyle.ContainerStyle>
|
</GroupStyle.ContainerStyle>
|
||||||
<GroupStyle.Panel>
|
<GroupStyle.Panel>
|
||||||
<ItemsPanelTemplate>
|
<ItemsPanelTemplate>
|
||||||
<VirtualizingStackPanel Orientation="{Binding Orientation, Mode=OneWay}" />
|
<VirtualizingStackPanel />
|
||||||
</ItemsPanelTemplate>
|
</ItemsPanelTemplate>
|
||||||
</GroupStyle.Panel>
|
</GroupStyle.Panel>
|
||||||
</GroupStyle>
|
</GroupStyle>
|
||||||
|
|
@ -231,10 +234,10 @@
|
||||||
<VirtualizingStackPanel
|
<VirtualizingStackPanel
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Margin="5 0 0 0"
|
Margin="5,0,0,0"
|
||||||
Orientation="Horizontal">
|
Orientation="Horizontal">
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="0 0 5 0"
|
Margin="0,0,5,0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
FontSize="14"
|
FontSize="14"
|
||||||
FontWeight="Bold"
|
FontWeight="Bold"
|
||||||
|
|
@ -253,9 +256,12 @@
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Margin="5 4 0 0"
|
Margin="5,4,0,0"
|
||||||
TextWrapping="Wrap">
|
TextWrapping="Wrap">
|
||||||
<Hyperlink Foreground="{DynamicResource Color04B}" NavigateUri="{Binding Website}" RequestNavigate="Hyperlink_OnRequestNavigate">
|
<Hyperlink
|
||||||
|
Foreground="{DynamicResource Color04B}"
|
||||||
|
NavigateUri="{Binding Website}"
|
||||||
|
RequestNavigate="Hyperlink_OnRequestNavigate">
|
||||||
<Run FontSize="12" Text="{Binding Author, Mode=OneWay}" />
|
<Run FontSize="12" Text="{Binding Author, Mode=OneWay}" />
|
||||||
</Hyperlink>
|
</Hyperlink>
|
||||||
</TextBlock>
|
</TextBlock>
|
||||||
|
|
@ -264,40 +270,40 @@
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
Grid.RowSpan="2"
|
Grid.RowSpan="2"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Margin="20 0 0 0"
|
Margin="20,0,0,0"
|
||||||
HorizontalAlignment="Right"
|
HorizontalAlignment="Right"
|
||||||
Orientation="Horizontal">
|
Orientation="Horizontal">
|
||||||
<Button
|
<Button
|
||||||
MinHeight="42"
|
MinHeight="42"
|
||||||
Margin="5 0"
|
Margin="5,0"
|
||||||
Padding="15 5"
|
Padding="15,5"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
Command="{Binding ShowCommandQueryCommand}"
|
||||||
|
CommandParameter="install"
|
||||||
Content="{DynamicResource installbtn}"
|
Content="{DynamicResource installbtn}"
|
||||||
Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter='!'}"
|
Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter='!'}" />
|
||||||
Command="{Binding ShowCommandQueryCommand}"
|
|
||||||
CommandParameter="install" />
|
|
||||||
<Button
|
<Button
|
||||||
MinHeight="42"
|
MinHeight="42"
|
||||||
Margin="5 0"
|
Margin="5,0"
|
||||||
Padding="15 5"
|
Padding="15,5"
|
||||||
HorizontalAlignment="Right"
|
HorizontalAlignment="Right"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
Command="{Binding ShowCommandQueryCommand}"
|
||||||
|
CommandParameter="uninstall"
|
||||||
Content="{DynamicResource uninstallbtn}"
|
Content="{DynamicResource uninstallbtn}"
|
||||||
Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}}"
|
Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}}" />
|
||||||
Command="{Binding ShowCommandQueryCommand}"
|
|
||||||
CommandParameter="uninstall" />
|
|
||||||
<Button
|
<Button
|
||||||
MinHeight="42"
|
MinHeight="42"
|
||||||
Margin="5 0"
|
Margin="5,0"
|
||||||
Padding="15 5"
|
Padding="15,5"
|
||||||
HorizontalAlignment="Right"
|
HorizontalAlignment="Right"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
Command="{Binding ShowCommandQueryCommand}"
|
||||||
|
CommandParameter="update"
|
||||||
Content="{DynamicResource updatebtn}"
|
Content="{DynamicResource updatebtn}"
|
||||||
Style="{DynamicResource AccentButtonStyle}"
|
Style="{DynamicResource AccentButtonStyle}"
|
||||||
Visibility="{Binding LabelUpdate, Converter={StaticResource BoolToVisibilityConverter}}"
|
Visibility="{Binding LabelUpdate, Converter={StaticResource BoolToVisibilityConverter}}" />
|
||||||
Command="{Binding ShowCommandQueryCommand}"
|
|
||||||
CommandParameter="update" />
|
|
||||||
</VirtualizingStackPanel>
|
</VirtualizingStackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
</ui:Flyout>
|
</ui:Flyout>
|
||||||
|
|
@ -308,15 +314,15 @@
|
||||||
<Image
|
<Image
|
||||||
Width="32"
|
Width="32"
|
||||||
Height="32"
|
Height="32"
|
||||||
Margin="18 24 0 0"
|
Margin="18,24,0,0"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
RenderOptions.BitmapScalingMode="Fant"
|
RenderOptions.BitmapScalingMode="Fant"
|
||||||
Source="{Binding IcoPath, IsAsync=True}" />
|
Source="{Binding IcoPath, IsAsync=True}" />
|
||||||
<Border
|
<Border
|
||||||
x:Name="LabelUpdate"
|
x:Name="LabelUpdate"
|
||||||
Height="12"
|
Height="12"
|
||||||
Margin="10 24 0 0"
|
Margin="10,24,0,0"
|
||||||
Padding="6 2"
|
Padding="6,2"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
VerticalAlignment="Top"
|
VerticalAlignment="Top"
|
||||||
Background="#45BD59"
|
Background="#45BD59"
|
||||||
|
|
@ -325,7 +331,7 @@
|
||||||
Visibility="{Binding LabelUpdate, Converter={StaticResource BoolToVisibilityConverter}}" />
|
Visibility="{Binding LabelUpdate, Converter={StaticResource BoolToVisibilityConverter}}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="18 10 18 0"
|
Margin="18,10,18,0"
|
||||||
FontWeight="SemiBold"
|
FontWeight="SemiBold"
|
||||||
Foreground="{DynamicResource Color05B}"
|
Foreground="{DynamicResource Color05B}"
|
||||||
Text="{Binding Name}"
|
Text="{Binding Name}"
|
||||||
|
|
@ -333,8 +339,8 @@
|
||||||
ToolTip="{Binding Version}" />
|
ToolTip="{Binding Version}" />
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Height="60"
|
Height="60"
|
||||||
Margin="18 6 18 0"
|
Margin="18,6,18,0"
|
||||||
Padding="0 0 0 10"
|
Padding="0,0,0,10"
|
||||||
FontSize="12"
|
FontSize="12"
|
||||||
Foreground="{DynamicResource Color04B}"
|
Foreground="{DynamicResource Color04B}"
|
||||||
Text="{Binding Description, Mode=OneWay}"
|
Text="{Binding Description, Mode=OneWay}"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue