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

Rename some variable and add xmldoc for scroll centre position

Browse Source
This commit is contained in:
Dean Herbert 2021-01-21 15:08:36 +09:00
parent c650cbd2a7
commit 8853ac04d9
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,7 +108,10 @@ namespace osu.Game.Graphics.Containers
private float? lastKnownScroll; private float? lastKnownScroll;
private const float scroll_target_multiplier = 0.2f; /// <summary>
/// The percentage of the container to consider the centre-point for deciding the active section (and scrolling to a requested section).
/// </summary>
private const float scroll_y_centre = 0.2f;
public SectionsContainer() public SectionsContainer()
{ {
@ -144,7 +147,7 @@ namespace osu.Game.Graphics.Containers
public void ScrollTo(Drawable section) public void ScrollTo(Drawable section)
{ {
lastClickedSection = section; lastClickedSection = section;
scrollContainer.ScrollTo(scrollContainer.GetChildPosInContent(section) - scrollContainer.DisplayableContent * scroll_target_multiplier - (FixedHeader?.BoundingBox.Height ?? 0)); scrollContainer.ScrollTo(scrollContainer.GetChildPosInContent(section) - scrollContainer.DisplayableContent * scroll_y_centre - (FixedHeader?.BoundingBox.Height ?? 0));
} }
public void ScrollToTop() => scrollContainer.ScrollTo(0); public void ScrollToTop() => scrollContainer.ScrollTo(0);
@ -217,9 +220,9 @@ namespace osu.Game.Graphics.Containers
// 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 scrollIntoSectionAmount = Math.Min(smallestSectionHeight / 2.0f, scrollContainer.DisplayableContent * 0.05f); float selectionLenienceAboveSection = Math.Min(smallestSectionHeight / 2.0f, scrollContainer.DisplayableContent * 0.05f);
float scrollOffset = fixedHeaderSize + scrollContainer.DisplayableContent * scroll_target_multiplier + scrollIntoSectionAmount; float scrollCentre = fixedHeaderSize + scrollContainer.DisplayableContent * scroll_y_centre + selectionLenienceAboveSection;
if (Precision.AlmostBigger(0, scrollContainer.Current)) if (Precision.AlmostBigger(0, scrollContainer.Current))
SelectedSection.Value = lastClickedSection as T ?? Children.FirstOrDefault(); SelectedSection.Value = lastClickedSection as T ?? Children.FirstOrDefault();
@ -228,7 +231,7 @@ namespace osu.Game.Graphics.Containers
else else
{ {
SelectedSection.Value = Children SelectedSection.Value = Children
.TakeWhile(section => scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset <= 0) .TakeWhile(section => scrollContainer.GetChildPosInContent(section) - currentScroll - scrollCentre <= 0)
.LastOrDefault() ?? Children.FirstOrDefault(); .LastOrDefault() ?? Children.FirstOrDefault();
} }
} }