Merge pull request #24204 from peppy/results-screen-component-metrics

Touch up various results screen component's metrics

osu.Game.Rulesets.Mania/ManiaRuleset.cs

@@ -412,7 +412,7 @@ public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatm
  RelativeSizeAxes = Axes.X,
  Height = 250
  }, true),
- new StatisticItem("Statistics", () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
+ new StatisticItem("Statistics", () => new SimpleStatisticTable(2, new SimpleStatisticItem[]
  {
  new AverageHitError(score.HitEvents),
  new UnstableRate(score.HitEvents)

osu.Game.Rulesets.Osu/OsuRuleset.cs

@@ -319,7 +319,7 @@ public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatm
  RelativeSizeAxes = Axes.X,
  Height = 250
  }, true),
- new StatisticItem("Statistics", () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
+ new StatisticItem("Statistics", () => new SimpleStatisticTable(2, new SimpleStatisticItem[]
  {
  new AverageHitError(timedHitEvents),
  new UnstableRate(timedHitEvents)

osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs

@@ -11,6 +11,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Scoring;
@@ -120,18 +121,22 @@ private void load()
  new OsuSpriteText
  {
  Text = "Overshoot",
+ Font = OsuFont.GetFont(size: 12),
  Anchor = Anchor.Centre,
- Origin = Anchor.BottomCentre,
- Padding = new MarginPadding(3),
+ Origin = Anchor.BottomLeft,
+ Padding = new MarginPadding(2),
+ Rotation = -rotation,
  RelativePositionAxes = Axes.Both,
  Y = -(inner_portion + line_extension) / 2,
  },
  new OsuSpriteText
  {
  Text = "Undershoot",
+ Font = OsuFont.GetFont(size: 12),
  Anchor = Anchor.Centre,
- Origin = Anchor.TopCentre,
- Padding = new MarginPadding(3),
+ Origin = Anchor.TopRight,
+ Rotation = -rotation,
+ Padding = new MarginPadding(2),
  RelativePositionAxes = Axes.Both,
  Y = (inner_portion + line_extension) / 2,
  },

osu.Game.Rulesets.Taiko/TaikoRuleset.cs

@@ -256,7 +256,7 @@ public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatm
  RelativeSizeAxes = Axes.X,
  Height = 250
  }, true),
- new StatisticItem("Statistics", () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
+ new StatisticItem("Statistics", () => new SimpleStatisticTable(2, new SimpleStatisticItem[]
  {
  new AverageHitError(timedHitEvents),
  new UnstableRate(timedHitEvents)

osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs

@@ -131,14 +131,11 @@ private void createBarDrawables()
 
  Container axisFlow;
 
- const float axis_font_size = 12;
+ Padding = new MarginPadding { Horizontal = 5 };
 
  InternalChild = new GridContainer
  {
- Anchor = Anchor.Centre,
- Origin = Anchor.Centre,
  RelativeSizeAxes = Axes.Both,
- Width = 0.8f,
  Content = new[]
  {
  new Drawable[]
@@ -154,7 +151,7 @@ private void createBarDrawables()
  axisFlow = new Container
  {
  RelativeSizeAxes = Axes.X,
- Height = axis_font_size,
+ Height = StatisticItem.FONT_SIZE,
  }
  },
  },
@@ -174,7 +171,7 @@ private void createBarDrawables()
  Anchor = Anchor.Centre,
  Origin = Anchor.Centre,
  Text = "0",
- Font = OsuFont.GetFont(size: axis_font_size, weight: FontWeight.SemiBold)
+ Font = OsuFont.GetFont(size: StatisticItem.FONT_SIZE, weight: FontWeight.SemiBold)
  });
 
  for (int i = 1; i <= axis_points; i++)
@@ -191,7 +188,7 @@ private void createBarDrawables()
  X = -position / 2,
  Alpha = alpha,
  Text = axisValue.ToString("-0"),
- Font = OsuFont.GetFont(size: axis_font_size, weight: FontWeight.SemiBold)
+ Font = OsuFont.GetFont(size: StatisticItem.FONT_SIZE, weight: FontWeight.SemiBold)
  });
 
  axisFlow.Add(new OsuSpriteText
@@ -202,7 +199,7 @@ private void createBarDrawables()
  X = position / 2,
  Alpha = alpha,
  Text = axisValue.ToString("+0"),
- Font = OsuFont.GetFont(size: axis_font_size, weight: FontWeight.SemiBold)
+ Font = OsuFont.GetFont(size: StatisticItem.FONT_SIZE, weight: FontWeight.SemiBold)
  });
  }
  }

osu.Game/Screens/Ranking/Statistics/PerformanceBreakdownChart.cs

@@ -97,15 +97,15 @@ private void load()
  {
  Origin = Anchor.CentreLeft,
  Anchor = Anchor.CentreLeft,
- Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 18),
+ Font = OsuFont.GetFont(weight: FontWeight.Regular, size: StatisticItem.FONT_SIZE),
  Text = "Achieved PP",
  Colour = Color4Extensions.FromHex("#66FFCC")
  },
  achievedPerformance = new OsuSpriteText
  {
  Origin = Anchor.CentreRight,
  Anchor = Anchor.CentreRight,
- Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 18),
+ Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: StatisticItem.FONT_SIZE),
  Colour = Color4Extensions.FromHex("#66FFCC")
  }
  },
