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 FlowLayout LineSpacing and MinItemSpacing #2275

Merged
merged 1 commit into from
Apr 13, 2020
Merged

Fix FlowLayout LineSpacing and MinItemSpacing #2275

Show file tree
Hide file tree
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
29 changes: 18 additions & 11 deletions dev/Repeater/APITests/FlowLayoutTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1601,22 +1601,29 @@ private void ValidateLayoutEstimations(ScrollOrientation scrollOrientation, Layo
break;

case LayoutChoice.Grid:
var minRowSpacing = om.ScrollOrientation == ScrollOrientation.Vertical ? lineSpacing : 0;
var minColumnSpacing = om.ScrollOrientation == ScrollOrientation.Horizontal ? lineSpacing : 0;
layout = new UniformGridLayout() { MinItemWidth = itemSize, MinItemHeight = itemSize, MinRowSpacing = minRowSpacing, MinColumnSpacing = minColumnSpacing };
{
var minRowSpacing = om.ScrollOrientation == ScrollOrientation.Vertical ? lineSpacing : 0;
var minColumnSpacing = om.ScrollOrientation == ScrollOrientation.Horizontal ? lineSpacing : 0;
layout = new UniformGridLayout() { MinItemWidth = itemSize, MinItemHeight = itemSize, MinRowSpacing = minRowSpacing, MinColumnSpacing = minColumnSpacing };
}
break;

case LayoutChoice.Flow:
layout = new FlowLayoutDerived()
{
MinColumnSpacing = lineSpacing,
OnLineArrangedFunc = (int startIndex, int countInLine, double lineSize, VirtualizingLayoutContext context) =>
var minRowSpacing = om.ScrollOrientation == ScrollOrientation.Vertical ? lineSpacing : 0;
var minColumnSpacing = om.ScrollOrientation == ScrollOrientation.Horizontal ? lineSpacing : 0;
layout = new FlowLayoutDerived()
{
Verify.AreEqual(0, startIndex % 4);
Verify.AreEqual(4, countInLine);
Verify.AreEqual(lineSize, itemSize);
}
};
MinRowSpacing = minRowSpacing,
MinColumnSpacing = minColumnSpacing,
OnLineArrangedFunc = (int startIndex, int countInLine, double lineSize, VirtualizingLayoutContext context) =>
{
Verify.AreEqual(0, startIndex % 4);
Verify.AreEqual(4, countInLine);
Verify.AreEqual(lineSize, itemSize);
}
};
}
break;

default:
Expand Down
4 changes: 2 additions & 2 deletions dev/Repeater/FlowLayout.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,12 @@ class FlowLayout :

double LineSpacing()
{
return ScrollOrientation() == ScrollOrientation::Vertical ? m_minColumnSpacing : m_minRowSpacing;
return GetScrollOrientation() == ScrollOrientation::Vertical ? m_minRowSpacing : m_minColumnSpacing;
}

double MinItemSpacing()
{
return ScrollOrientation() == ScrollOrientation::Vertical ? m_minRowSpacing : m_minColumnSpacing;
return GetScrollOrientation() == ScrollOrientation::Vertical ? m_minColumnSpacing : m_minRowSpacing;
}

// Fields
Expand Down