Skip to content

Port nested ScrollIntoView fix from 4.8 #4994

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 1 commit into from
Aug 17, 2021
Merged

Port nested ScrollIntoView fix from 4.8 #4994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 24 additions & 15 deletions src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/ScrollViewer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ public void InvalidateScrollInfo()
// We also don't invalidate measure if we are in the middle of the
// measure pass, as the ScrollViewer will already be updating the
// visibility of the autoscrollbars.
if(!MeasureInProgress &&
if(!MeasureInProgress &&
(!ArrangeInProgress || !InvalidatedMeasureFromArrange))
{
//
Expand Down Expand Up @@ -892,7 +892,7 @@ public event ScrollChangedEventHandler ScrollChanged
protected override void OnStylusSystemGesture(StylusSystemGestureEventArgs e)
{
// DevDiv:1139804
// Keep track of seeing a tap gesture so that we can use this information to
// Keep track of seeing a tap gesture so that we can use this information to
// make decisions about panning.
_seenTapGesture = e.SystemGesture == SystemGesture.Tap;
}
Expand Down Expand Up @@ -1175,7 +1175,7 @@ protected override Size MeasureOverride(Size constraint)
ScrollBarVisibility vsbv = VerticalScrollBarVisibility;
ScrollBarVisibility hsbv = HorizontalScrollBarVisibility;
Size desiredSize = new Size();

if (child != null)
{
bool etwTracingEnabled = EventTrace.IsEnabled(EventTrace.Keyword.KeywordGeneral, EventTrace.Level.Info);
Expand Down Expand Up @@ -1511,7 +1511,7 @@ private void OnPanningModeChanged()
PanningMode mode = PanningMode;

// Call InvalidateProperty for IsManipulationEnabledProperty
// to reset previous SetCurrentValueInternal if any.
// to reset previous SetCurrentValueInternal if any.
// Then call SetCurrentValueInternal to
// set the value of these properties if needed.
InvalidateProperty(IsManipulationEnabledProperty);
Expand Down Expand Up @@ -1742,7 +1742,7 @@ protected override void OnManipulationDelta(ManipulationDeltaEventArgs e)
// High precision touch devices can trigger a panning manipulation
// due to the low threshold we set for pan initiation. This may be
// undesirable since we may enter pan for what the system considers a
// tap. Panning should be contingent on a drag gesture as that is the
// tap. Panning should be contingent on a drag gesture as that is the
// most consistent with the system at large. So if we have seen a tap
// on our main input, we should cancel any panning.
if (_seenTapGesture)
Expand Down Expand Up @@ -1831,7 +1831,7 @@ private void ManipulateScroll(double delta, double cumulativeTranslation, bool i

if (DoubleUtil.AreClose(scrollableLength, 0))
{
// If the Scrollable length in this direction is 0,
// If the Scrollable length in this direction is 0,
// then we should neither scroll nor report the boundary feedback
unused = 0;
delta = 0;
Expand All @@ -1846,7 +1846,7 @@ private void ManipulateScroll(double delta, double cumulativeTranslation, bool i
}
else if (DoubleUtil.LessThan(delta, 0) && DoubleUtil.GreaterThan(unused, 0))
{
// If we are past the boundary in positive direction
// If we are past the boundary in positive direction
// and the delta is in negative direction,
// then compensate the delta from unused vector.
double newUnused = Math.Max(unused + delta, 0);
Expand All @@ -1855,7 +1855,7 @@ private void ManipulateScroll(double delta, double cumulativeTranslation, bool i
}
else if (DoubleUtil.GreaterThan(delta, 0) && DoubleUtil.LessThan(unused, 0))
{
// If we are past the boundary in negative direction
// If we are past the boundary in negative direction
// and the delta is in positive direction,
// then compensate the delta from unused vector.
double newUnused = Math.Min(unused + delta, 0);
Expand All @@ -1878,7 +1878,7 @@ private void ManipulateScroll(double delta, double cumulativeTranslation, bool i
if (!DoubleUtil.AreClose(delta, 0))
{
// if there is any delta left, then re-evalute the vertical offset
ScrollToVerticalOffset(_panningInfo.OriginalVerticalOffset -
ScrollToVerticalOffset(_panningInfo.OriginalVerticalOffset -
Math.Round(PanningRatio * cumulativeTranslation / _panningInfo.DeltaPerVerticalOffset));
}
_panningInfo.UnusedTranslation = new Vector(_panningInfo.UnusedTranslation.X, unused);
Expand All @@ -1903,7 +1903,7 @@ private bool IsPastInertialLimit()

/// <summary>
/// Scrolling due to manipulation can start only if there is a considerable delta
/// in the direction based on the mode. This method makes sure that the delta is
/// in the direction based on the mode. This method makes sure that the delta is
/// considerable.
/// </summary>
private bool CanStartScrollManipulation(Vector translation, out bool cancelManipulation)
Expand Down Expand Up @@ -2312,6 +2312,15 @@ private bool ExecuteNextCommand()

if (!rcNew.IsEmpty)
{
// clip the new rect to isi's bounds, in case isi didn't.
// The ancestor's scroll should only depend on the visible
// portion of the new rect.
UIElement uie = visi as UIElement;
if (uie != null)
{
rcNew.Intersect(new Rect(uie.RenderSize));
}

GeneralTransform t = visi.TransformToAncestor(this);
rcNew = t.TransformBounds(rcNew);
}
Expand Down Expand Up @@ -2609,7 +2618,7 @@ private static void OnScrollCommand(object target, ExecutedRoutedEventArgs args)
ScrollViewer sv = target as ScrollViewer;
if (sv != null)
{
// If any of the ScrollBar scroll commands are raised while
// If any of the ScrollBar scroll commands are raised while
// scroll manipulation is in its inertia, then the manipualtion
// should be completed.
sv.CompleteScrollManipulation = true;
Expand All @@ -2636,8 +2645,8 @@ private static void OnQueryScrollCommand(object target, CanExecuteRoutedEventArg
{
args.CanExecute = false;
args.ContinueRouting = true;
// It is important to handle this event to prevent any

// It is important to handle this event to prevent any
// other ScrollViewers in the ancestry from claiming it.
args.Handled = true;
}
Expand All @@ -2654,7 +2663,7 @@ private static void OnQueryScrollCommand(object target, CanExecuteRoutedEventArg
{
args.CanExecute = false;

// It is important to handle this event to prevent any
// It is important to handle this event to prevent any
// other ScrollViewers in the ancestry from claiming it.
args.Handled = true;
}
Expand Down Expand Up @@ -2933,7 +2942,7 @@ internal bool InChildMeasurePass3

private PanningInfo _panningInfo = null;
private Flags _flags = Flags.HandlesMouseWheelScrolling;

#endregion

//-------------------------------------------------------------------
Expand Down
25 changes: 8 additions & 17 deletions ...ft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/VirtualizingStackPanel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11134,32 +11134,23 @@ private void MakeVisiblePhysicalHelper(Rect r, ref Vector newOffset, ref Rect ne
viewportOffset, viewportOffset + viewportSize, targetRectOffset, targetRectOffset + targetRectSize, ref alignTop, ref alignBottom);

// Compute the visible rectangle of the child relative to the viewport.
double start = targetRectOffset - minPhysicalOffset;
double end = start + targetRectSize;

if (alignTop)
{
targetRectOffset = viewportOffset;
}
else if (alignBottom)
{
targetRectOffset = viewportOffset + viewportSize - targetRectSize;
}

double left = Math.Max(targetRectOffset, minPhysicalOffset);
targetRectSize = Math.Max(Math.Min(targetRectSize + targetRectOffset, minPhysicalOffset + viewportSize) - left, 0);
targetRectOffset = left;
targetRectOffset -= viewportOffset;
double visibleStart = Math.Max(start, 0);
double visibleEnd = Math.Max(Math.Min(end, viewportSize), visibleStart);

if (isHorizontal)
{
newOffset.X = minPhysicalOffset;
newRect.X = targetRectOffset;
newRect.Width = targetRectSize;
newRect.X = visibleStart;
newRect.Width = visibleEnd - visibleStart;
}
else
{
newOffset.Y = minPhysicalOffset;
newRect.Y = targetRectOffset;
newRect.Height = targetRectSize;
newRect.Y = visibleStart;
newRect.Height = visibleEnd - visibleStart;
}
}

Expand Down