@@ -115,15 +115,15 @@ private void load()
  {
  Origin = Anchor.CentreLeft,
  Anchor = Anchor.CentreLeft,
- Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 18),
+ Font = OsuFont.GetFont(weight: FontWeight.Regular, size: StatisticItem.FONT_SIZE),
  Text = "Maximum",
  Colour = OsuColour.Gray(0.7f)
  },
  maximumPerformance = new OsuSpriteText
  {
  Origin = Anchor.CentreLeft,
  Anchor = Anchor.CentreLeft,
- Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 18),
+ Font = OsuFont.GetFont(weight: FontWeight.Regular, size: StatisticItem.FONT_SIZE),
  Colour = OsuColour.Gray(0.7f)
  }
  }
@@ -208,7 +208,7 @@ private Drawable[] createAttributeRow(PerformanceDisplayAttribute attribute, Per
  {
  Origin = Anchor.CentreLeft,
  Anchor = Anchor.CentreLeft,
- Font = OsuFont.GetFont(weight: FontWeight.Regular),
+ Font = OsuFont.GetFont(weight: FontWeight.Regular, size: StatisticItem.FONT_SIZE),
  Text = attribute.DisplayName,
  Colour = Colour4.White
  },
@@ -233,7 +233,7 @@ private Drawable[] createAttributeRow(PerformanceDisplayAttribute attribute, Per
  {
  Origin = Anchor.CentreRight,
  Anchor = Anchor.CentreRight,
- Font = OsuFont.GetFont(weight: FontWeight.SemiBold),
+ Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: StatisticItem.FONT_SIZE),
  Text = percentage.ToLocalisableString("0%"),
  Colour = Colour4.White
  }

osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs

@@ -44,13 +44,13 @@ protected SimpleStatisticItem(string name)
  Text = Name,
  Anchor = Anchor.CentreLeft,
  Origin = Anchor.CentreLeft,
- Font = OsuFont.GetFont(size: 14)
+ Font = OsuFont.GetFont(size: StatisticItem.FONT_SIZE)
  },
  value = new OsuSpriteText
  {
  Anchor = Anchor.CentreRight,
  Origin = Anchor.CentreRight,
- Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold)
+ Font = OsuFont.GetFont(size: StatisticItem.FONT_SIZE, weight: FontWeight.Bold)
  }
  });
  }

osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs

@@ -98,12 +98,11 @@ private IEnumerable<Drawable> createColumns()
  Direction = FillDirection.Vertical
  };
 
