Skip to content

Fix conflicts and build failures in inflight/current branch #34495

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
kubaflo merged 1 commit into from
Mar 16, 2026
+0 −19
Merged

Fix conflicts and build failures in inflight/current branch #34495

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
19 changes: 0 additions & 19 deletions src/Controls/src/Core/Handlers/Items2/iOS/LayoutFactory2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,25 +461,6 @@ public CustomUICollectionViewCompositionalLayout(LayoutSnapInfo snapInfo, Layout
_headerFooterInfo = headerFooterInfo;
}

// UICollectionViewCompositionalLayout can report a content width larger than the viewport
// after a bounds change (e.g. when inside a RefreshView). This causes UIScrollView to
// enable horizontal scrolling on a vertical layout. Clamp the width to the actual bounds. (#34165)
public override CGSize CollectionViewContentSize
{
get
{
var size = base.CollectionViewContentSize;
if (Configuration.ScrollDirection == UICollectionViewScrollDirection.Vertical
&& CollectionView is not null
&& size.Width > CollectionView.Bounds.Width
&& CollectionView.Bounds.Width > 0)
{
return new CGSize(CollectionView.Bounds.Width, size.Height);
}
return size;
}
}

public override void FinalizeCollectionViewUpdates()
{
base.FinalizeCollectionViewUpdates();
Expand Down
Loading