From ed2f5d210efe96beac035156f46d5d7c0a2a838c Mon Sep 17 00:00:00 2001 From: Jorolf Date: Tue, 11 Apr 2017 22:48:53 +0200 Subject: [PATCH] condensed some commits because they were small or already reversed --- osu.Game/Graphics/UserInterface/BarGraph.cs | 1 + osu.Game/Screens/Select/BeatmapDetailArea.cs | 2 +- osu.Game/Screens/Select/BeatmapDetails.cs | 14 +++++++------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/osu.Game/Graphics/UserInterface/BarGraph.cs b/osu.Game/Graphics/UserInterface/BarGraph.cs index 0b249d857b..d0965a1861 100644 --- a/osu.Game/Graphics/UserInterface/BarGraph.cs +++ b/osu.Game/Graphics/UserInterface/BarGraph.cs @@ -57,6 +57,7 @@ namespace osu.Game.Graphics.UserInterface Length = bar.Value / (MaxValue ?? value.Max()), Direction = Direction, }); + //I'm using ToList() here because Where() returns an Enumerable which can change it's elements afterwards Remove(Children.Where((bar, index) => index >= value.Count()).ToList()); } } diff --git a/osu.Game/Screens/Select/BeatmapDetailArea.cs b/osu.Game/Screens/Select/BeatmapDetailArea.cs index 23d40e0260..ae117254fa 100644 --- a/osu.Game/Screens/Select/BeatmapDetailArea.cs +++ b/osu.Game/Screens/Select/BeatmapDetailArea.cs @@ -28,7 +28,7 @@ namespace osu.Game.Screens.Select { beatmap = value; Leaderboard.Beatmap = beatmap?.BeatmapInfo; - Details.Beatmap = beatmap.Beatmap.BeatmapInfo; + Details.Beatmap = beatmap?.Beatmap.BeatmapInfo; } } diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs index b5a666e556..6f6b2f5880 100644 --- a/osu.Game/Screens/Select/BeatmapDetails.cs +++ b/osu.Game/Screens/Select/BeatmapDetails.cs @@ -12,7 +12,6 @@ using osu.Game.Database; using osu.Game.Graphics; using osu.Game.Graphics.Sprites; using osu.Game.Graphics.UserInterface; -using System.Collections.Generic; using System.Globalization; using System.Linq; @@ -50,6 +49,7 @@ namespace osu.Game.Screens.Select set { beatmap = value; + if (beatmap == null) return; description.Text = beatmap.Version; source.Text = beatmap.Metadata.Source; @@ -61,9 +61,9 @@ namespace osu.Game.Screens.Select approachRate.Value = beatmap.Difficulty.ApproachRate; stars.Value = (float)beatmap.StarDifficulty; - if (beatmap.Metric?.Ratings.Count() > 0) + if (beatmap.Metric?.Ratings.Count() == 10) { - List ratings = beatmap.Metric.Ratings.ToList(); + var ratings = beatmap.Metric.Ratings.ToList(); ratingsContainer.Show(); negativeRatings.Text = ratings.GetRange(0, 5).Sum().ToString(); @@ -75,10 +75,10 @@ namespace osu.Game.Screens.Select else ratingsContainer.Hide(); - if (beatmap.Metric?.Retries.Count() > 0 && beatmap.Metric?.Retries.Count() > 0) + if (beatmap.Metric?.Retries.Count() == 100 && beatmap.Metric?.Fails.Count() == 100) { - IEnumerable retries = beatmap.Metric.Retries; - IEnumerable fails = beatmap.Metric.Fails; + var retries = beatmap.Metric.Retries; + var fails = beatmap.Metric.Fails; retryFailContainer.Show(); float maxValue = fails.Zip(retries, (fail, retry) => fail + retry).Max(); @@ -111,7 +111,7 @@ namespace osu.Game.Screens.Select AutoSizeAxes = Axes.Y, Width = 0.4f, Direction = FillDirection.Vertical, - LayoutDuration = 1, + LayoutDuration = 200, LayoutEasing = EasingTypes.OutQuint, Padding = new MarginPadding(10) { Top = 25 }, Children = new []