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

Don't call UpdateViewport if viewport management is disabled #3964

Merged
merged 2 commits into from
Jan 19, 2021
Merged

Don't call UpdateViewport if viewport management is disabled #3964

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c96eb9
don't call UpdateViewport if viewport management is disabled
ranjeshj Jan 16, 2021
1621e1b
Update ViewportManagerWithPlatformFeatures.cpp
StephenLPeters Jan 19, 2021
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
19 changes: 11 additions & 8 deletions dev/Repeater/ViewportManagerWithPlatformFeatures.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,15 +420,18 @@ void ViewportManagerWithPlatformFeatures::EnsureScroller()
parent = CachedVisualTreeHelpers::GetParent(parent);
}

if (!m_scroller)
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(winrt::Rect{});
}
else if (!m_managingViewportDisabled)
{
m_effectiveViewportChangedRevoker = m_owner->EffectiveViewportChanged(winrt::auto_revoke, { this, &ViewportManagerWithPlatformFeatures::OnEffectiveViewportChanged });
if (!m_scroller)
{
// We usually update the viewport in the post arrange handler.
// But, since we don't have a scroller, let's do it now.
UpdateViewport(winrt::Rect{});
}
else
{
m_effectiveViewportChangedRevoker = m_owner->EffectiveViewportChanged(winrt::auto_revoke, { this, &ViewportManagerWithPlatformFeatures::OnEffectiveViewportChanged });
}
}

m_ensuredScroller = true;
Expand Down