Skip to content

Adding StretchChild property to WrapPanel control #3005

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
merged 9 commits into from
Sep 13, 2019
Merged

Adding StretchChild property to WrapPanel control #3005

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
203f9e5
Adding StretchLastChild property to WrapPanel control
shweaver-MSFT Sep 13, 2019
2c18e1a
Update Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.cs
shweaver-MSFT Sep 13, 2019
38dd693
Update Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.cs
shweaver-MSFT Sep 13, 2019
b4c149a
Merge branch 'master' into shane/wrap-panel
azchohfi Sep 13, 2019
33ce5f9
Optimizing StretchLastChild code
shweaver-MSFT Sep 13, 2019
ef52cfb
Adding StretchChild enum to WrapPanel
shweaver-MSFT Sep 13, 2019
11e5f01
Adding header and fixing StretchChild default in WrapPanel
shweaver-MSFT Sep 13, 2019
c2c6c3e
Removing erroneous First value from enum
shweaver-MSFT Sep 13, 2019
6ba218b
Merge branch 'master' into shane/wrap-panel
michael-hawker Sep 13, 2019
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
98 changes: 72 additions & 26 deletions Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,25 @@ public Thickness Padding
typeof(WrapPanel),
new PropertyMetadata(default(Thickness), LayoutPropertyChanged));

/// <summary>
/// Gets or sets a value indicating whether the last child should fill the remaining space, or not.
/// </summary>
public bool StretchLastChild
{
get { return (bool)GetValue(StretchLastChildProperty); }
set { SetValue(StretchLastChildProperty, value); }
}

/// <summary>
/// Identifies the StretchLastChild dependency property.
/// </summary>
public static readonly DependencyProperty StretchLastChildProperty =
DependencyProperty.Register(
nameof(StretchLastChild),
typeof(bool),
typeof(WrapPanel),
new PropertyMetadata(false, LayoutPropertyChanged));

private static void LayoutPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
if (d is WrapPanel wp)
Expand Down Expand Up @@ -179,42 +198,69 @@ protected override Size MeasureOverride(Size availableSize)
/// <inheritdoc />
protected override Size ArrangeOverride(Size finalSize)
{
var parentMeasure = new UvMeasure(Orientation, finalSize.Width, finalSize.Height);
var spacingMeasure = new UvMeasure(Orientation, HorizontalSpacing, VerticalSpacing);
var paddingStart = new UvMeasure(Orientation, Padding.Left, Padding.Top);
var paddingEnd = new UvMeasure(Orientation, Padding.Right, Padding.Bottom);
var position = new UvMeasure(Orientation, Padding.Left, Padding.Top);

double currentV = 0;
foreach (var child in Children)
if (Children.Count > 0)
{
var desiredMeasure = new UvMeasure(Orientation, child.DesiredSize.Width, child.DesiredSize.Height);
if (desiredMeasure.U == 0)
{
continue; // if an item is collapsed, avoid adding the spacing
}
var parentMeasure = new UvMeasure(Orientation, finalSize.Width, finalSize.Height);
var spacingMeasure = new UvMeasure(Orientation, HorizontalSpacing, VerticalSpacing);
var paddingStart = new UvMeasure(Orientation, Padding.Left, Padding.Top);
var paddingEnd = new UvMeasure(Orientation, Padding.Right, Padding.Bottom);
var position = new UvMeasure(Orientation, Padding.Left, Padding.Top);

if ((desiredMeasure.U + position.U + paddingEnd.U) > parentMeasure.U)
double currentV = 0;
void arrange(UIElement child, bool isLast = false)
{
// next row!
position.U = paddingStart.U;
position.V += currentV + spacingMeasure.V;
currentV = 0;
var desiredMeasure = new UvMeasure(Orientation, child.DesiredSize.Width, child.DesiredSize.Height);
if (desiredMeasure.U == 0)
{
return; // if an item is collapsed, avoid adding the spacing
}

if ((desiredMeasure.U + position.U + paddingEnd.U) > parentMeasure.U)
{
// next row!
position.U = paddingStart.U;
position.V += currentV + spacingMeasure.V;
currentV = 0;
}

// Stretch the last item to fill the available space
if (isLast)
{
desiredMeasure.U = parentMeasure.U - position.U;
}

// place the item
if (Orientation == Orientation.Horizontal)
{
child.Arrange(new Rect(position.U, position.V, desiredMeasure.U, desiredMeasure.V));
}
else
{
child.Arrange(new Rect(position.V, position.U, desiredMeasure.V, desiredMeasure.U));
}

// adjust the location for the next items
position.U += desiredMeasure.U + spacingMeasure.U;
currentV = Math.Max(desiredMeasure.V, currentV);
}

// place the item
if (Orientation == Orientation.Horizontal)
if (StretchLastChild)
{
child.Arrange(new Rect(position.U, position.V, child.DesiredSize.Width, child.DesiredSize.Height));
var lastIndex = Children.Count - 1;
for (var i = 0; i < lastIndex; i++)
{
arrange(Children[i]);
}

arrange(Children[lastIndex], true);
}
else
{
child.Arrange(new Rect(position.V, position.U, child.DesiredSize.Width, child.DesiredSize.Height));
foreach (var child in Children)
{
arrange(child);
}
}

// adjust the location for the next items
position.U += desiredMeasure.U + spacingMeasure.U;
currentV = Math.Max(desiredMeasure.V, currentV);
}

return finalSize;
Expand Down