Skip to content

Port microsoft/microsoft-ui-xaml#3964 #484

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
Kinnara merged 1 commit into from
Jul 10, 2022
Merged

Port microsoft/microsoft-ui-xaml#3964 #484

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
23 changes: 13 additions & 10 deletions ModernWpf.Controls/Repeater/ItemsRepeater/ViewportManagerDownLevel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,17 +338,20 @@ private void EnsureScrollers()
parent = CachedVisualTreeHelpers.GetParent(parent);
}

if (m_parentScrollers.Empty())
if (!m_managingViewportDisabled)
{
// We usually update the viewport in the post arrange handler. But, since we don't have
// a scroller, let's do it now.
UpdateViewport();
}
else
{
var outerScrollerInfo = m_parentScrollers.Last();
outerScrollerInfo.Scroller.PostArrange += OnPostArrange;
//outerScrollerInfo.PostArrangeToken = outerScrollerInfo.Scroller().PostArrange(winrt::auto_revoke, { this, &ViewportManagerDownLevel::OnPostArrange });
if (m_parentScrollers.Empty())
{
// We usually update the viewport in the post arrange handler.
// But, since we don't have a scroller, let's do it now.
UpdateViewport();
}
else
{
var outerScrollerInfo = m_parentScrollers.Last();
outerScrollerInfo.Scroller.PostArrange += OnPostArrange;
//outerScrollerInfo.PostArrangeToken = outerScrollerInfo.Scroller().PostArrange(winrt::auto_revoke, { this, &ViewportManagerDownLevel::OnPostArrange });
}
}

m_ensuredScrollers = true;
Expand Down