h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 20:22:55 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into remove-sub-scroll

Browse Source
This commit is contained in:
Dan Balasescu 2017-11-15 19:26:42 +09:00 committed by GitHub
commit 70d960ba73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Graphics/Containers/SectionsContainer.cs
View File

@ -139,6 +139,8 @@ namespace osu.Game.Graphics.Containers
public void ScrollTo(Drawable section) => scrollContainer.ScrollTo(scrollContainer.GetChildPosInContent(section) - (FixedHeader?.BoundingBox.Height ?? 0));
public void ScrollToTop() => scrollContainer.ScrollTo(0);
private float lastKnownScroll;
protected override void UpdateAfterChildren()
{

5
osu.Game/Overlays/BeatmapSetOverlay.cs
View File

@ -30,6 +30,8 @@ namespace osu.Game.Overlays
private APIAccess api;
private RulesetStore rulesets;
private readonly ScrollContainer scroll;
// receive input outside our bounds so we can trigger a close event on ourselves.
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => true;
@ -61,7 +63,7 @@ namespace osu.Game.Overlays
RelativeSizeAxes = Axes.Both,
Colour = OsuColour.Gray(0.2f)
},
new ScrollContainer
scroll = new ScrollContainer
{
RelativeSizeAxes = Axes.Both,
ScrollbarVisible = false,
@ -120,6 +122,7 @@ namespace osu.Game.Overlays
{
header.BeatmapSet = info.BeatmapSet = set;
Show();
scroll.ScrollTo(0);
}
}
}

1
osu.Game/Overlays/UserProfileOverlay.cs
View File

@ -164,6 +164,7 @@ namespace osu.Game.Overlays
}
Show();
sectionsContainer.ScrollToTop();
}
private void userLoadComplete(User user)