h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 18:47:27 +08:00
Code Issues Releases Wiki Activity

Merge branch 'better-invalidations' into update-framework

Browse Source
This commit is contained in:
Dean Herbert 2017-06-08 19:46:19 +09:00
commit e3403c619c
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 63a4ff05939bcb511a9f18d52dba1ceff99a1cd3 Subproject commit 7131c54ea0a76ea03565ca93680487930c1c158a

2
osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs
View File

@ -134,7 +134,7 @@ namespace osu.Game.Rulesets.Mania.Timing
public override void InvalidateFromChild(Invalidation invalidation) public override void InvalidateFromChild(Invalidation invalidation)
{ {
// We only want to re-compute our size when a child's size or position has changed // We only want to re-compute our size when a child's size or position has changed
if ((invalidation & Invalidation.Geometry) == 0) if ((invalidation & Invalidation.RequiredParentSizeToFit) == 0)
{ {
base.InvalidateFromChild(invalidation); base.InvalidateFromChild(invalidation);
return; return;

2
osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
View File

@ -39,7 +39,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
set set
{ {
bounding = value; bounding = value;
Invalidate(Invalidation.Geometry); Invalidate(Invalidation.MiscGeometry);
} }
} }

2
osu.Game/Screens/Play/SquareGraph.cs
View File

@ -69,7 +69,7 @@ namespace osu.Game.Screens.Play
public override bool Invalidate(Invalidation invalidation = Invalidation.All, Drawable source = null, bool shallPropagate = true) public override bool Invalidate(Invalidation invalidation = Invalidation.All, Drawable source = null, bool shallPropagate = true)
{ {
if ((invalidation & Invalidation.SizeInParentSpace) > 0) if ((invalidation & Invalidation.DrawSize) > 0)
layout.Invalidate(); layout.Invalidate();
return base.Invalidate(invalidation, source, shallPropagate); return base.Invalidate(invalidation, source, shallPropagate);
} }