aecw/osu-framework
1
0
Fork 0
mirror of https://github.com/SK-la/osu-framework.git synced 2026-03-15 03:20:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Send Invalidation type in internal Invalidated event flow

Browse Source
This commit is contained in:
Dean Herbert
2022-12-01 14:56:15 +09:00
parent f9409b6224
commit f11a6fb06e
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Framework.Tests/Layout/TestSceneContainerLayout.cs
View File

@@ -299,7 +299,7 @@ namespace osu.Framework.Tests.Layout
// Trigger a validation of draw size.
Assert.That(child.DrawSize, Is.EqualTo(new Vector2(200)));
child.Invalidated += _ => invalidated = true;
child.Invalidated += (_, _) => invalidated = true;
});
AddStep("resize parent", () => parent.Size = new Vector2(400));
@@ -328,7 +328,7 @@ namespace osu.Framework.Tests.Layout
AddStep("make child dead", () =>
{
child.LifetimeStart = double.MaxValue;
child.Invalidated += _ => invalidated = true;
child.Invalidated += (_, _) => invalidated = true;
});
// See above: won't cause an invalidation
@@ -364,7 +364,7 @@ namespace osu.Framework.Tests.Layout
}
};
child.Invalidated += _ => invalidated = true;
child.Invalidated += (_, _) => invalidated = true;
});
AddStep("invalidate parent", () =>
@@ -395,7 +395,7 @@ namespace osu.Framework.Tests.Layout
Child = child = new Box { RelativeSizeAxes = Axes.Both }
};
child.Invalidated += _ => invalidated = true;
child.Invalidated += (_, _) => invalidated = true;
});
AddStep("invalidate parent", () =>

4
osu.Framework/Graphics/Drawable.cs
View File

@@ -421,7 +421,7 @@ namespace osu.Framework.Graphics
/// <summary>.
/// Fired after the <see cref="Invalidate"/> method is called.
/// </summary>
internal event Action<Drawable> Invalidated;
internal event Action<Drawable, Invalidation> Invalidated;
/// <summary>
/// Fired after the <see cref="Dispose(bool)"/> method is called.
@@ -1811,7 +1811,7 @@ namespace osu.Framework.Graphics
if (anyInvalidated)
InvalidationID++;
Invalidated?.Invoke(this);
Invalidated?.Invoke(this, invalidation);
return anyInvalidated;
}

2
osu.Framework/Graphics/Visualisation/VisualisedDrawable.cs
View File

@@ -407,7 +407,7 @@ namespace osu.Framework.Graphics.Visualisation
private void onLayout() => activityLayout.FadeOutFromOne(1);
private void onInvalidated(Drawable d) => activityInvalidate.FadeOutFromOne(1);
private void onInvalidated(Drawable d, Invalidation invalidation) => activityInvalidate.FadeOutFromOne(1);
private void onDispose()
{