Merge branch 'master' into profile

This commit is contained in:
Huo Yaoyuan
2017-07-14 22:52:19 +08:00
53 changed files with 1305 additions and 379 deletions

View File

@ -123,7 +123,7 @@ namespace osu.Game.Graphics.Containers
public SectionsContainer()
{
AddInternal(scrollContainer = new ScrollContainer()
AddInternal(scrollContainer = new ScrollContainer
{
RelativeSizeAxes = Axes.Both,
Masking = true,
@ -148,6 +148,8 @@ namespace osu.Game.Graphics.Containers
scrollContainer.ScrollTo(pos - scrollOffset);
}
public void ScrollTo(Drawable section) => ScrollContainer.ScrollTo(ScrollContainer.GetChildPosInContent(section) - FixedHeader.BoundingBox.Height);
private float lastKnownScroll;
protected override void UpdateAfterChildren()
{