Skip to content

Allow horizontal scrolling if the horizontal scrollbar is not disabled and the vertical scrollbar is disabled #3174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 24, 2020
Merged

Allow horizontal scrolling if the horizontal scrollbar is not disabled and the vertical scrollbar is disabled #3174

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
498080e
Fixes #3170 - A horizontal scroll happens if the mouse has a horizont…
skendrot Mar 18, 2020
3850327
Only scroll opposite if the scroll happened from a horizontal scroll
skendrot Mar 18, 2020
6607c4e
Correct or statement
skendrot Mar 19, 2020
86cd678
Merge branch 'master' into DataGridHorizontalScroll
skendrot Mar 19, 2020
4a5fb01
Merge branch 'master' into DataGridHorizontalScroll
michael-hawker Mar 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -3721,7 +3724,7 @@ protected override void OnPointerWheelChanged(PointerRoutedEventArgs e)
}

double offsetDelta = -pointerPoint.Properties.MouseWheelDelta / DATAGRID_mouseWheelDeltaDivider;
if (isForHorizontalScroll)
if (isForHorizontalScroll && pointerPoint.Properties.IsHorizontalMouseWheel)
{
offsetDelta *= -1.0;
}
Expand Down