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

Always prefer clicked section when present

Browse Source
This commit is contained in:
Dean Herbert 2021-08-20 17:00:20 +09:00
parent cff7b1e98f
commit c7266c74a0
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ namespace osu.Game.Graphics.Containers
{
public Bindable<T> SelectedSection { get; } = new Bindable<T>();
private Drawable lastClickedSection;
private T lastClickedSection;
public Drawable ExpandableHeader
{
@ -145,10 +145,12 @@ namespace osu.Game.Graphics.Containers
footerHeight = null;
}
public void ScrollTo(Drawable section)
public void ScrollTo(Drawable target)
{
lastClickedSection = section;
scrollContainer.ScrollTo(scrollContainer.GetChildPosInContent(section) - scrollContainer.DisplayableContent * scroll_y_centre - (FixedHeader?.BoundingBox.Height ?? 0));
if (target is T section)
lastClickedSection = section;
scrollContainer.ScrollTo(scrollContainer.GetChildPosInContent(target) - scrollContainer.DisplayableContent * scroll_y_centre - (FixedHeader?.BoundingBox.Height ?? 0));
}
public void ScrollToTop() => scrollContainer.ScrollTo(0);
@ -236,10 +238,12 @@ namespace osu.Game.Graphics.Containers
var presentChildren = Children.Where(c => c.IsPresent);
if (Precision.AlmostBigger(0, scrollContainer.Current))
SelectedSection.Value = lastClickedSection as T ?? presentChildren.FirstOrDefault();
if (lastClickedSection != null)
SelectedSection.Value = lastClickedSection;
else if (Precision.AlmostBigger(0, scrollContainer.Current))
SelectedSection.Value = presentChildren.FirstOrDefault();
else if (Precision.AlmostBigger(scrollContainer.Current, scrollContainer.ScrollableExtent))
SelectedSection.Value = lastClickedSection as T ?? presentChildren.LastOrDefault();
SelectedSection.Value = presentChildren.LastOrDefault();
else
{
SelectedSection.Value = presentChildren