h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 13:33:03 +08:00
Code Issues Releases Wiki Activity

Set Masking = false and expose ScrollContainer.

Browse Source
This commit is contained in:
Huo Yaoyuan 2017-05-21 02:15:40 +08:00
parent da47b0a260
commit e040f297c6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ namespace osu.Game.Graphics.Containers
public class SectionsContainer : Container public class SectionsContainer : Container
{ {
private Drawable expandableHeader, fixedHeader; private Drawable expandableHeader, fixedHeader;
private readonly ScrollContainer scrollContainer; public readonly ScrollContainer ScrollContainer;
private readonly Container<Drawable> sectionsContainer; private readonly Container<Drawable> sectionsContainer;
public Drawable ExpandableHeader public Drawable ExpandableHeader
@ -54,7 +54,6 @@ namespace osu.Game.Graphics.Containers
} }
public Bindable<Drawable> SelectedSection { get; } = new Bindable<Drawable>(); public Bindable<Drawable> SelectedSection { get; } = new Bindable<Drawable>();
public void ScrollToSection(Drawable section) => scrollContainer.ScrollIntoView(section);
protected virtual Container<Drawable> CreateSectionsContainer() protected virtual Container<Drawable> CreateSectionsContainer()
=> new FillFlowContainer => new FillFlowContainer
@ -97,9 +96,10 @@ namespace osu.Game.Graphics.Containers
public SectionsContainer() public SectionsContainer()
{ {
Add(scrollContainer = new ScrollContainer() Add(ScrollContainer = new ScrollContainer()
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Masking = false,
Children = new Drawable[] { sectionsContainer = CreateSectionsContainer() } Children = new Drawable[] { sectionsContainer = CreateSectionsContainer() }
}); });
} }
@ -118,7 +118,7 @@ namespace osu.Game.Graphics.Containers
if (expandableHeader == null) return; if (expandableHeader == null) return;
float currentScroll = scrollContainer.Current; float currentScroll = ScrollContainer.Current;
if (currentScroll != lastKnownScroll) if (currentScroll != lastKnownScroll)
{ {
lastKnownScroll = currentScroll; lastKnownScroll = currentScroll;
@ -136,7 +136,7 @@ namespace osu.Game.Graphics.Containers
foreach (var section in sections) foreach (var section in sections)
{ {
float diff = Math.Abs(scrollContainer.GetChildPosInContent(section) - currentScroll); float diff = Math.Abs(ScrollContainer.GetChildPosInContent(section) - currentScroll);
if (diff < minDiff) if (diff < minDiff)
{ {
minDiff = diff; minDiff = diff;