Skip to content

Commit 072d55c

Browse files
Jack251970Jack251970
committed
Improve ListBox scroll viewer
1 parent 5ed53a9 commit 072d55c

File tree

2 files changed

+13
-121
lines changed

2 files changed

+13
-121
lines changed

‎Flow.Launcher/Resources/SettingWindowStyle.xaml‎

Lines changed: 12 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -390,34 +390,27 @@
390390
<Setter Property="Background" Value="{DynamicResource Color01B}" />
391391
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
392392
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
393-
<Setter Property="Margin" Value="{DynamicResource ResultMargin}" />
394393
<Setter Property="Padding" Value="0 0 0 0" />
395394
<Setter Property="IsTabStop" Value="False" />
396395
<Setter Property="KeyboardNavigation.TabNavigation" Value="Once" />
397396
<Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
398397
<Setter Property="ui:FocusVisualHelper.UseSystemFocusVisuals" Value="{DynamicResource UseSystemFocusVisuals}" />
398+
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
399+
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
400+
<Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
401+
<Setter Property="ScrollViewer.PanningMode" Value="Both" />
399402
<Setter Property="Template">
400403
<Setter.Value>
401404
<ControlTemplate TargetType="ListBox">
402405
<ui:ScrollViewerEx
403-
x:Name="ListBoxScrollViewer"
404-
Focusable="False"
405-
Template="{DynamicResource ScrollViewerControlTemplate}">
406-
<ui:ScrollViewerEx.Style>
407-
<Style TargetType="ui:ScrollViewerEx">
408-
<Style.Triggers>
409-
<Trigger Property="ComputedVerticalScrollBarVisibility" Value="Visible">
410-
<Setter Property="Margin" Value="0 0 0 0" />
411-
<Setter Property="Padding" Value="0 0 0 0" />
412-
</Trigger>
413-
<Trigger Property="ComputedVerticalScrollBarVisibility" Value="Collapsed">
414-
<Setter Property="Margin" Value="0 0 0 0" />
415-
<Setter Property="Padding" Value="0 0 0 0" />
416-
</Trigger>
417-
</Style.Triggers>
418-
</Style>
419-
</ui:ScrollViewerEx.Style>
420-
<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
406+
x:Name="ScrollViewer"
407+
AutoHideScrollBars="{TemplateBinding ui:ScrollViewerHelper.AutoHideScrollBars}"
408+
Focusable="false"
409+
HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
410+
IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
411+
KeyboardNavigation.TabNavigation="{TemplateBinding KeyboardNavigation.TabNavigation}"
412+
VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
413+
<ItemsPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
421414
</ui:ScrollViewerEx>
422415
</ControlTemplate>
423416
</Setter.Value>
@@ -444,108 +437,6 @@
444437
</Style.Triggers>
445438
</Style>
446439

