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

fix: Workaround non-UIElement UIViews in Grid layout (backport #18470) #18483

Merged
merged 1 commit into from
Oct 16, 2024
Merged

fix: Workaround non-UIElement UIViews in Grid layout (backport #18470) #18483

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
12 changes: 12 additions & 0 deletions src/Uno.UI/UI/Xaml/Controls/Grid/Grid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1374,6 +1374,12 @@ private XSIZEF InnerArrangeOverride(XSIZEF finalSize)
while (childrenEnumerator.MoveNext())
{
var currentChild = childrenEnumerator.Current;
#if __IOS__ // Uno specific: On iOS an additional non-UIElement is added the the parent of a focused TextBox control, we need to skip it.
if (currentChild is null)
{
continue;
}
#endif
ASSERT(currentChild is { });

currentChild.EnsureLayoutStorage();
Expand Down Expand Up @@ -1414,6 +1420,12 @@ private XSIZEF InnerArrangeOverride(XSIZEF finalSize)
for (Xuint childIndex = 0; childIndex < count; childIndex++)
{
UIElement currentChild = children[childIndex];
#if __IOS__ // Uno specific: On iOS an additional non-UIElement is added the the parent of a focused TextBox control, we need to skip it.
if (currentChild is null)
{
continue;
}
#endif
ASSERT(currentChild is { });

DefinitionBase row = GetRowNoRef(currentChild);
Expand Down
Loading