From e390d70b707c97909404b8f596dc2908a66605b4 Mon Sep 17 00:00:00 2001
From: Fukashi13 <48766178+Fukashi13@users.noreply.github.com>
Date: Thu, 14 May 2020 14:33:12 +0200
Subject: [PATCH] bestMatch changes on entering section with screen top border

---
 osu.Game/Graphics/Containers/SectionsContainer.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index a3125614aa..8b866c8d21 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -189,15 +189,15 @@ namespace osu.Game.Graphics.Containers
                 headerBackgroundContainer.Height = (ExpandableHeader?.LayoutSize.Y ?? 0) + (FixedHeader?.LayoutSize.Y ?? 0);
                 headerBackgroundContainer.Y = ExpandableHeader?.Y ?? 0;
 
-                T bestMatch = null;
-                float minDiff = float.MaxValue;
+                T bestMatch = Children.FirstOrDefault();
+                float minDiff = float.MinValue;
                 float scrollOffset = FixedHeader?.LayoutSize.Y ?? 0;
 
                 foreach (var section in Children)
                 {
-                    float diff = Math.Abs(scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset);
+                    float diff = scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset;
 
-                    if (diff < minDiff)
+                    if ((minDiff < diff) & (diff < 0))
                     {
                         minDiff = diff;
                         bestMatch = section;