RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #918 from peppy/update-framework 

Update framework
This commit is contained in:
Dean Herbert 2017-06-08 20:24:40 +09:00 committed by GitHub
parent 067a5a2401 ad3d6f8fb4
commit b2b1c08432
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 3ad1dd52ae511b816fb928f70ef811ec605c5c18
Subproject commit 7131c54ea0a76ea03565ca93680487930c1c158a

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

@ -134,7 +134,7 @@ private class AutoTimeRelativeContainer : Container
public override void InvalidateFromChild(Invalidation invalidation)
{
// 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);
return;

2
osu.Game/Overlays/Chat/DrawableChannel.cs
View File

@ -86,6 +86,6 @@ private void newMessagesArrived(IEnumerable<Message> newMessages)
}
}
private void scrollToEnd() => Scheduler.AddDelayed(() => scroll.ScrollToEnd(), 50);
private void scrollToEnd() => ScheduleAfterChildren(() => scroll.ScrollToEnd());
}
}

4
osu.Game/Overlays/Mods/ModButton.cs
View File

@ -80,7 +80,7 @@ protected int SelectedIndex
backgroundIcon.RotateTo(-rotate_angle * direction, mod_switch_duration, mod_switch_easing);
backgroundIcon.Icon = modAfter.Icon;
using (iconsContainer.BeginDelayedSequence(mod_switch_duration, true))
using (BeginDelayedSequence(mod_switch_duration, true))
{
foregroundIcon.RotateTo(-rotate_angle * direction);
foregroundIcon.RotateTo(0f, mod_switch_duration, mod_switch_easing);
@ -88,7 +88,7 @@ protected int SelectedIndex
backgroundIcon.RotateTo(rotate_angle * direction);
backgroundIcon.RotateTo(0f, mod_switch_duration, mod_switch_easing);
iconsContainer.Schedule(() => displayMod(modAfter));
Schedule(() => displayMod(modAfter));
}
}

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

@ -39,7 +39,7 @@ public bool Bounding
set
{
bounding = value;
Invalidate(Invalidation.Geometry);
Invalidate(Invalidation.MiscGeometry);
}
}

4
osu.Game/Screens/Edit/Editor.cs
View File

@ -25,13 +25,13 @@ protected override void OnResuming(Screen last)
protected override void OnEntering(Screen last)
{
base.OnEntering(last);
Background.Schedule(() => Background.FadeColour(Color4.DarkGray, 500));
Background.FadeColour(Color4.DarkGray, 500);
Beatmap?.Track?.Stop();
}
protected override bool OnExiting(Screen next)
{
Background.Schedule(() => Background.FadeColour(Color4.White, 500));
Background.FadeColour(Color4.White, 500);
Beatmap?.Track?.Start();
return base.OnExiting(next);
}

4
osu.Game/Screens/Multiplayer/Match.cs
View File

@ -24,12 +24,12 @@ protected override void OnEntering(Screen last)
{
base.OnEntering(last);
Background.Schedule(() => Background.FadeColour(Color4.DarkGray, 500));
Background.FadeColour(Color4.DarkGray, 500);
}
protected override bool OnExiting(Screen next)
{
Background.Schedule(() => Background.FadeColour(Color4.White, 500));
Background.FadeColour(Color4.White, 500);
return base.OnExiting(next);
}
}

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

@ -69,7 +69,7 @@ public SquareGraph()
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();
return base.Invalidate(invalidation, source, shallPropagate);
}