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

Change Cancontentscroll in general tab / add flyout hidden in uninstall and update button

Browse source
This commit is contained in:
DB p 2022-11-09 12:38:43 +09:00
parent ad77ecdf02
commit 07f82efceb
2 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Flow.Launcher/SettingWindow.xaml
View file

@ -607,10 +607,10 @@
<ScrollViewer <ScrollViewer
Margin="0,0,0,0" Margin="0,0,0,0"
Background="{DynamicResource Color01B}" Background="{DynamicResource Color01B}"
CanContentScroll="True" CanContentScroll="False"
VirtualizingPanel.ScrollUnit="Pixel" VirtualizingPanel.ScrollUnit="Pixel"
VirtualizingStackPanel.IsVirtualizing="True"> VirtualizingStackPanel.IsVirtualizing="True">
<StackPanel Margin="5,18,25,30" Orientation="Vertical"> <VirtualizingStackPanel Margin="5,18,25,30" Orientation="Vertical">
<TextBlock <TextBlock
Grid.Row="2" Grid.Row="2"
Margin="0,5,0,5" Margin="0,5,0,5"
@ -917,7 +917,7 @@
</TextBlock> </TextBlock>
</ItemsControl> </ItemsControl>
</Border> </Border>
</StackPanel> </VirtualizingStackPanel>
</ScrollViewer> </ScrollViewer>
</TabItem> </TabItem>
<TabItem KeyDown="OnPluginSettingKeydown"> <TabItem KeyDown="OnPluginSettingKeydown">
@ -1396,7 +1396,6 @@
FontSize="14" FontSize="14"
KeyDown="PluginStoreFilterTxb_OnKeyDown" KeyDown="PluginStoreFilterTxb_OnKeyDown"
LostFocus="RefreshPluginStoreEventHandler" LostFocus="RefreshPluginStoreEventHandler"
Text="" Text=""
TextAlignment="Left" TextAlignment="Left"
ToolTip="{DynamicResource searchpluginToolTip}" ToolTip="{DynamicResource searchpluginToolTip}"
@ -1517,8 +1516,8 @@
HorizontalContentAlignment="Stretch" HorizontalContentAlignment="Stretch"
VerticalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
BorderThickness="0" BorderThickness="0"
FocusVisualStyle="{StaticResource StoreItemFocusVisualStyleKey}" Click="StoreListItem_Click"
Click="StoreListItem_Click"> FocusVisualStyle="{StaticResource StoreItemFocusVisualStyleKey}">
<ui:FlyoutService.Flyout> <ui:FlyoutService.Flyout>
<ui:Flyout x:Name="InstallFlyout" Placement="Bottom"> <ui:Flyout x:Name="InstallFlyout" Placement="Bottom">
<Grid MinWidth="200"> <Grid MinWidth="200">
@ -1679,8 +1678,8 @@
Margin="0,0,0,0" Margin="0,0,0,0"
Padding="6,0,24,0" Padding="6,0,24,0"
ScrollViewer.CanContentScroll="True" ScrollViewer.CanContentScroll="True"
VirtualizingStackPanel.ScrollUnit="Pixel" VirtualizingStackPanel.IsVirtualizing="True"
VirtualizingStackPanel.IsVirtualizing="True"> VirtualizingStackPanel.ScrollUnit="Pixel">
<Grid Margin="0,0,0,0"> <Grid Margin="0,0,0,0">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="0" /> <RowDefinition Height="0" />
@ -2257,8 +2256,8 @@
Margin="0,0,0,0" Margin="0,0,0,0"
Padding="0,0,6,0" Padding="0,0,6,0"
ScrollViewer.CanContentScroll="True" ScrollViewer.CanContentScroll="True"
VirtualizingStackPanel.ScrollUnit="Pixel" VirtualizingStackPanel.IsVirtualizing="True"
VirtualizingStackPanel.IsVirtualizing="True"> VirtualizingStackPanel.ScrollUnit="Pixel">
<Border> <Border>
<Grid Margin="5,18,18,10"> <Grid Margin="5,18,18,10">
<Grid.RowDefinitions> <Grid.RowDefinitions>
@ -2553,8 +2552,8 @@
Margin="0,0,0,0" Margin="0,0,0,0"
Padding="5,0,24,0" Padding="5,0,24,0"
ScrollViewer.CanContentScroll="True" ScrollViewer.CanContentScroll="True"
VirtualizingStackPanel.ScrollUnit="Pixel" VirtualizingStackPanel.IsVirtualizing="True"
VirtualizingStackPanel.IsVirtualizing="True"> VirtualizingStackPanel.ScrollUnit="Pixel">
<Border> <Border>
<StackPanel> <StackPanel>
@ -2727,8 +2726,8 @@
Margin="0,0,0,0" Margin="0,0,0,0"
Background="{DynamicResource Color01B}" Background="{DynamicResource Color01B}"
ScrollViewer.CanContentScroll="True" ScrollViewer.CanContentScroll="True"
VirtualizingStackPanel.ScrollUnit="Pixel" VirtualizingStackPanel.IsVirtualizing="True"
VirtualizingStackPanel.IsVirtualizing="True"> VirtualizingStackPanel.ScrollUnit="Pixel">
<StackPanel Margin="5,14,25,30" Orientation="Vertical"> <StackPanel Margin="5,14,25,30" Orientation="Vertical">
<TextBlock <TextBlock
Grid.Row="2" Grid.Row="2"

12
Flow.Launcher/SettingWindow.xaml.cs
View file

@ -340,18 +340,30 @@ namespace Flow.Launcher
viewModel.DisplayPluginQuery($"uninstall {name}", PluginManager.GetPluginForId("9f8f9b14-2518-4907-b211-35ab6290dee7")); viewModel.DisplayPluginQuery($"uninstall {name}", PluginManager.GetPluginForId("9f8f9b14-2518-4907-b211-35ab6290dee7"));
} }
} }
private void OnExternalPluginUninstallClick(object sender, RoutedEventArgs e) private void OnExternalPluginUninstallClick(object sender, RoutedEventArgs e)
{ {
if (storeClickedButton != null)
{
FlyoutService.GetFlyout(storeClickedButton).Hide();
}
if (sender is Button { DataContext: PluginStoreItemViewModel plugin }) if (sender is Button { DataContext: PluginStoreItemViewModel plugin })
viewModel.DisplayPluginQuery($"uninstall {plugin.Name}", PluginManager.GetPluginForId("9f8f9b14-2518-4907-b211-35ab6290dee7")); viewModel.DisplayPluginQuery($"uninstall {plugin.Name}", PluginManager.GetPluginForId("9f8f9b14-2518-4907-b211-35ab6290dee7"));
} }
private void OnExternalPluginUpdateClick(object sender, RoutedEventArgs e) private void OnExternalPluginUpdateClick(object sender, RoutedEventArgs e)
{ {
if (storeClickedButton != null)
{
FlyoutService.GetFlyout(storeClickedButton).Hide();
}
if (sender is Button { DataContext: PluginStoreItemViewModel plugin }) if (sender is Button { DataContext: PluginStoreItemViewModel plugin })
viewModel.DisplayPluginQuery($"update {plugin.Name}", PluginManager.GetPluginForId("9f8f9b14-2518-4907-b211-35ab6290dee7")); viewModel.DisplayPluginQuery($"update {plugin.Name}", PluginManager.GetPluginForId("9f8f9b14-2518-4907-b211-35ab6290dee7"));
} }
private void window_MouseDown(object sender, MouseButtonEventArgs e) /* for close hotkey popup */ private void window_MouseDown(object sender, MouseButtonEventArgs e) /* for close hotkey popup */