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

Merge remote-tracking branch 'peppy/polling-component' into timeshift-api-integration

Browse Source 
# Conflicts:
#	osu.Game/osu.Game.csproj
This commit is contained in:
smoogipoo
2018-12-12 16:22:14 +09:00
parent 6123a11b67 7dc1f5b771
commit 9af2b49c01
37 changed files with 479 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Overlays/Music/PlaylistItem.cs
View File

@ -8,7 +8,6 @@ using osuTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Events;
using osu.Framework.Localisation;
using osu.Game.Beatmaps;
@ -27,7 +26,7 @@ namespace osu.Game.Overlays.Music
private SpriteIcon handle;
private TextFlowContainer text;
private IEnumerable<SpriteText> titleSprites;
private IEnumerable<Drawable> titleSprites;
private ILocalisedBindableString titleBind;
private ILocalisedBindableString artistBind;
@ -59,7 +58,7 @@ namespace osu.Game.Overlays.Music
selected = value;
FinishTransforms(true);
foreach (SpriteText s in titleSprites)
foreach (Drawable s in titleSprites)
s.FadeColour(Selected ? hoverColour : Color4.White, fade_duration);
}
}