Fixes CommunityToolkit#3170 - A horizontal scroll happens if the mous…

…e has a horizontal wheel OR if the horizontal scrollbar is not disabled AND the vertical scrollbar IS disabled
skendrot · Mar 18, 2020 · 498080e · 498080e
1 parent ef65272
commit 498080e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs
@@ -3712,7 +3712,10 @@ protected override void OnPointerWheelChanged(PointerRoutedEventArgs e)
             if (!e.Handled)
             {
                 PointerPoint pointerPoint = e.GetCurrentPoint(this);
-                bool isForHorizontalScroll = pointerPoint.Properties.IsHorizontalMouseWheel;
+
+                // A horizontal scroll happens if the mouse has a horizontal wheel OR if the horizontal scrollbar is not disabled AND the vertical scrollbar IS disabled
+                bool isForHorizontalScroll = pointerPoint.Properties.IsHorizontalMouseWheel |
+                    (this.HorizontalScrollBarVisibility != ScrollBarVisibility.Disabled && this.VerticalScrollBarVisibility == ScrollBarVisibility.Disabled);
 
                 if ((isForHorizontalScroll && this.HorizontalScrollBarVisibility == ScrollBarVisibility.Disabled) ||
                     (!isForHorizontalScroll && this.VerticalScrollBarVisibility == ScrollBarVisibility.Disabled))