From bc0b982102a89c8e18ef46944c47e004ec82780b Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 30 Mar 2022 17:46:17 +0900 Subject: [PATCH] Remove song source from main wedge display This was definitely added at someone's request, since I wouldn't have put it here. But it's displayed below in the details section already and also not displayed in the updated "wedge" in the new design. See https://github.com/ppy/osu/discussions/17537 for discussion. --- .../Visual/SongSelect/TestSceneBeatmapInfoWedge.cs | 2 +- osu.Game/Screens/Select/BeatmapInfoWedge.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs index fd3f739c34..644a333fcf 100644 --- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs @@ -116,7 +116,7 @@ namespace osu.Game.Tests.Visual.SongSelect private void testBeatmapLabels(Ruleset ruleset) { AddAssert("check version", () => infoWedge.Info.VersionLabel.Current.Value == $"{ruleset.ShortName}Version"); - AddAssert("check title", () => infoWedge.Info.TitleLabel.Current.Value == $"{ruleset.ShortName}Source — {ruleset.ShortName}Title"); + AddAssert("check title", () => infoWedge.Info.TitleLabel.Current.Value == $"{ruleset.ShortName}Title"); AddAssert("check artist", () => infoWedge.Info.ArtistLabel.Current.Value == $"{ruleset.ShortName}Artist"); AddAssert("check author", () => infoWedge.Info.MapperContainer.ChildrenOfType().Any(s => s.Current.Value == $"{ruleset.ShortName}Author")); } diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs index 1e0aaf9c27..1a5a09afa3 100644 --- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs +++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs @@ -314,8 +314,8 @@ namespace osu.Game.Screens.Select } }; - titleBinding.BindValueChanged(_ => setMetadata(metadata.Source)); - artistBinding.BindValueChanged(_ => setMetadata(metadata.Source), true); + titleBinding.BindValueChanged(_ => setMetadata()); + artistBinding.BindValueChanged(_ => setMetadata(), true); addInfoLabels(); } @@ -352,10 +352,10 @@ namespace osu.Game.Screens.Select }, true); } - private void setMetadata(string source) + private void setMetadata() { ArtistLabel.Text = artistBinding.Value; - TitleLabel.Text = string.IsNullOrEmpty(source) ? titleBinding.Value : source + " — " + titleBinding.Value; + TitleLabel.Text = titleBinding.Value; } private void addInfoLabels()