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

Reset MusicController

Browse Source
This commit is contained in:
DrabWeb
2017-04-09 04:12:30 -03:00
parent 963cd09bd0
commit 2d6a2f41aa
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Overlays/MusicController.cs
View File

@ -28,15 +28,10 @@ namespace osu.Game.Overlays
{ {
public class MusicController : FocusedOverlayContainer public class MusicController : FocusedOverlayContainer
{ {
private const float player_height = 130;
private Drawable currentBackground; private Drawable currentBackground;
private DragBar progress; private DragBar progress;
private Button playButton; private Button playButton;
private SpriteText title, artist; private SpriteText title, artist;
private ClickableContainer playlistButton;
private PlaylistController playlist;
private Color4 activeColour;
private Container playerContainer;
private List<BeatmapSetInfo> playList; private List<BeatmapSetInfo> playList;
private readonly List<BeatmapInfo> playHistory = new List<BeatmapInfo>(); private readonly List<BeatmapInfo> playHistory = new List<BeatmapInfo>();
@ -58,7 +53,7 @@ namespace osu.Game.Overlays
public MusicController() public MusicController()
{ {
Width = 400; Width = 400;
Height = player_height + 510; //510 = playlist height Height = 130;
Margin = new MarginPadding(10); Margin = new MarginPadding(10);
} }
@ -87,8 +82,6 @@ namespace osu.Game.Overlays
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuGameBase game, OsuConfigManager config, BeatmapDatabase beatmaps, OsuColour colours) private void load(OsuGameBase game, OsuConfigManager config, BeatmapDatabase beatmaps, OsuColour colours)
{ {
activeColour = colours.Yellow;
Children = new Drawable[] Children = new Drawable[]
{ {
dragContainer = new Container dragContainer = new Container
@ -199,9 +192,8 @@ namespace osu.Game.Overlays
beatmapSource = game.Beatmap ?? new Bindable<WorkingBeatmap>(); beatmapSource = game.Beatmap ?? new Bindable<WorkingBeatmap>();
playList = beatmaps.GetAllWithChildren<BeatmapSetInfo>(); playList = beatmaps.GetAllWithChildren<BeatmapSetInfo>();
playlist.StateChanged += (c, s) => playlistButton.FadeColour(s == Visibility.Visible ? activeColour : Color4.White, transition_length, EasingTypes.OutQuint);
currentBackground = new MusicControllerBackground(); currentBackground = new MusicControllerBackground();
playerContainer.Add(currentBackground); dragContainer.Add(currentBackground);
} }
protected override void LoadComplete() protected override void LoadComplete()
@ -325,11 +317,10 @@ namespace osu.Game.Overlays
BeatmapMetadata metadata = beatmap.Beatmap.BeatmapInfo.Metadata; BeatmapMetadata metadata = beatmap.Beatmap.BeatmapInfo.Metadata;
title.Text = preferUnicode ? metadata.TitleUnicode : metadata.Title; title.Text = preferUnicode ? metadata.TitleUnicode : metadata.Title;
artist.Text = preferUnicode ? metadata.ArtistUnicode : metadata.Artist; artist.Text = preferUnicode ? metadata.ArtistUnicode : metadata.Artist;
playlist.Current = beatmap.BeatmapSetInfo;
} }
}); });
playerContainer.Add(new AsyncLoadWrapper(new MusicControllerBackground(beatmap) dragContainer.Add(new AsyncLoadWrapper(new MusicControllerBackground(beatmap)
{ {
OnLoadComplete = d => OnLoadComplete = d =>
{ {
@ -353,6 +344,7 @@ namespace osu.Game.Overlays
{ {
Depth = float.MaxValue, Depth = float.MaxValue,
}); });
};
} }
private void seek(float position) private void seek(float position)