Merge pull request AvaloniaUI#474 from VitalElement/IScrollableUpdates

implemented ScrollSize from IScrollable.
QuantumDeveloper · Mar 17, 2016 · c4f7de1 · c4f7de1
2 parents 8e6bbf6 + 4107a59
commit c4f7de1
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 5 deletions.
diff --git a/samples/XamlTestApplicationPcl/TestScrollable.cs b/samples/XamlTestApplicationPcl/TestScrollable.cs
@@ -37,6 +37,22 @@ Size IScrollable.Viewport
             get { return _viewport; }
         }
 
+        public Size ScrollSize
+        {
+            get
+            {
+                return new Size(double.PositiveInfinity, 1);
+            }
+        }
+
+        public Size PageScrollSize
+        {
+            get
+            {
+                return new Size(double.PositiveInfinity, Bounds.Height);
+            }
+        }
+
         protected override Size MeasureOverride(Size availableSize)
         {
             using (var line = new FormattedText(

diff --git a/src/Perspex.Controls/Presenters/ScrollContentPresenter.cs b/src/Perspex.Controls/Presenters/ScrollContentPresenter.cs
@@ -220,11 +220,24 @@ protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
         {
             if (Extent.Height > Viewport.Height)
             {
-                var y = Offset.Y + (-e.Delta.Y * 50);
-                y = Math.Max(y, 0);
-                y = Math.Min(y, Extent.Height - Viewport.Height);
-                Offset = new Vector(Offset.X, y);
-                e.Handled = true;
+                var scrollable = Child as IScrollable;
+
+                if (scrollable != null)
+                {                    
+                    var y = Offset.Y + (-e.Delta.Y * scrollable.ScrollSize.Height);
+                    y = Math.Max(y, 0);
+                    y = Math.Min(y, Extent.Height - Viewport.Height);
+                    Offset = new Vector(Offset.X, y);
+                    e.Handled = true;
+                }
+                else
+                {
+                    var y = Offset.Y + (-e.Delta.Y * 50);
+                    y = Math.Max(y, 0);
+                    y = Math.Min(y, Extent.Height - Viewport.Height);
+                    Offset = new Vector(Offset.X, y);
+                    e.Handled = true;
+                }
             }
         }
 

diff --git a/src/Perspex.Controls/Primitives/IScrollable.cs b/src/Perspex.Controls/Primitives/IScrollable.cs
@@ -40,5 +40,15 @@ public interface IScrollable
         /// Gets the size of the viewport, in logical units.
         /// </summary>
         Size Viewport { get; }
+
+        /// <summary>
+        /// Gets the size to scroll by, in logical units.
+        /// </summary>
+        Size ScrollSize { get; }
+
+        /// <summary>
+        /// Gets the size to page by, in logical units.
+        /// </summary>
+        Size PageScrollSize { get; }
     }
 }
diff --git a/tests/Perspex.Controls.UnitTests/Presenters/ScrollContentPresenterTests_IScrollable.cs b/tests/Perspex.Controls.UnitTests/Presenters/ScrollContentPresenterTests_IScrollable.cs
@@ -208,6 +208,22 @@ public Size Viewport
                 }
             }
 
+            public Size ScrollSize
+            {
+                get
+                {
+                    return new Size(double.PositiveInfinity, 1);
+                }
+            }
+
+            public Size PageScrollSize
+            {
+                get
+                {
+                    return new Size(double.PositiveInfinity, Viewport.Height);
+                }
+            }
+
             protected override Size MeasureOverride(Size availableSize)
             {
                 AvailableSize = availableSize;