RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-12 09:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the need to store the smallest section

Browse Source
This commit is contained in:
Dean Herbert 2021-01-21 14:40:55 +09:00
parent 555abcdc36
commit 6d167b7865
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,6 @@ namespace osu.Game.Graphics.Containers
{ {
public Bindable<T> SelectedSection { get; } = new Bindable<T>(); public Bindable<T> SelectedSection { get; } = new Bindable<T>();
private Drawable lastClickedSection; private Drawable lastClickedSection;
private T smallestSection;
public Drawable ExpandableHeader public Drawable ExpandableHeader
{ {
@ -140,9 +139,6 @@ namespace osu.Game.Graphics.Containers
lastKnownScroll = null; lastKnownScroll = null;
headerHeight = null; headerHeight = null;
footerHeight = null; footerHeight = null;
if (smallestSection == null || smallestSection.Height > drawable.Height)
smallestSection = drawable;
} }
public void ScrollTo(Drawable section) public void ScrollTo(Drawable section)
@ -213,10 +209,12 @@ namespace osu.Game.Graphics.Containers
headerBackgroundContainer.Height = (ExpandableHeader?.LayoutSize.Y ?? 0) + (FixedHeader?.LayoutSize.Y ?? 0); headerBackgroundContainer.Height = (ExpandableHeader?.LayoutSize.Y ?? 0) + (FixedHeader?.LayoutSize.Y ?? 0);
headerBackgroundContainer.Y = ExpandableHeader?.Y ?? 0; headerBackgroundContainer.Y = ExpandableHeader?.Y ?? 0;
var smallestSectionHeight = Children.Count > 0 ? Children.Min(d => d.Height) : 0;
// scroll offset is our fixed header height if we have it plus 20% of content height // scroll offset is our fixed header height if we have it plus 20% of content height
// plus 5% to fix floating point errors and to not have a section instantly unselect when scrolling upwards // plus 5% to fix floating point errors and to not have a section instantly unselect when scrolling upwards
// but the 5% can't be bigger than our smallest section height, otherwise it won't get selected correctly // but the 5% can't be bigger than our smallest section height, otherwise it won't get selected correctly
float sectionOrContent = Math.Min(smallestSection?.Height / 2.0f ?? 0, scrollContainer.DisplayableContent * 0.05f); float sectionOrContent = Math.Min(smallestSectionHeight / 2.0f, scrollContainer.DisplayableContent * 0.05f);
float scrollOffset = (FixedHeader?.LayoutSize.Y ?? 0) + scrollContainer.DisplayableContent * scroll_target_multiplier + sectionOrContent; float scrollOffset = (FixedHeader?.LayoutSize.Y ?? 0) + scrollContainer.DisplayableContent * scroll_target_multiplier + sectionOrContent;
Func<T, float> diff = section => scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset; Func<T, float> diff = section => scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset;