sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-22 22:17:36 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update framework

Browse Source
This commit is contained in:
Dean Herbert 2017-06-08 14:51:22 +09:00
parent 8f909354bf
commit 64682a741c
5 changed files with 8 additions and 8 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 63a4ff05939bcb511a9f18d52dba1ceff99a1cd3

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

@ -86,6 +86,6 @@ namespace osu.Game.Overlays.Chat
} }
} }
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 @@ namespace osu.Game.Overlays.Mods
backgroundIcon.RotateTo(-rotate_angle * direction, mod_switch_duration, mod_switch_easing); backgroundIcon.RotateTo(-rotate_angle * direction, mod_switch_duration, mod_switch_easing);
backgroundIcon.Icon = modAfter.Icon; backgroundIcon.Icon = modAfter.Icon;
using (iconsContainer.BeginDelayedSequence(mod_switch_duration, true)) using (BeginDelayedSequence(mod_switch_duration, true))
{ {
foregroundIcon.RotateTo(-rotate_angle * direction); foregroundIcon.RotateTo(-rotate_angle * direction);
foregroundIcon.RotateTo(0f, mod_switch_duration, mod_switch_easing); foregroundIcon.RotateTo(0f, mod_switch_duration, mod_switch_easing);
@ -88,7 +88,7 @@ namespace osu.Game.Overlays.Mods
backgroundIcon.RotateTo(rotate_angle * direction); backgroundIcon.RotateTo(rotate_angle * direction);
backgroundIcon.RotateTo(0f, mod_switch_duration, mod_switch_easing); backgroundIcon.RotateTo(0f, mod_switch_duration, mod_switch_easing);
iconsContainer.Schedule(() => displayMod(modAfter)); Schedule(() => displayMod(modAfter));
} }
} }

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

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

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

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