- private partial class Spacer : CompositeDrawable
+ public partial class Spacer : CompositeDrawable
  {
  public Spacer()
  {
  RelativeSizeAxes = Axes.Both;
- Padding = new MarginPadding { Vertical = 4 };
 
  InternalChild = new CircularContainer
  {

osu.Game/Screens/Ranking/Statistics/StatisticItem.cs

@@ -12,6 +12,11 @@ namespace osu.Game.Screens.Ranking.Statistics
  /// </summary>
  public class StatisticItem
  {
+ /// <summary>
+ /// The recommended font size to use in statistic items to make sure they match others.
+ /// </summary>
+ public const float FONT_SIZE = 13;
+
  /// <summary>
  /// The name of this item.
  /// </summary>

osu.Game/Screens/Ranking/Statistics/StatisticContainer.cs → osu.Game/Screens/Ranking/Statistics/StatisticItemContainer.cs

@@ -3,6 +3,7 @@
 
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
@@ -15,42 +16,53 @@ namespace osu.Game.Screens.Ranking.Statistics
  /// <summary>
  /// Wraps a <see cref="StatisticItem"/> to add a header and suitable layout for use in <see cref="ResultsScreen"/>.
  /// </summary>
- internal partial class StatisticContainer : CompositeDrawable
+ internal partial class StatisticItemContainer : CompositeDrawable
  {
  /// <summary>
- /// Creates a new <see cref="StatisticContainer"/>.
+ /// Creates a new <see cref="StatisticItemContainer"/>.
  /// </summary>
  /// <param name="item">The <see cref="StatisticItem"/> to display.</param>
- public StatisticContainer(StatisticItem item)
+ public StatisticItemContainer(StatisticItem item)
  {
  RelativeSizeAxes = Axes.X;
  AutoSizeAxes = Axes.Y;
 
- InternalChild = new GridContainer
+ Padding = new MarginPadding(5);
+
+ InternalChild = new Container
  {
  RelativeSizeAxes = Axes.X,
  AutoSizeAxes = Axes.Y,
- Content = new[]
+ Masking = true,
+ CornerRadius = 6,
+ Children = new Drawable[]
  {
- new[]
+ new Box
  {
- createHeader(item)
+ Colour = ColourInfo.GradientVertical(
+ OsuColour.Gray(0.25f),
+ OsuColour.Gray(0.18f)
+ ),
+ Alpha = 0.95f,
+ RelativeSizeAxes = Axes.Both,
  },
- new Drawable[]
+ new Container
  {
- new Container
+ RelativeSizeAxes = Axes.X,
+ AutoSizeAxes = Axes.Y,
+ Padding = new MarginPadding(5),
+ Children = new[]
  {
- RelativeSizeAxes = Axes.X,
- AutoSizeAxes = Axes.Y,
- Margin = new MarginPadding { Top = 15 },
- Child = item.CreateContent()
+ createHeader(item),
+ new Container
+ {
+ RelativeSizeAxes = Axes.X,
+ AutoSizeAxes = Axes.Y,
+ Padding = new MarginPadding(10) { Top = 30 },
+ Child = item.CreateContent()
+ }
  }
  },
- },
- RowDimensions = new[]
- {
- new Dimension(GridSizeMode.AutoSize),
- new Dimension(GridSizeMode.AutoSize),
  }
  };
  }
@@ -63,7 +75,7 @@ private static Drawable createHeader(StatisticItem item)
  return new FillFlowContainer
  {
  RelativeSizeAxes = Axes.X,
- AutoSizeAxes = Axes.Y,
+ Height = 20,
  Direction = FillDirection.Horizontal,
  Spacing = new Vector2(5, 0),
  Children = new Drawable[]
@@ -81,7 +93,7 @@ private static Drawable createHeader(StatisticItem item)
  Anchor = Anchor.CentreLeft,
  Origin = Anchor.CentreLeft,
  Text = item.Name,
- Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold),
+ Font = OsuFont.GetFont(size: StatisticItem.FONT_SIZE, weight: FontWeight.SemiBold),
  }
  }
  };

osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs

@@ -124,20 +124,23 @@ private void populateStatistics(ValueChangedEvent<ScoreInfo> score)
  }
  else
  {
- FillFlowContainer rows;
+ FillFlowContainer flow;
  container = new OsuScrollContainer(Direction.Vertical)
  {
  RelativeSizeAxes = Axes.Both,
  Anchor = Anchor.Centre,
  Origin = Anchor.Centre,
+ Masking = false,
+ ScrollbarOverlapsContent = false,
  Alpha = 0,
  Children = new[]
  {
- rows = new FillFlowContainer
+ flow = new FillFlowContainer
  {
  RelativeSizeAxes = Axes.X,
  AutoSizeAxes = Axes.Y,
- Spacing = new Vector2(30, 15)
+ Spacing = new Vector2(30, 15),
+ Direction = FillDirection.Full,
  }
  }
  };
@@ -146,35 +149,22 @@ private void populateStatistics(ValueChangedEvent<ScoreInfo> score)
 
  foreach (var item in statisticItems)
  {
- var columnContent = new List<Drawable>();
-
  if (!hitEventsAvailable && item.RequiresHitEvents)
  {
  anyRequiredHitEvents = true;
  continue;
  }
 
- columnContent.Add(new StatisticContainer(item)
- {
- Anchor = Anchor.Centre,
- Origin = Anchor.Centre,
- });
-
- rows.Add(new GridContainer
+ flow.Add(new StatisticItemContainer(item)
  {
  Anchor = Anchor.TopCentre,
  Origin = Anchor.TopCentre,
- RelativeSizeAxes = Axes.X,
- AutoSizeAxes = Axes.Y,
- Content = new[] { columnContent.ToArray() },
- ColumnDimensions = new[] { new Dimension() },
- RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
  });
  }
 
  if (anyRequiredHitEvents)
  {
- rows.Add(new FillFlowContainer
+ flow.Add(new FillFlowContainer
  {
  RelativeSizeAxes = Axes.X,
  AutoSizeAxes = Axes.Y,