RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-16 11:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle null and invalidation of headers.

Browse Source
This commit is contained in:
Huo Yaoyuan 2017-05-21 02:37:34 +08:00
parent e040f297c6
commit 72621c81dc
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,7 @@ namespace osu.Game.Graphics.Containers
expandableHeader.Depth = float.MinValue;
Add(expandableHeader);
lastKnownScroll = float.NaN;
}
}
@ -50,6 +51,7 @@ namespace osu.Game.Graphics.Containers
fixedHeader.Depth = float.MinValue / 2;
Add(fixedHeader);
lastKnownScroll = float.NaN;
}
}
@ -79,6 +81,7 @@ namespace osu.Game.Graphics.Containers
originalSectionMargin = sections[0].Margin;
sectionsContainer.Add(sections);
SelectedSection.Value = sections[0];
lastKnownScroll = float.NaN;
}
}
@ -104,7 +107,7 @@ namespace osu.Game.Graphics.Containers
});
}
float lastKnownScroll = float.NaN;
float lastKnownScroll;
protected override void UpdateAfterChildren()
{
base.UpdateAfterChildren();
@ -116,14 +119,12 @@ namespace osu.Game.Graphics.Containers
updateSectionMargin();
}
if (expandableHeader == null) return;
float currentScroll = ScrollContainer.Current;
if (currentScroll != lastKnownScroll)
{
lastKnownScroll = currentScroll;
if (expandableHeader != null)
if (expandableHeader != null && fixedHeader != null)
{
float offset = Math.Min(expandableHeader.Height, currentScroll);