h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-13 19:12:54 +08:00
Code Issues Releases Wiki Activity

Fix current section logic not accounting for hidden sections

Browse Source
This commit is contained in:
Dean Herbert 2021-08-19 01:26:33 +09:00
parent a0374d4a67
commit e87accafc8
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@ namespace osu.Game.Graphics.Containers
where T : Drawable
{
public Bindable<T> SelectedSection { get; } = new Bindable<T>();
private Drawable lastClickedSection;
public Drawable ExpandableHeader
@ -233,15 +234,17 @@ namespace osu.Game.Graphics.Containers
float scrollCentre = fixedHeaderSize + scrollContainer.DisplayableContent * scroll_y_centre + selectionLenienceAboveSection;
var presentChildren = Children.Where(c => c.IsPresent);
if (Precision.AlmostBigger(0, scrollContainer.Current))
SelectedSection.Value = lastClickedSection as T ?? Children.FirstOrDefault();
SelectedSection.Value = lastClickedSection as T ?? presentChildren.FirstOrDefault();
else if (Precision.AlmostBigger(scrollContainer.Current, scrollContainer.ScrollableExtent))
SelectedSection.Value = lastClickedSection as T ?? Children.LastOrDefault();
SelectedSection.Value = lastClickedSection as T ?? presentChildren.LastOrDefault();
else
{
SelectedSection.Value = Children
SelectedSection.Value = presentChildren
.TakeWhile(section => scrollContainer.GetChildPosInContent(section) - currentScroll - scrollCentre <= 0)
.LastOrDefault() ?? Children.FirstOrDefault();
.LastOrDefault() ?? presentChildren.FirstOrDefault();
}
}
}