Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/Avalonia.Controls/FlexPanel/FlexPanel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ protected override Size MeasureOverride(Size availableSize)
if (_visibleChildren is not { Length: > 0 } children)
{
_state.Lines.Clear();
return availableSize;
return default;
}

var isColumn = Direction is FlexDirection.Column or FlexDirection.ColumnReverse;
Expand Down
16 changes: 16 additions & 0 deletions tests/Avalonia.Controls.UnitTests/FlexPanelTests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using Avalonia.Controls.Presenters;
using Avalonia.Layout;
using Avalonia.UnitTests;
using Xunit;
Expand Down Expand Up @@ -411,5 +412,20 @@ public void Applies_Relative_FlexBasis_Properties()
Assert.Equal(new Rect(0, 0, 25, 15), target.Children[0].Bounds);
Assert.Equal(new Rect(25, 0, 25, 15), target.Children[1].Bounds);
}

[Fact]
public void Empty_Panel_Does_Not_Take_Up_Available_Space()
{
var target = new FlexPanel();
var stack = new StackPanel { Children = { new Border { Width = 100, Height = 50 }, target } };

var presenter = new ScrollContentPresenter { CanVerticallyScroll = true, Content = stack };

presenter.UpdateChild();
presenter.Measure(new Size(100, 100));

Assert.Equal(default, target.DesiredSize);
Assert.Equal(new Size(100, 50), stack.DesiredSize);
}
}
}