sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-30 01:47:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9023 from Fukashi13/sections-container-fix

Browse Source 
Fix overlay section display highlighting wrong section
This commit is contained in:
Dan Balasescu 2020-05-18 19:49:28 +09:00 committed by GitHub
commit 490b6dbd7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -189,23 +189,18 @@ 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;
T bestMatch = null;
float minDiff = float.MaxValue;
float scrollOffset = FixedHeader?.LayoutSize.Y ?? 0; float scrollOffset = FixedHeader?.LayoutSize.Y ?? 0;
Func<T, float> diff = section => scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset;
foreach (var section in Children) if (scrollContainer.IsScrolledToEnd())
{ {
float diff = Math.Abs(scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset); SelectedSection.Value = Children.LastOrDefault();
}
if (diff < minDiff) else
{ {
minDiff = diff; SelectedSection.Value = Children.TakeWhile(section => diff(section) <= 0).LastOrDefault()
bestMatch = section; ?? Children.FirstOrDefault();
}
} }
if (bestMatch != null)
SelectedSection.Value = bestMatch;
} }
} }