Make HorizontalMove and VerticalMove in SplitBase abstract and separa…

…te implementation specific to ContentSizer

Microsoft.Toolkit.Uwp.UI.Controls.Layout/ContentSizer/ContentSizer.Events.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.Toolkit.Uwp.UI;
+using Windows.UI.Core;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Input;
@@ -54,5 +55,50 @@ protected override void OnManipulationDelta(ManipulationDeltaRoutedEventArgs e)
 
             base.OnManipulationDelta(e);
         }
+
+        /// <inheritdoc/>
+        protected override bool HorizontalMove(double horizontalChange)
+        {
+            if (TargetControl == null)
+            {
+                return true;
+            }
+
+            horizontalChange = IsDragInverted ? -horizontalChange : horizontalChange;
+
+            if (!IsValidWidth(TargetControl, horizontalChange, ActualWidth))
+            {
+                return true;
+            }
+
+            TargetControl.Width += horizontalChange;
+
+            GripperCursor = CoreCursorType.SizeWestEast;
+
+            return false;
+        }
+
+        /// <inheritdoc/>
+        protected override bool VerticalMove(double verticalChange)
+        {
+            if (TargetControl == null)
+            {
+                return true;
+            }
+
+            verticalChange = IsDragInverted ? -verticalChange : verticalChange;
+
+            if (!IsValidHeight(TargetControl, verticalChange, ActualHeight))
+            {
+                return true;
+            }
+
+            // Do we need our ContentResizeDirection to be 4 way? Maybe 'Auto' would check the horizontal/vertical alignment of the target???
+            TargetControl.Height += verticalChange;
+
+            GripperCursor = CoreCursorType.SizeNorthSouth;
+
+            return false;
+        }
     }
 }

Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Events.cs

@@ -118,7 +118,8 @@ protected override void OnManipulationDelta(ManipulationDeltaRoutedEventArgs e)
             base.OnManipulationDelta(e);
         }
 
-        private new bool VerticalMove(double verticalChange)
+        /// <inheritdoc/>
+        protected override bool VerticalMove(double verticalChange)
         {
             if (CurrentRow == null || SiblingRow == null)
             {
@@ -184,7 +185,8 @@ protected override void OnManipulationDelta(ManipulationDeltaRoutedEventArgs e)
             return false;
         }
 
-        private new bool HorizontalMove(double horizontalChange)
+        /// <inheritdoc/>
+        protected override bool HorizontalMove(double horizontalChange)
         {
             if (CurrentColumn == null || SiblingColumn == null)
             {

Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/SplitBase.cs

@@ -14,7 +14,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// Base class for splitting/resizing controls
     /// </summary>
     [ContentProperty(Name = nameof(Content))]
-    public partial class SplitBase : Control
+    public abstract partial class SplitBase : Control
     {
         /// <summary>
         /// Check for new requested vertical size is valid or not
@@ -153,6 +153,7 @@ public ContentResizeDirection ResizeDirection
         public static readonly DependencyProperty ResizeDirectionProperty =
             DependencyProperty.Register(nameof(ResizeDirection), typeof(ContentResizeDirection), typeof(SplitBase), new PropertyMetadata(ContentResizeDirection.Vertical));
 
+        //// TODO: Move to ContentSizer
         /// <summary>
         /// Gets or sets the control that the <see cref="SplitBase"/> is resizing. Be default, this will be the visual ancestor of the <see cref="SplitBase"/>.
         /// </summary>
@@ -186,6 +187,7 @@ private static void OnTargetControlChanged(DependencyObject d, DependencyPropert
             }
         }
 
+        //// TODO: Check if this is ContentSizer only property
         /// <summary>
         /// Gets or sets a value indicating whether the <see cref="SplitBase"/> control is resizing in the opposite direction.
         /// </summary>
@@ -202,57 +204,18 @@ public bool IsDragInverted
             DependencyProperty.Register(nameof(IsDragInverted), typeof(bool), typeof(SplitBase), new PropertyMetadata(false));
 
         /// <summary>
-        /// Process requested vertical resizing.
+        /// Method to process the requested horizontal resizing.
         /// </summary>
-        /// <param name="verticalChange">The requested vertical change</param>
-        /// <returns><see cref="bool"/> result of processed vertical change</returns>
-        protected bool VerticalMove(double verticalChange)
-        {
-            if (TargetControl == null)
-            {
-                return true;
-            }
-
-            verticalChange = IsDragInverted ? -verticalChange : verticalChange;
-
-            if (!IsValidHeight(TargetControl, verticalChange, ActualHeight))
-            {
-                return true;
-            }
-
-            // Do we need our ContentResizeDirection to be 4 way? Maybe 'Auto' would check the horizontal/vertical alignment of the target???
-            TargetControl.Height += verticalChange;
-
-            GripperCursor = CoreCursorType.SizeNorthSouth;
-
-            return false;
-        }
+        /// <param name="horizontalChange">The requested horizontal change</param>
+        /// <returns><see cref="bool"/> indicates if the change was made</returns>
+        protected abstract bool HorizontalMove(double horizontalChange);
 
         /// <summary>
-        /// Process requested horizontal resizing.
+        /// Method to process the requested vertical resizing.
         /// </summary>
-        /// <param name="horizontalChange">The requested horizontal change</param>
-        /// <returns><see cref="bool"/> result of processed horizontal change</returns>
-        protected bool HorizontalMove(double horizontalChange)
-        {
-            if (TargetControl == null)
-            {
-                return true;
-            }
-
-            horizontalChange = IsDragInverted ? -horizontalChange : horizontalChange;
-
-            if (!IsValidWidth(TargetControl, horizontalChange, ActualWidth))
-            {
-                return true;
-            }
-
-            TargetControl.Width += horizontalChange;
-
-            GripperCursor = CoreCursorType.SizeWestEast;
-
-            return false;
-        }
+        /// <param name="verticalChange">The requested vertical change</param>
+        /// <returns><see cref="bool"/> indicates if the change was made</returns>
+        protected abstract bool VerticalMove(double verticalChange);
 
         /// <summary>
         /// Processes KeyUp event