[iOS] CollectionView footer sizing when source is empty - fix#28610
[iOS] CollectionView footer sizing when source is empty - fix#28610PureWeen merged 5 commits intodotnet:mainfrom
Conversation
kubaflo
added
area-controls-collectionview
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
github-project-automation
bot
moved this from Approved
to Changes Requested
in MAUI SDK Ongoing
rmarinho
left a comment
rmarinho
left a comment
There was a problem hiding this comment.
small comment related with Header, I know the test already has a header so it seems the same issue doesn t apply to the header but do we know why?
| } | ||
|
|
||
| if (_footerUIView != null && (_footerUIView.Frame.Y != height || emptyHeight > 0 || _footerUIView.Frame.Height != footerHeight)) | ||
| if (_footerUIView != null && (_footerUIView.Frame.Y != height || emptyHeight > 0 || _footerUIView.Frame.Height != footerHeight || _footerUIView.Frame.Width != CollectionView.Frame.Width)) |
There was a problem hiding this comment.
Don t we need to do something like this for the Header too on line 209 ?
There was a problem hiding this comment.
Yea, we should. I pushed a commit
There was a problem hiding this comment.
Is there a test we can add for the code that was added?
There was a problem hiding this comment.
It turned out that the headerView has always been reframed because of this wrong condition _headerUIView.Frame.Y != headerHeight, but it should be _headerUIView.Frame.Y != -headerHeight based on this
_headerUIView.Frame = new CoreGraphics.CGRect(0, -headerHeight, CollectionView.Frame.Width, headerHeight);
right?
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
|
github-project-automation
bot
moved this from Ready To Review
to Done
in MAUI SDK Ongoing
|
/backport to release/9.0.1xx-sr4 |
|
/backport to rrelease/9.0.1xx-sr5 |
|
Started backporting to release/9.0.1xx-sr4: https://github.com/dotnet/maui/actions/runs/14227718037 |
|
Started backporting to rrelease/9.0.1xx-sr5: https://github.com/dotnet/maui/actions/runs/14227720878 |
|
@PureWeen backporting to "release/9.0.1xx-sr4" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: [iOS] CollectionView footer sizing fix
.git/rebase-apply/patch:87: trailing whitespace.
</ContentPage>
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M src/Controls/src/Core/Handlers/Items/iOS/StructuredItemsViewController.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Controls/src/Core/Handlers/Items/iOS/StructuredItemsViewController.cs
CONFLICT (content): Merge conflict in src/Controls/src/Core/Handlers/Items/iOS/StructuredItemsViewController.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 [iOS] CollectionView footer sizing fix
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@PureWeen an error occurred while backporting to "rrelease/9.0.1xx-sr5", please check the run log for details! Error: The specified backport target branch "rrelease/9.0.1xx-sr5" wasn't found in the repo. |
|
/backport to release/9.0.1xx-sr4 |
|
/backport to release/9.0.1xx-sr5 |
|
Started backporting to release/9.0.1xx-sr4: https://github.com/dotnet/maui/actions/runs/14245620125 |
|
Started backporting to release/9.0.1xx-sr5: https://github.com/dotnet/maui/actions/runs/14245624630 |
|
@PureWeen backporting to "release/9.0.1xx-sr4" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: [iOS] CollectionView footer sizing fix
.git/rebase-apply/patch:87: trailing whitespace.
</ContentPage>
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M src/Controls/src/Core/Handlers/Items/iOS/StructuredItemsViewController.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Controls/src/Core/Handlers/Items/iOS/StructuredItemsViewController.cs
CONFLICT (content): Merge conflict in src/Controls/src/Core/Handlers/Items/iOS/StructuredItemsViewController.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 [iOS] CollectionView footer sizing fix
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
4 participants
Issues Fixed
Fixes #28580
Works fine with CV2