447-
<!--<Style x:Key="StoreListStyle" TargetType="ListBox">
448-
<Setter Property="Padding" Value="0 0 0 10" />
449-
<Setter Property="IsTabStop" Value="False" />
450-
<Setter Property="KeyboardNavigation.TabNavigation" Value="Once" />
451-
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
452-
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
453-
<Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
454-
<Setter Property="ScrollViewer.PanningMode" Value="Both" />
455-
<Setter Property="UseSystemFocusVisuals" Value="{DynamicResource UseSystemFocusVisuals}" />
456-
<Setter Property="FocusVisualMargin" Value="-2" />
457-
<Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
458-
<Setter Property="ui:ScrollViewerHelper.AutoHideScrollBars" Value="{DynamicResource AutoHideScrollBars}" />
459-
<Setter Property="Background" Value="{DynamicResource Color01B}" />
460-
<Setter Property="ItemsPanel">
461-
<Setter.Value>
462-
<ItemsPanelTemplate>
463-
<wpftk:VirtualizingWrapPanel
464-
x:Name="ItemWrapPanel"
465-
Margin="0 0 0 10"
466-
ItemSize="216,184"
467-
MouseWheelDelta="48"
468-
ScrollLineDelta="16"
469-
SpacingMode="None"
470-
StretchItems="True" />
471-
</ItemsPanelTemplate>
472-
</Setter.Value>
473-
</Setter>
474-
<Setter Property="Template">
475-
<Setter.Value>
476-
<ControlTemplate TargetType="ui:GridView">
477-
<Border
478-
Background="{TemplateBinding Background}"
479-
BorderBrush="{TemplateBinding BorderBrush}"
480-
BorderThickness="{TemplateBinding BorderThickness}"
481-
CornerRadius="{TemplateBinding CornerRadius}"
482-
SnapsToDevicePixels="True">
483-
<ui:ScrollViewerEx
484-
x:Name="ScrollViewer"
485-
AutoHideScrollBars="{TemplateBinding ui:ScrollViewerHelper.AutoHideScrollBars}"
486-
Focusable="false"
487-
HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
488-
IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
489-
KeyboardNavigation.TabNavigation="{TemplateBinding KeyboardNavigation.TabNavigation}"
490-
VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
491-
<Grid>
492-
<Grid.RowDefinitions>
493-
<RowDefinition Height="Auto" />
494-
<RowDefinition Height="*" />
495-
<RowDefinition Height="Auto" />
496-
</Grid.RowDefinitions>
497-
<ContentPresenter
498-
Grid.Row="0"
499-
HorizontalAlignment="Stretch"
500-
VerticalAlignment="Stretch"
501-
Content="{TemplateBinding Header}"
502-
ContentTemplate="{TemplateBinding HeaderTemplate}" />
503-
<ItemsPresenter
504-
Grid.Row="1"
505-
Margin="{TemplateBinding Padding}"
506-
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
507-
<ContentPresenter
508-
Grid.Row="2"
509-
HorizontalAlignment="Stretch"
510-
VerticalAlignment="Stretch"
511-
Content="{TemplateBinding Footer}"
512-
ContentTemplate="{TemplateBinding FooterTemplate}" />
513-
</Grid>
514-
</ui:ScrollViewerEx>
515-
</Border>
516-
<ControlTemplate.Triggers>
517-
<MultiTrigger>
518-
<MultiTrigger.Conditions>
519-
<Condition Property="IsGrouping" Value="True" />
520-
<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="False" />
521-
</MultiTrigger.Conditions>
522-
<Setter Property="ScrollViewer.CanContentScroll" Value="False" />
523-
</MultiTrigger>
524-
</ControlTemplate.Triggers>
525-
</ControlTemplate>
526-
</Setter.Value>
527-
</Setter>
528-
<Style.Triggers>
529-
<DataTrigger Binding="{Binding RelativeSource={x:Static RelativeSource.Self}, Path=Items.Count}" Value="0">
530-
<Setter Property="Template">
531-
<Setter.Value>
532-
<ControlTemplate>
533-
<Grid Margin="20 0 0 0">
534-
<StackPanel>
535-
<TextBlock
536-
Margin="0 20 0 4"
537-
FontWeight="Bold"
538-
Foreground="{DynamicResource Color05B}"
539-
Text="{DynamicResource searchplugin_Noresult_Title}" />
540-
<TextBlock Foreground="{DynamicResource Color05B}" Text="{DynamicResource searchplugin_Noresult}" />
541-
</StackPanel>
542-
</Grid>
543-
</ControlTemplate>
544-
</Setter.Value>
545-
</Setter>
546-
</DataTrigger>
547-
</Style.Triggers>
548-
</Style>-->
549440
<!-- For Tab Header responsive Width -->
550441
<Style x:Key="NavTabControl" TargetType="{x:Type TabControl}">
551442
<Setter Property="Padding" Value="0" />

‎Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@
131131
Grid.ColumnSpan="2"
132132
Margin="4 0 0 0"
133133
Padding="0 0 18 0"
134+
ui:ScrollViewerHelper.AutoHideScrollBars="True"
134135
FontSize="14"
135136
ItemContainerStyle="{StaticResource StoreList}"
136137
ItemsSource="{Binding Source={StaticResource PluginStoreCollectionView}}"

0 commit comments

Comments
 (0)