Merge branch 'master' into revert-public-ctors-removal

samples/ControlCatalog/Pages/ScrollViewerPage.xaml

@@ -9,6 +9,7 @@
     <Grid ColumnDefinitions="Auto, *">
       <StackPanel Orientation="Vertical" Spacing="4">
         <ToggleSwitch IsChecked="{Binding AllowAutoHide}" Content="Allow auto hide" />
+        <ToggleSwitch IsChecked="{Binding EnableInertia}" Content="Enable Inertia" />
 
         <StackPanel Orientation="Vertical" Spacing="4">
           <TextBlock Text="Horizontal Scroll" />
@@ -24,6 +25,7 @@
       <ScrollViewer x:Name="ScrollViewer"
                     Grid.Column="1"
                     Width="400" Height="400"
+                    IsScrollInertiaEnabled="{Binding EnableInertia}"
                     AllowAutoHide="{Binding AllowAutoHide}"
                     HorizontalScrollBarVisibility="{Binding HorizontalScrollVisibility}"
                     VerticalScrollBarVisibility="{Binding VerticalScrollVisibility}">

samples/ControlCatalog/Pages/ScrollViewerPage.xaml.cs

@@ -9,6 +9,7 @@ namespace ControlCatalog.Pages
     public class ScrollViewerPageViewModel : ViewModelBase
     {
         private bool _allowAutoHide;
+        private bool _enableInertia;
         private ScrollBarVisibility _horizontalScrollVisibility;
         private ScrollBarVisibility _verticalScrollVisibility;
 
@@ -25,6 +26,7 @@ namespace ControlCatalog.Pages
             HorizontalScrollVisibility = ScrollBarVisibility.Auto;
             VerticalScrollVisibility = ScrollBarVisibility.Auto;
             AllowAutoHide = true;
+            EnableInertia = true;
         }
 
         public bool AllowAutoHide
@@ -33,6 +35,12 @@ namespace ControlCatalog.Pages
             set => this.RaiseAndSetIfChanged(ref _allowAutoHide, value);
         }
 
+        public bool EnableInertia
+        {
+            get => _enableInertia;
+            set => this.RaiseAndSetIfChanged(ref _enableInertia, value);
+        }
+
         public ScrollBarVisibility HorizontalScrollVisibility
         {
             get => _horizontalScrollVisibility;

src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs

@@ -27,7 +27,8 @@ namespace Avalonia.Input.GestureRecognizers
         // Movement per second
         private Vector _inertia;
         private ulong? _lastMoveTimestamp;
-        
+        private bool _isScrollInertiaEnabled;
+
         /// <summary>
         /// Defines the <see cref="CanHorizontallyScroll"/> property.
         /// </summary>
@@ -46,6 +47,15 @@ namespace Avalonia.Input.GestureRecognizers
                 o => o.CanVerticallyScroll,
                 (o, v) => o.CanVerticallyScroll = v);
 
+        /// <summary>
+        /// Defines the <see cref="IsScrollInertiaEnabled"/> property.
+        /// </summary>
+        public static readonly DirectProperty<ScrollGestureRecognizer, bool> IsScrollInertiaEnabledProperty =
+            AvaloniaProperty.RegisterDirect<ScrollGestureRecognizer, bool>(
+                nameof(IsScrollInertiaEnabled),
+                o => o.IsScrollInertiaEnabled,
+                (o, v) => o.IsScrollInertiaEnabled = v);
+
         /// <summary>
         /// Defines the <see cref="ScrollStartDistance"/> property.
         /// </summary>
@@ -72,6 +82,15 @@ namespace Avalonia.Input.GestureRecognizers
             get => _canVerticallyScroll;
             set => SetAndRaise(CanVerticallyScrollProperty, ref _canVerticallyScroll, value);
         }
+        
+        /// <summary>
+        /// Gets or sets whether the gesture should include inertia in it's behavior.
+        /// </summary>
+        public bool IsScrollInertiaEnabled
+        {
+            get => _isScrollInertiaEnabled;
+            set => SetAndRaise(IsScrollInertiaEnabledProperty, ref _isScrollInertiaEnabled, value);
+        }
 
         /// <summary>
         /// Gets or sets a value indicating the distance the pointer moves before scrolling is started
@@ -169,7 +188,8 @@ namespace Avalonia.Input.GestureRecognizers
                 if (_inertia == default
                     || e.Timestamp == 0
                     || _lastMoveTimestamp == 0
-                    || e.Timestamp - _lastMoveTimestamp > 200)
+                    || e.Timestamp - _lastMoveTimestamp > 200
+                    || !IsScrollInertiaEnabled)
                     EndGesture();
                 else
                 {

src/Avalonia.Controls/ScrollViewer.cs

@@ -221,6 +221,14 @@ namespace Avalonia.Controls
                 nameof(IsScrollChainingEnabled),
                 defaultValue: true);
 
+        /// <summary>
+        /// Defines the <see cref="IsScrollInertiaEnabled"/> property.
+        /// </summary>
+        public static readonly AttachedProperty<bool> IsScrollInertiaEnabledProperty =
+            AvaloniaProperty.RegisterAttached<ScrollViewer, Control, bool>(
+                nameof(IsScrollInertiaEnabled),
+                defaultValue: true);
+
         /// <summary>
         /// Defines the <see cref="ScrollChanged"/> event.
         /// </summary>
@@ -508,6 +516,15 @@ namespace Avalonia.Controls
             set => SetValue(IsScrollChainingEnabledProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets whether scroll gestures should include inertia in their behavior and value.
+        /// </summary>
+        public bool IsScrollInertiaEnabled
+        {
+            get => GetValue(IsScrollInertiaEnabledProperty);
+            set => SetValue(IsScrollInertiaEnabledProperty, value);
+        }
+
         /// <summary>
         /// Scrolls the content up one line.
         /// </summary>

src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml

@@ -43,7 +43,8 @@
                                   IsScrollChainingEnabled="{TemplateBinding IsScrollChainingEnabled}">
             <ScrollContentPresenter.GestureRecognizers>
               <ScrollGestureRecognizer CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
-                                       CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}" />
+                                       CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}"
+                                       IsScrollInertiaEnabled="{TemplateBinding IsScrollInertiaEnabled}"/>
             </ScrollContentPresenter.GestureRecognizers>
           </ScrollContentPresenter>
           <ScrollBar Name="PART_HorizontalScrollBar"