Merge branch 'master' into fix-parameters-inspection

osu.Game/OsuGame.cs

@@ -353,6 +353,9 @@ public void HandleLink(LinkDetails link) => Schedule(() =>
                     break;
 
                 case LinkAction.SearchBeatmapSet:
+                    if (link.Argument is RomanisableString romanisable)
+                        SearchBeatmapSet(romanisable.GetPreferred(Localisation.CurrentParameters.Value.PreferOriginalScript));
+                    else
                         SearchBeatmapSet(argString);
                     break;
 

osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs

@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -12,17 +13,20 @@
 using osu.Game.Graphics.Cursor;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Online.Chat;
 using osu.Game.Overlays.BeatmapSet.Buttons;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays.BeatmapSet
 {
@@ -41,12 +45,10 @@ public partial class BeatmapSetHeaderContent : CompositeDrawable
 
         private readonly UpdateableOnlineBeatmapSetCover cover;
         private readonly Box coverGradient;
-        private readonly OsuSpriteText title, artist;
+        private readonly LinkFlowContainer title, artist;
         private readonly AuthorInfo author;
 
-        private readonly ExplicitContentBeatmapBadge explicitContent;
+        private ExternalLinkButton externalLink;
-        private readonly SpotlightBeatmapBadge spotlight;
-        private readonly FeaturedArtistBeatmapBadge featuredArtist;
 
         private readonly FillFlowContainer downloadButtonsContainer;
         private readonly BeatmapAvailability beatmapAvailability;
@@ -65,8 +67,6 @@ public partial class BeatmapSetHeaderContent : CompositeDrawable
 
         public BeatmapSetHeaderContent()
         {
-            ExternalLinkButton externalLink;
-
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
             InternalChild = new Container
@@ -120,58 +120,19 @@ public BeatmapSetHeaderContent()
                                             AutoSizeAxes = Axes.Y,
                                             Child = Picker = new BeatmapPicker(),
                                         },
-                                        new FillFlowContainer
+                                        title = new MetadataFlowContainer(s =>
+                                        {
+                                            s.Font = OsuFont.GetFont(size: 30, weight: FontWeight.SemiBold, italics: true);
+                                        })
                                         {
-                                            Direction = FillDirection.Horizontal,
-                                            AutoSizeAxes = Axes.Both,
                                             Margin = new MarginPadding { Top = 15 },
-                                            Children = new Drawable[]
-                                            {
-                                                title = new OsuSpriteText
-                                                {
-                                                    Font = OsuFont.GetFont(size: 30, weight: FontWeight.SemiBold, italics: true)
                                         },
-                                                externalLink = new ExternalLinkButton
+                                        artist = new MetadataFlowContainer(s =>
                                         {
-                                                    Anchor = Anchor.BottomLeft,
+                                            s.Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium, italics: true);
-                                                    Origin = Anchor.BottomLeft,
+                                        })
-                                                    Margin = new MarginPadding { Left = 5, Bottom = 4 }, // To better lineup with the font
-                                                },
-                                                explicitContent = new ExplicitContentBeatmapBadge
                                         {
-                                                    Alpha = 0f,
-                                                    Anchor = Anchor.BottomLeft,
-                                                    Origin = Anchor.BottomLeft,
-                                                    Margin = new MarginPadding { Left = 10, Bottom = 4 },
-                                                },
-                                                spotlight = new SpotlightBeatmapBadge
-                                                {
-                                                    Alpha = 0f,
-                                                    Anchor = Anchor.BottomLeft,
-                                                    Origin = Anchor.BottomLeft,
-                                                    Margin = new MarginPadding { Left = 10, Bottom = 4 },
-                                                }
-                                            }
-                                        },
-                                        new FillFlowContainer
-                                        {
-                                            Direction = FillDirection.Horizontal,
-                                            AutoSizeAxes = Axes.Both,
                                             Margin = new MarginPadding { Bottom = 20 },
-                                            Children = new Drawable[]
-                                            {
-                                                artist = new OsuSpriteText
-                                                {
-                                                    Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium, italics: true),
-                                                },
-                                                featuredArtist = new FeaturedArtistBeatmapBadge
-                                                {
-                                                    Alpha = 0f,
-                                                    Anchor = Anchor.BottomLeft,
-                                                    Origin = Anchor.BottomLeft,
-                                                    Margin = new MarginPadding { Left = 10 }
-                                                }
-                                            }
                                         },
                                         new Container
                                         {
@@ -237,12 +198,17 @@ public BeatmapSetHeaderContent()
             Picker.Beatmap.ValueChanged += b =>
             {
                 Details.BeatmapInfo = b.NewValue;
-                externalLink.Link = $@"{api.WebsiteRootUrl}/beatmapsets/{BeatmapSet.Value?.OnlineID}#{b.NewValue?.Ruleset.ShortName}/{b.NewValue?.OnlineID}";
+                updateExternalLink();
 
                 onlineStatusPill.Status = b.NewValue?.Status ?? BeatmapOnlineStatus.None;
             };
         }
 
