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

Move beatmap + mod info to header

Browse Source
This commit is contained in:
smoogipoo
2018-12-20 15:17:33 +09:00
parent 72016a416b
commit 2e28f378de
13 changed files with 153 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
View File

@ -47,7 +47,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
private readonly IBindableCollection<PlaylistItem> playlistBind = new BindableCollection<PlaylistItem>();
private readonly IBindable<DateTimeOffset> endDateBind = new Bindable<DateTimeOffset>();
private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
private readonly Bindable<BeatmapInfo> beatmap = new Bindable<BeatmapInfo>();
private UpdateableBeatmapBackgroundSprite background;
private BeatmapTitle beatmapTitle;
@ -243,6 +243,10 @@ namespace osu.Game.Screens.Multi.Lounge.Components
endDateBind.BindValueChanged(d => endDate.Date = d, true);
background.Beatmap.BindTo(beatmap);
modeTypeInfo.Beatmap.BindTo(beatmap);
beatmapTitle.Beatmap.BindTo(beatmap);
modeTypeInfo.Type.BindTo(typeBind);
participantInfo.Host.BindTo(hostBind);
@ -266,12 +270,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
return;
// For now, only the first playlist item is supported
var item = playlistBind.First();
beatmap.Value = beatmaps.GetWorkingBeatmap(item.Beatmap);
background.Beatmap.Value = item.Beatmap;
modeTypeInfo.Beatmap.Value = item.Beatmap;
beatmapTitle.Beatmap.Value = item.Beatmap;
beatmap.Value = playlistBind.First().Beatmap;
}
}
}

11
osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
View File

@ -39,7 +39,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
private readonly Bindable<IEnumerable<User>> participantsBind = new Bindable<IEnumerable<User>>();
private readonly IBindableCollection<PlaylistItem> playlistBind = new BindableCollection<PlaylistItem>();
private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
private readonly Bindable<BeatmapInfo> beatmap = new Bindable<BeatmapInfo>();
private OsuColour colours;
private Box statusStrip;
@ -190,6 +190,9 @@ namespace osu.Game.Screens.Multi.Lounge.Components
beatmapTypeInfo.Type.BindTo(typeBind);
background.Beatmap.BindTo(beatmap);
beatmapTypeInfo.Beatmap.BindTo(beatmap);
Room.BindValueChanged(updateRoom, true);
}
@ -244,11 +247,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
return;
// For now, only the first playlist item is supported
var item = playlistBind.First();
beatmap.Value = beatmaps.GetWorkingBeatmap(item.Beatmap);
background.Beatmap.Value = item.Beatmap;
beatmapTypeInfo.Beatmap.Value = item.Beatmap;
beatmap.Value = playlistBind.First().Beatmap;
}
protected override void UpdateAfterChildren()