1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-22 06:02:56 +08:00

Apply further framework changes

This commit is contained in:
smoogipoo 2020-02-26 15:06:30 +09:00
parent f71c45cb1b
commit 334ec7bbd4

View File

@ -6,6 +6,7 @@ using System.Linq;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Layout;
namespace osu.Game.Graphics.Containers namespace osu.Game.Graphics.Containers
{ {
@ -142,15 +143,17 @@ namespace osu.Game.Graphics.Containers
public void ScrollToTop() => scrollContainer.ScrollTo(0); public void ScrollToTop() => scrollContainer.ScrollTo(0);
public override void InvalidateFromChild(Invalidation invalidation, Drawable source = null) protected override bool OnInvalidate(Invalidation invalidation, InvalidationSource source)
{ {
base.InvalidateFromChild(invalidation, source); var result = base.OnInvalidate(invalidation, source);
if ((invalidation & Invalidation.DrawSize) != 0) if (source == InvalidationSource.Child && (invalidation & Invalidation.DrawSize) != 0)
{ {
if (source == ExpandableHeader) //We need to recalculate the positions if the ExpandableHeader changed its size lastKnownScroll = -1;
lastKnownScroll = -1; result = true;
} }
return result;
} }
private float lastKnownScroll; private float lastKnownScroll;