+        private void updateExternalLink()
+        {
+            if (externalLink != null) externalLink.Link = $@"{api.WebsiteRootUrl}/beatmapsets/{BeatmapSet.Value?.OnlineID}#{Picker.Beatmap.Value?.Ruleset.ShortName}/{Picker.Beatmap.Value?.OnlineID}";
+        }
+
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
         {
@@ -275,12 +241,38 @@ private void load(OverlayColourProvider colourProvider)
 
                     loading.Hide();
 
-                    title.Text = new RomanisableString(setInfo.NewValue.TitleUnicode, setInfo.NewValue.Title);
+                    var titleText = new RomanisableString(setInfo.NewValue.TitleUnicode, setInfo.NewValue.Title);
-                    artist.Text = new RomanisableString(setInfo.NewValue.ArtistUnicode, setInfo.NewValue.Artist);
+                    var artistText = new RomanisableString(setInfo.NewValue.ArtistUnicode, setInfo.NewValue.Artist);
 
-                    explicitContent.Alpha = setInfo.NewValue.HasExplicitContent ? 1 : 0;
+                    title.Clear();
-                    spotlight.Alpha = setInfo.NewValue.FeaturedInSpotlight ? 1 : 0;
+                    artist.Clear();
-                    featuredArtist.Alpha = setInfo.NewValue.TrackId != null ? 1 : 0;
+
+                    title.AddLink(titleText, LinkAction.SearchBeatmapSet, titleText);
+
+                    title.AddArbitraryDrawable(Empty().With(d => d.Width = 5));
+                    title.AddArbitraryDrawable(externalLink = new ExternalLinkButton());
+
+                    if (setInfo.NewValue.HasExplicitContent)
+                    {
+                        title.AddArbitraryDrawable(Empty().With(d => d.Width = 10));
+                        title.AddArbitraryDrawable(new ExplicitContentBeatmapBadge());
+                    }
+
+                    if (setInfo.NewValue.FeaturedInSpotlight)
+                    {
+                        title.AddArbitraryDrawable(Empty().With(d => d.Width = 10));
+                        title.AddArbitraryDrawable(new SpotlightBeatmapBadge());
+                    }
+
+                    artist.AddLink(artistText, LinkAction.SearchBeatmapSet, artistText);
+
+                    if (setInfo.NewValue.TrackId != null)
+                    {
+                        artist.AddArbitraryDrawable(Empty().With(d => d.Width = 10));
+                        artist.AddArbitraryDrawable(new FeaturedArtistBeatmapBadge());
+                    }
+
+                    updateExternalLink();
 
                     onlineStatusPill.FadeIn(500, Easing.OutQuint);
 
@@ -327,5 +319,32 @@ private void updateDownloadButtons()
                     break;
             }
         }
+
+        public partial class MetadataFlowContainer : LinkFlowContainer
+        {
+            public MetadataFlowContainer(Action<SpriteText> defaultCreationParameters = null)
+                : base(defaultCreationParameters)
+            {
+                TextAnchor = Anchor.CentreLeft;
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+            }
+
+            protected override DrawableLinkCompiler CreateLinkCompiler(ITextPart textPart) => new MetadataLinkCompiler(textPart);
+
+            public partial class MetadataLinkCompiler : DrawableLinkCompiler
+            {
+                public MetadataLinkCompiler(ITextPart part)
+                    : base(part)
+                {
+                }
+
+                [BackgroundDependencyLoader]
+                private void load()
+                {
+                    IdleColour = Color4.White;
+                }
+            }
+        }
     }
 }