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

Remove difficulty width offsets and tidy up flow of information.

Browse Source
This commit is contained in:
Dean Herbert
2016-10-27 12:31:45 +09:00
parent f846505a92
commit ba5b2f2d73
3 changed files with 74 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
osu.Game/GameModes/Play/PlaySongSelect.cs
View File

@ -120,7 +120,7 @@ namespace osu.Game.GameModes.Play
// Temporary:
scrollContainer.Padding = new MarginPadding { Top = osuGame.Toolbar.Height };
}
beatmaps = (game as OsuGameBase).Beatmaps;
beatmaps.BeatmapSetAdded += bset => Scheduler.Add(() => addBeatmapSet(bset));
Task.Factory.StartNew(addBeatmapSets);
@ -136,21 +136,16 @@ namespace osu.Game.GameModes.Play
private void PlayMode_ValueChanged(object sender, EventArgs e)
{
}
private void selectBeatmapSet(BeatmapGroup group)
private void selectBeatmap(BeatmapGroup group, BeatmapInfo beatmap)
{
if (selectedBeatmapGroup == group)
return;
selectedBeatmapGroup.State = BeatmapGroup.GroupState.Collapsed;
if (selectedBeatmapGroup != null)
selectedBeatmapGroup.State = BeatmapGroup.GroupState.Collapsed;
selectedBeatmapGroup = group;
selectedBeatmapGroup.State = BeatmapGroup.GroupState.Expanded;
}
private void selectBeatmap(BeatmapGroup group, BeatmapInfo beatmap)
{
if (selectedBeatmap == beatmap)
return;
selectBeatmapSet(group);
selectedBeatmap = beatmap;
}
@ -158,16 +153,13 @@ namespace osu.Game.GameModes.Play
{
beatmapSet = beatmaps.GetWithChildren<BeatmapSetInfo>(beatmapSet.BeatmapSetID);
beatmapSet.Beatmaps.ForEach(b => beatmaps.GetChildren(b));
beatmapSet.Beatmaps = beatmapSet.Beatmaps.OrderBy(b => b.BaseDifficulty.OverallDifficulty)
.ToList();
beatmapSet.Beatmaps = beatmapSet.Beatmaps.OrderBy(b => b.BaseDifficulty.OverallDifficulty).ToList();
Schedule(() =>
{
var group = new BeatmapGroup(beatmapSet) { BeatmapSelected = selectBeatmap };
var group = new BeatmapGroup(beatmapSet) { SelectionChanged = selectBeatmap };
setList.Add(group);
if (setList.Children.Count() == 1)
{
selectedBeatmapGroup = group;
selectedBeatmap = group.SelectedBeatmap;
group.State = BeatmapGroup.GroupState.Expanded;
}
});