Skip to content
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

Jump to bottom

Ensure BringIntoView request is not skipped for direct content of ScrollView #6889

Merged
merged 3 commits into from
Apr 4, 2022
Merged

Ensure BringIntoView request is not skipped for direct content of ScrollView #6889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ecd4344
Ensure BringIntoView request is not skipped for direct content of Scr…
MartinZikmund Mar 27, 2022
67fe50b
Test for BringIntoView for direct content
MartinZikmund Mar 27, 2022
6330ce0
Move test to correct location and rename
MartinZikmund Apr 2, 2022
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
38 changes: 38 additions & 0 deletions dev/ScrollPresenter/APITests/ScrollPresenterBringIntoViewTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
using ScrollingBringingIntoViewEventArgs = Microsoft.UI.Xaml.Controls.ScrollingBringingIntoViewEventArgs;
using ScrollPresenterTestHooks = Microsoft.UI.Private.Controls.ScrollPresenterTestHooks;
using ScrollPresenterViewChangeResult = Microsoft.UI.Private.Controls.ScrollPresenterViewChangeResult;
using Windows.UI.Xaml.Shapes;

namespace Windows.UI.Xaml.Tests.MUXControls.ApiTests
{
Expand Down Expand Up @@ -743,6 +744,43 @@ public void BringNestedElementIntoVerticalScrollViewerViewWithOffset()
options);
}

[TestMethod]
[TestProperty("Description", "ScrollPresenter should handle BringIntoView for its direct content.")]
public void BringContentWithMarginIntoView()
{
ScrollPresenter scrollPresenter = null;
Rectangle rectangleScrollPresenterContent = null;
AutoResetEvent scrollPresenterViewChangedEvent = new AutoResetEvent(false);
AutoResetEvent scrollPresenterLoadedEvent = new AutoResetEvent(false);

RunOnUIThread.Execute(() =>
{
rectangleScrollPresenterContent = new Rectangle() { Margin = new Thickness(0, 500, 0, 0) };
scrollPresenter = new ScrollPresenter();

SetupDefaultUI(scrollPresenter, rectangleScrollPresenterContent, scrollPresenterLoadedEvent);
});

WaitForEvent("Waiting for Loaded event", scrollPresenterLoadedEvent);

RunOnUIThread.Execute(() =>
{
scrollPresenter.ViewChanged += (s, e) =>
{
scrollPresenterViewChangedEvent.Set();
};

rectangleScrollPresenterContent.StartBringIntoView(new BringIntoViewOptions() { AnimationDesired = false });
});

WaitForEvent("Waiting for ViewChanged event", scrollPresenterViewChangedEvent);

RunOnUIThread.Execute(() =>
{
Verify.AreEqual(500.0, scrollPresenter.VerticalOffset);
});
}

private void BringElementIntoViewWithAlignment(
Orientation orientation,
double alignmentRatio,
Expand Down
4 changes: 2 additions & 2 deletions dev/ScrollPresenter/ScrollPresenter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4472,7 +4472,7 @@ void ScrollPresenter::OnBringIntoViewRequestedHandler(
args.Handled() ||
args.TargetElement() == static_cast<winrt::UIElement>(*this) ||
(args.TargetElement() == content && content.Visibility() == winrt::Visibility::Collapsed) ||
!SharedHelpers::IsAncestor(args.TargetElement(), content, true /*checkVisibility*/))
(args.TargetElement() != content && !SharedHelpers::IsAncestor(args.TargetElement(), content, true /*checkVisibility*/)))
{
// Ignore the request when:
// - There is no InteractionTracker to fulfill it.
Expand Down Expand Up @@ -4525,7 +4525,7 @@ void ScrollPresenter::OnBringIntoViewRequestedHandler(
args.Handled() ||
args.TargetElement() == static_cast<winrt::UIElement>(*this) ||
(args.TargetElement() == content && content.Visibility() == winrt::Visibility::Collapsed) ||
!SharedHelpers::IsAncestor(args.TargetElement(), content, true /*checkVisibility*/))
(args.TargetElement() != content && !SharedHelpers::IsAncestor(args.TargetElement(), content, true /*checkVisibility*/)))
{
// Again, ignore the request when:
// - There is no Content anymore.
Expand Down