Browse Source

Merge pull request #10289 from AvaloniaUI/scroll_inertia_attached_getters

pull/10299/head
Wiesław Šoltés 3 years ago
committed by GitHub
parent
commit
84e482a43b
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 16
      src/Avalonia.Controls/ScrollViewer.cs
  2. 2
      src/Avalonia.Themes.Fluent/Controls/ListBox.xaml

16
src/Avalonia.Controls/ScrollViewer.cs

@ -775,6 +775,22 @@ namespace Avalonia.Controls
control.SetValue(VerticalScrollBarVisibilityProperty, value); control.SetValue(VerticalScrollBarVisibilityProperty, value);
} }
/// <summary>
/// Gets whether scroll gestures should include inertia in their behavior and value.
/// </summary>
public static bool GetIsScrollInertiaEnabled(Control control)
{
return control.GetValue(IsScrollInertiaEnabledProperty);
}
/// <summary>
/// Sets whether scroll gestures should include inertia in their behavior and value.
/// </summary>
public static void SetIsScrollInertiaEnabled(Control control, bool value)
{
control.SetValue(IsScrollInertiaEnabledProperty, value);
}
/// <inheritdoc/> /// <inheritdoc/>
public void RegisterAnchorCandidate(Control element) public void RegisterAnchorCandidate(Control element)
{ {

2
src/Avalonia.Themes.Fluent/Controls/ListBox.xaml

@ -19,6 +19,7 @@
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" /> <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" /> <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
<Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" /> <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
<Setter Property="ScrollViewer.IsScrollInertiaEnabled" Value="True" />
<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" /> <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
@ -34,6 +35,7 @@
HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}" HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}" VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}" IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
IsScrollInertiaEnabled="{TemplateBinding (ScrollViewer.IsScrollInertiaEnabled)}"
AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"> AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
<ItemsPresenter Name="PART_ItemsPresenter" <ItemsPresenter Name="PART_ItemsPresenter"
AreVerticalSnapPointsRegular="{TemplateBinding AreVerticalSnapPointsRegular}" AreVerticalSnapPointsRegular="{TemplateBinding AreVerticalSnapPointsRegular}"

Loading…
Cancel
Save