Merge branch 'master' into notification-keybind

osu.Game.Tests/Visual/UserInterface/TestSceneRankingsSortTabControl.cs

@@ -0,0 +1,25 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Rankings;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneRankingsSortTabControl : OsuTestScene
+    {
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
+
+        public TestSceneRankingsSortTabControl()
+        {
+            Child = new RankingsSortTabControl
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre
+            };
+        }
+    }
+}

osu.Game/Online/Leaderboards/Leaderboard.cs

@@ -170,36 +170,37 @@ namespace osu.Game.Online.Leaderboards
         {
             InternalChildren = new Drawable[]
             {
-                new GridContainer
+                new OsuContextMenuContainer
                 {
                     RelativeSizeAxes = Axes.Both,
-                    RowDimensions = new[]
+                    Masking = true,
+                    Child = new GridContainer
                     {
-                        new Dimension(),
+                        RelativeSizeAxes = Axes.Both,
-                        new Dimension(GridSizeMode.AutoSize),
+                        RowDimensions = new[]
-                    },
-                    Content = new[]
-                    {
-                        new Drawable[]
                         {
-                            new OsuContextMenuContainer
+                            new Dimension(),
+                            new Dimension(GridSizeMode.AutoSize),
+                        },
+                        Content = new[]
+                        {
+                            new Drawable[]
                             {
-                                RelativeSizeAxes = Axes.Both,
+                                scrollContainer = new OsuScrollContainer
-                                Child = scrollContainer = new OsuScrollContainer
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     ScrollbarVisible = false,
                                 }
+                            },
+                            new Drawable[]
+                            {
+                                content = new Container
+                                {
+                                    AutoSizeAxes = Axes.Y,
+                                    RelativeSizeAxes = Axes.X,
+                                },
                             }
                         },
-                        new Drawable[]
-                        {
-                            content = new Container
-                            {
-                                AutoSizeAxes = Axes.Y,
-                                RelativeSizeAxes = Axes.X,
-                            },
-                        }
                     },
                 },
                 loading = new LoadingSpinner(),

osu.Game/Online/Leaderboards/LeaderboardScore.cs

@@ -58,6 +58,9 @@ namespace osu.Game.Online.Leaderboards
         [Resolved(CanBeNull = true)]
         private DialogOverlay dialogOverlay { get; set; }
 
+        [Resolved(CanBeNull = true)]
+        private SongSelect songSelect { get; set; }
+
         public LeaderboardScore(ScoreInfo score, int? rank, bool allowHighlight = true)
         {
             this.score = score;
@@ -373,6 +376,9 @@ namespace osu.Game.Online.Leaderboards
             {
                 List<MenuItem> items = new List<MenuItem>();
 
+                if (score.Mods.Length > 0 && modsContainer.Any(s => s.IsHovered) && songSelect != null)
+                    items.Add(new OsuMenuItem("Use these mods", MenuItemType.Highlighted, () => songSelect.Mods.Value = score.Mods));
+
                 if (score.ID != 0)
                     items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => dialogOverlay?.Push(new LocalScoreDeleteDialog(score))));
 

osu.Game/Overlays/Comments/CommentsHeader.cs

@@ -86,7 +86,7 @@ namespace osu.Game.Overlays.Comments
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
-                            Font = OsuFont.GetFont(size: 12),
+                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
                             Text = @"Show deleted"
                         }
                     },

osu.Game/Overlays/OverlaySortTabControl.cs

@@ -30,6 +30,14 @@ namespace osu.Game.Overlays
             set => current.Current = value;
         }
 
+        public string Title
+        {
+            get => text.Text;
+            set => text.Text = value;
+        }
+
+        private readonly OsuSpriteText text;
+
         public OverlaySortTabControl()
         {
             AutoSizeAxes = Axes.Both;
@@ -40,11 +48,11 @@ namespace osu.Game.Overlays
                 Spacing = new Vector2(10, 0),
                 Children = new Drawable[]
                 {
-                    new OsuSpriteText
+                    text = new OsuSpriteText
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
-                        Font = OsuFont.GetFont(size: 12),
+                        Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
                         Text = @"Sort by"
                     },
                     CreateControl().With(c =>
@@ -133,7 +141,7 @@ namespace osu.Game.Overlays
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            Font = OsuFont.GetFont(size: 12),
+                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
                             Text = (value as Enum)?.GetDescription() ?? value.ToString()
                         }
                     }
@@ -163,7 +171,7 @@ namespace osu.Game.Overlays
 
                 ContentColour = Active.Value && !IsHovered ? colourProvider.Light1 : Color4.White;
 
-                text.Font = text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.Medium);
+                text.Font = text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.SemiBold);
             }
         }
     }

osu.Game/Overlays/Rankings/RankingsSortTabControl.cs

@@ -0,0 +1,19 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Overlays.Rankings
+{
+    public class RankingsSortTabControl : OverlaySortTabControl<RankingsSortCriteria>
+    {
+        public RankingsSortTabControl()
+        {
+            Title = "Show";
+        }
+    }
+
+    public enum RankingsSortCriteria
+    {
+        All,
+        Friends
+    }
+}