Merge branch 'master' into popup-word-wrap

osu.Game.Tests/Visual/TestCaseBeatmapCarousel.cs

@@ -70,6 +70,7 @@ namespace osu.Game.Tests.Visual
 
             testRemoveAll();
             testEmptyTraversal();
+            testHiding();
         }
 
         private void ensureRandomFetchSuccess() =>
@@ -295,6 +296,40 @@ namespace osu.Game.Tests.Visual
             checkNoSelection();
         }
 
+        private void testHiding()
+        {
+            var hidingSet = createTestBeatmapSet(1);
+            hidingSet.Beatmaps[1].Hidden = true;
+            AddStep("Add set with diff 2 hidden", () => carousel.UpdateBeatmapSet(hidingSet));
+            setSelected(1, 1);
+
+            checkVisibleItemCount(true, 2);
+            advanceSelection(true);
+            checkSelected(1, 3);
+
+            setHidden(3);
+            checkSelected(1, 1);
+
+            setHidden(2, false);
+            advanceSelection(true);
+            checkSelected(1, 2);
+
+            setHidden(1);
+            checkSelected(1, 2);
+
+            setHidden(2);
+            checkNoSelection();
+
+            void setHidden(int diff, bool hidden = true)
+            {
+                AddStep((hidden ? "" : "un") + $"hide diff {diff}", () =>
+                {
+                    hidingSet.Beatmaps[diff - 1].Hidden = hidden;
+                    carousel.UpdateBeatmapSet(hidingSet);
+                });
+            }
+        }
+
         private BeatmapSetInfo createTestBeatmapSet(int i)
         {
             return new BeatmapSetInfo

osu.Game.Tests/Visual/TestCaseNotificationOverlay.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.MathUtils;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
@@ -25,6 +26,12 @@ namespace osu.Game.Tests.Visual
                 Origin = Anchor.TopRight
             });
 
+            SpriteText displayedCount = new SpriteText();
+
+            Content.Add(displayedCount);
+
+            manager.UnreadCount.ValueChanged += count => { displayedCount.Text = $"displayed count: {count}"; };
+
             AddStep(@"toggle", manager.ToggleVisibility);
             AddStep(@"simple #1", sendHelloNotification);
             AddStep(@"simple #2", sendAmazingNotification);

osu.Game.Tests/Visual/TestCaseToolbar.cs

@@ -0,0 +1,39 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Overlays.Toolbar;
+
+namespace osu.Game.Tests.Visual
+{
+    public class TestCaseToolbar : OsuTestCase
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(ToolbarButton),
+            typeof(ToolbarModeSelector),
+            typeof(ToolbarModeButton),
+            typeof(ToolbarNotificationButton),
+        };
+
+        public TestCaseToolbar()
+        {
+            var toolbar = new Toolbar { State = Visibility.Visible };
+
+            Add(toolbar);
+
+            var notificationButton = toolbar.Children.OfType<FillFlowContainer>().Last().Children.OfType<ToolbarNotificationButton>().First();
+
+            void setNotifications(int count) => AddStep($"set notification count to {count}", () => notificationButton.NotificationCount.Value = count);
+
+            setNotifications(1);
+            setNotifications(2);
+            setNotifications(3);
+            setNotifications(0);
+            setNotifications(144);
+        }
+    }
+}

osu.Game.Tests/Visual/TestCaseUserProfile.cs

@@ -13,6 +13,8 @@ namespace osu.Game.Tests.Visual
 {
     public class TestCaseUserProfile : OsuTestCase
     {
+        private readonly TestUserProfileOverlay profile;
+
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(ProfileHeader),
@@ -23,8 +25,12 @@ namespace osu.Game.Tests.Visual
 
         public TestCaseUserProfile()
         {
-            var profile = new UserProfileOverlay();
+            Add(profile = new TestUserProfileOverlay());
-            Add(profile);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
 
             AddStep("Show offline dummy", () => profile.ShowUser(new User
             {
@@ -48,6 +54,9 @@ namespace osu.Game.Tests.Visual
                     Data = Enumerable.Range(2345, 45).Concat(Enumerable.Range(2109, 40)).ToArray()
                 }
             }, false));
+
+            checkSupporterTag(false);
+
             AddStep("Show ppy", () => profile.ShowUser(new User
             {
                 Username = @"peppy",
@@ -55,6 +64,9 @@ namespace osu.Game.Tests.Visual
                 Country = new Country { FullName = @"Australia", FlagName = @"AU" },
                 CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg"
             }));
+
+            checkSupporterTag(true);
+
             AddStep("Show flyte", () => profile.ShowUser(new User
             {
                 Username = @"flyte",
@@ -62,8 +74,23 @@ namespace osu.Game.Tests.Visual
                 Country = new Country { FullName = @"Japan", FlagName = @"JP" },
                 CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
             }));
+
             AddStep("Hide", profile.Hide);
             AddStep("Show without reload", profile.Show);
         }
+
+        private void checkSupporterTag(bool isSupporter)
+        {
+            AddUntilStep(() => profile.Header.User != null, "wait for load");
+            if (isSupporter)
+                AddAssert("is supporter", () => profile.Header.SupporterTag.Alpha == 1);
+            else
+                AddAssert("no supporter", () => profile.Header.SupporterTag.Alpha == 0);
+        }
+
+        private class TestUserProfileOverlay : UserProfileOverlay
+        {
+            public new ProfileHeader Header => base.Header;
+        }
     }
 }

osu.Game.Tests/osu.Game.Tests.csproj

@@ -149,6 +149,7 @@
     <Compile Include="Visual\TestCaseStoryboard.cs" />
     <Compile Include="Visual\TestCaseTabControl.cs" />
     <Compile Include="Visual\TestCaseTextAwesome.cs" />
+    <Compile Include="Visual\TestCaseToolbar.cs" />
     <Compile Include="Visual\TestCaseTwoLayerButton.cs" />
     <Compile Include="Visual\TestCaseUserPanel.cs" />
     <Compile Include="Visual\TestCaseUserProfile.cs" />

osu.Game/OsuGame.cs

@@ -272,7 +272,7 @@ namespace osu.Game
                 };
             }
 
-            Action<Visibility> stateChanged = delegate
+            void updateScreenOffset()
             {
                 float offset = 0;
 
@@ -281,11 +281,11 @@ namespace osu.Game
                 if (notifications.State == Visibility.Visible)
                     offset -= ToolbarButton.WIDTH / 2;
 
-                intro.MoveToX(offset, SettingsOverlay.TRANSITION_LENGTH, Easing.OutQuint);
+                screenStack.MoveToX(offset, SettingsOverlay.TRANSITION_LENGTH, Easing.OutQuint);
-            };
+            }
 
-            settings.StateChanged += stateChanged;
+            settings.StateChanged += _ => updateScreenOffset();
-            notifications.StateChanged += stateChanged;
+            notifications.StateChanged += _ => updateScreenOffset();
 
             Cursor.State = Visibility.Hidden;
         }

osu.Game/Overlays/BeatmapSet/Info.cs

@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using OpenTK;
 using OpenTK.Graphics;
@@ -176,7 +177,7 @@ namespace osu.Game.Overlays.BeatmapSet
                         Shadow = false,
                         Margin = new MarginPadding { Top = 20 },
                     },
-                    textFlow = new TextFlowContainer
+                    textFlow = new OsuTextFlowContainer
                     {
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,

osu.Game/Overlays/MedalSplash/DrawableMedal.cs

@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Users;
 
@@ -88,7 +89,7 @@ namespace osu.Game.Overlays.MedalSplash
                             Alpha = 0f,
                             Scale = new Vector2(1f / scale_when_full),
                         },
-                        description = new TextFlowContainer
+                        description = new OsuTextFlowContainer
                         {
                             TextAnchor = Anchor.TopCentre,
                             Anchor = Anchor.TopCentre,

osu.Game/Overlays/NotificationOverlay.cs

@@ -11,6 +11,7 @@ using OpenTK.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.Containers;
 using System;
+using osu.Framework.Configuration;
 
 namespace osu.Game.Overlays
 {
@@ -75,21 +76,24 @@ namespace osu.Game.Overlays
             };
         }
 
+        private int totalCount => sections.Select(c => c.DisplayedCount).Sum();
+        private int unreadCount => sections.Select(c => c.UnreadCount).Sum();
+
+        public readonly BindableInt UnreadCount = new BindableInt();
+
         private int runningDepth;
 
         private void notificationClosed()
         {
             // hide ourselves if all notifications have been dismissed.
-            if (sections.Select(c => c.DisplayedCount).Sum() == 0)
+            if (totalCount == 0)
                 State = Visibility.Hidden;
+
+            updateCounts();
         }
 
-        public void Post(Notification notification)
+        public void Post(Notification notification) => Schedule(() =>
         {
-            Schedule(() =>
-            {
-                State = Visibility.Visible;
-
             ++runningDepth;
             notification.Depth = notification.DisplayOnTop ? runningDepth : -runningDepth;
 
@@ -101,8 +105,9 @@ namespace osu.Game.Overlays
 
             var ourType = notification.GetType();
             sections.Children.FirstOrDefault(s => s.AcceptTypes.Any(accept => accept.IsAssignableFrom(ourType)))?.Add(notification);
+
+            updateCounts();
         });
-        }
 
         protected override void PopIn()
         {
@@ -122,9 +127,16 @@ namespace osu.Game.Overlays
             this.FadeTo(0, TRANSITION_LENGTH, Easing.OutQuint);
         }
 
+        private void updateCounts()
+        {
+            UnreadCount.Value = unreadCount;
+        }
+
         private void markAllRead()
         {
             sections.Children.ForEach(s => s.MarkAllRead());
+
+            updateCounts();
         }
 
         protected override void UpdateAfterChildren()

osu.Game/Overlays/Notifications/NotificationSection.cs

@@ -26,6 +26,8 @@ namespace osu.Game.Overlays.Notifications
 
         public int DisplayedCount => notifications.Count(n => !n.WasClosed);
 
+        public int UnreadCount => notifications.Count(n => !n.WasClosed && !n.Read);
+
         public void Add(Notification notification) => notifications.Add(notification);
 
         public IEnumerable<Type> AcceptTypes;

osu.Game/Overlays/Notifications/ProgressNotification.cs

@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using OpenTK;
 using OpenTK.Graphics;
 
@@ -114,7 +115,7 @@ namespace osu.Game.Overlays.Notifications
                 RelativeSizeAxes = Axes.Both,
             });
 
-            Content.Add(textDrawable = new TextFlowContainer(t =>
+            Content.Add(textDrawable = new OsuTextFlowContainer(t =>
             {
                 t.TextSize = 16;
             })

osu.Game/Overlays/Notifications/SimpleNotification.cs

@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using OpenTK;
 
 namespace osu.Game.Overlays.Notifications
@@ -58,7 +59,7 @@ namespace osu.Game.Overlays.Notifications
                 }
             });
 
-            Content.Add(textDrawable = new TextFlowContainer(t => t.TextSize = 16)
+            Content.Add(textDrawable = new OsuTextFlowContainer(t => t.TextSize = 16)
             {
                 Colour = OsuColour.Gray(128),
                 AutoSizeAxes = Axes.Y,

osu.Game/Overlays/OnScreenDisplay.cs

@@ -14,6 +14,7 @@ using osu.Game.Graphics;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Overlays
 {
@@ -63,7 +64,7 @@ namespace osu.Game.Overlays
                             Width = 240,
                             RelativeSizeAxes = Axes.Y,
                         },
-                        textLine1 = new SpriteText
+                        textLine1 = new OsuSpriteText
                         {
                             Padding = new MarginPadding(10),
                             Font = @"Exo2.0-Black",
@@ -72,7 +73,7 @@ namespace osu.Game.Overlays
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
                         },
-                        textLine2 = new SpriteText
+                        textLine2 = new OsuSpriteText
                         {
                             TextSize = 24,
                             Font = @"Exo2.0-Light",
@@ -97,7 +98,7 @@ namespace osu.Game.Overlays
                                     Origin = Anchor.TopCentre,
                                     AutoSizeAxes = Axes.Both
                                 },
-                                textLine3 = new SpriteText
+                                textLine3 = new OsuSpriteText
                                 {
                                     Padding = new MarginPadding { Bottom = 15 },
                                     Font = @"Exo2.0-Bold",

osu.Game/Overlays/Profile/ProfileHeader.cs

@@ -29,7 +29,8 @@ namespace osu.Game.Overlays.Profile
         private readonly FillFlowContainer<SpriteText> scoreText, scoreNumberText;
         private readonly RankGraph rankGraph;
 
-        private readonly Container coverContainer, supporterTag;
+        public readonly SupporterIcon SupporterTag;
+        private readonly Container coverContainer;
         private readonly Sprite levelBadge;
         private readonly SpriteText levelText;
         private readonly GradeBadge gradeSSPlus, gradeSS, gradeSPlus, gradeS, gradeA;
@@ -94,32 +95,13 @@ namespace osu.Game.Overlays.Profile
                                     AutoSizeAxes = Axes.Both,
                                     Children = new Drawable[]
                                     {
-                                        supporterTag = new CircularContainer
+                                        SupporterTag = new SupporterIcon
                                         {
+                                            Alpha = 0,
                                             Anchor = Anchor.BottomLeft,
                                             Origin = Anchor.BottomLeft,
                                             Y = -75,
-                                            Size = new Vector2(25, 25),
+                                            Size = new Vector2(25, 25)
-                                            Masking = true,
-                                            BorderThickness = 3,
-                                            BorderColour = Color4.White,
-                                            Alpha = 0,
-                                            Children = new Drawable[]
-                                            {
-                                                new Box
-                                                {
-                                                    RelativeSizeAxes = Axes.Both,
-                                                    Alpha = 0,
-                                                    AlwaysPresent = true
-                                                },
-                                                new SpriteIcon
-                                                {
-                                                    Icon = FontAwesome.fa_heart,
-                                                    Anchor = Anchor.Centre,
-                                                    Origin = Anchor.Centre,
-                                                    Size = new Vector2(12),
-                                                }
-                                            }
                                         },
                                         new LinkFlowContainer.ProfileLink(user)
                                         {
@@ -328,7 +310,8 @@ namespace osu.Game.Overlays.Profile
                 Depth = float.MaxValue,
             }, coverContainer.Add);
 
-            if (user.IsSupporter) supporterTag.Show();
+            if (user.IsSupporter)
+                SupporterTag.Show();
 
             if (!string.IsNullOrEmpty(user.Colour))
             {
@@ -473,7 +456,7 @@ namespace osu.Game.Overlays.Profile
                     Width = width,
                     Height = 26
                 });
-                Add(numberText = new SpriteText
+                Add(numberText = new OsuSpriteText
                 {
                     Anchor = Anchor.BottomCentre,
                     Origin = Anchor.BottomCentre,

osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs

@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Users;
 
@@ -120,7 +121,7 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
                                 }
                             }
                         },
-                        new TextFlowContainer(t => { t.TextSize = 19; })
+                        new OsuTextFlowContainer(t => { t.TextSize = 19; })
                         {
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,

osu.Game/Overlays/Profile/SupporterIcon.cs

@@ -0,0 +1,61 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Backgrounds;
+
+namespace osu.Game.Overlays.Profile
+{
+    public class SupporterIcon : CircularContainer
+    {
+        private readonly Box background;
+
+        public SupporterIcon()
+        {
+            Masking = true;
+            Children = new Drawable[]
+            {
+                    new Box { RelativeSizeAxes = Axes.Both },
+                    new CircularContainer
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
+                        Scale = new Vector2(0.8f),
+                        Masking = true,
+                        Children = new Drawable[]
+                        {
+                            background = new Box { RelativeSizeAxes = Axes.Both },
+                            new Triangles
+                            {
+                                TriangleScale = 0.2f,
+                                ColourLight = OsuColour.FromHex(@"ff7db7"),
+                                ColourDark = OsuColour.FromHex(@"de5b95"),
+                                RelativeSizeAxes = Axes.Both,
+                                Velocity = 0.3f,
+                            },
+                        }
+                    },
+                    new SpriteIcon
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
+                        Icon = FontAwesome.fa_heart,
+                        Scale = new Vector2(0.45f),
+                    }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            background.Colour = colours.Pink;
+        }
+    }
+}

osu.Game/Overlays/Toolbar/ToolbarChatButton.cs

@@ -13,7 +13,7 @@ namespace osu.Game.Overlays.Toolbar
             SetIcon(FontAwesome.fa_comments);
         }
 
-        [BackgroundDependencyLoader]
+        [BackgroundDependencyLoader(true)]
         private void load(ChatOverlay chat)
         {
             StateContainer = chat;

osu.Game/Overlays/Toolbar/ToolbarDirectButton.cs

@@ -13,7 +13,7 @@ namespace osu.Game.Overlays.Toolbar
             SetIcon(FontAwesome.fa_osu_chevron_down_o);
         }
 
-        [BackgroundDependencyLoader]
+        [BackgroundDependencyLoader(true)]
         private void load(DirectOverlay direct)
         {
             StateContainer = direct;

osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs

@@ -64,7 +64,7 @@ namespace osu.Game.Overlays.Toolbar
             };
         }
 
-        [BackgroundDependencyLoader]
+        [BackgroundDependencyLoader(true)]
         private void load(RulesetStore rulesets, OsuGame game)
         {
             foreach (var r in rulesets.AvailableRulesets)
@@ -81,7 +81,10 @@ namespace osu.Game.Overlays.Toolbar
 
             ruleset.ValueChanged += rulesetChanged;
             ruleset.DisabledChanged += disabledChanged;
+            if (game != null)
                 ruleset.BindTo(game.Ruleset);
+            else
+                ruleset.Value = rulesets.AvailableRulesets.FirstOrDefault();
         }
 
         public override bool HandleInput => !ruleset.Disabled;

osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs

@@ -13,7 +13,7 @@ namespace osu.Game.Overlays.Toolbar
             Icon = FontAwesome.fa_music;
         }
 
-        [BackgroundDependencyLoader]
+        [BackgroundDependencyLoader(true)]
         private void load(MusicController music)
         {
             StateContainer = music;

osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs

@@ -2,8 +2,14 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using OpenTK;
+using OpenTK.Graphics;
 
 namespace osu.Game.Overlays.Toolbar
 {
@@ -11,17 +17,85 @@ namespace osu.Game.Overlays.Toolbar
     {
         protected override Anchor TooltipAnchor => Anchor.TopRight;
 
+        public BindableInt NotificationCount = new BindableInt();
+
+        private readonly CountCircle countDisplay;
+
         public ToolbarNotificationButton()
         {
             Icon = FontAwesome.fa_bars;
             TooltipMain = "Notifications";
             TooltipSub = "Waiting for 'ya";
+
+            Add(countDisplay = new CountCircle
+            {
+                Alpha = 0,
+                Height = 16,
+                RelativePositionAxes = Axes.Both,
+                Origin = Anchor.Centre,
+                Position = new Vector2(0.7f, 0.25f),
+            });
         }
 
-        [BackgroundDependencyLoader]
+        [BackgroundDependencyLoader(true)]
         private void load(NotificationOverlay notificationOverlay)
         {
             StateContainer = notificationOverlay;
+
+            if (notificationOverlay != null)
+                NotificationCount.BindTo(notificationOverlay.UnreadCount);
+
+            NotificationCount.ValueChanged += count =>
+            {
+                if (count == 0)
+                    countDisplay.FadeOut(200, Easing.OutQuint);
+                else
+                {
+                    countDisplay.Count = count;
+                    countDisplay.FadeIn(200, Easing.OutQuint);
+                }
+            };
+        }
+
+        private class CountCircle : CompositeDrawable
+        {
+            private readonly OsuSpriteText count;
+            private readonly Circle circle;
+
+            public int Count
+            {
+                set
+                {
+                    count.Text = value.ToString("#,0");
+                    circle.FlashColour(Color4.White, 600, Easing.OutQuint);
+                    this.ScaleTo(1.1f).Then().ScaleTo(1, 600, Easing.OutElastic);
+                }
+            }
+
+            public CountCircle()
+            {
+                AutoSizeAxes = Axes.X;
+
+                InternalChildren = new Drawable[]
+                {
+                    circle = new Circle
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.Red
+                    },
+                    count = new OsuSpriteText
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Y = -1,
+                        TextSize = 14,
+                        Padding = new MarginPadding(5),
+                        Colour = Color4.White,
+                        UseFullGlyphHeight = true,
+                        Font = "Exo2.0-Bold",
+                    }
+                };
+            }
         }
     }
 }

osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs

@@ -21,10 +21,13 @@ namespace osu.Game.Overlays.Toolbar
             set
             {
                 stateContainer = value;
+                if (stateContainer != null)
+                {
                     Action = stateContainer.ToggleVisibility;
                     stateContainer.StateChanged += stateChanged;
                 }
             }
+        }
 
         public ToolbarOverlayToggleButton()
         {

osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs

@@ -15,7 +15,7 @@ namespace osu.Game.Overlays.Toolbar
             TooltipSub = "Change your settings";
         }
 
-        [BackgroundDependencyLoader]
+        [BackgroundDependencyLoader(true)]
         private void load(SettingsOverlay settings)
         {
             StateContainer = settings;

osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs

@@ -13,7 +13,7 @@ namespace osu.Game.Overlays.Toolbar
             Icon = FontAwesome.fa_users;
         }
 
-        [BackgroundDependencyLoader]
+        [BackgroundDependencyLoader(true)]
         private void load(SocialOverlay chat)
         {
             StateContainer = chat;

osu.Game/Overlays/UserProfileOverlay.cs

@@ -28,7 +28,7 @@ namespace osu.Game.Overlays
         private ProfileSection[] sections;
         private GetUserRequest userReq;
         private APIAccess api;
-        private ProfileHeader header;
+        protected ProfileHeader Header;
         private SectionsContainer<ProfileSection> sectionsContainer;
         private ProfileTabControl tabs;
 
@@ -113,12 +113,12 @@ namespace osu.Game.Overlays
                 Colour = OsuColour.Gray(0.2f)
             });
 
-            header = new ProfileHeader(user);
+            Header = new ProfileHeader(user);
 
             Add(sectionsContainer = new SectionsContainer<ProfileSection>
             {
                 RelativeSizeAxes = Axes.Both,
-                ExpandableHeader = header,
+                ExpandableHeader = Header,
                 FixedHeader = tabs,
                 HeaderBackground = new Box
                 {
@@ -169,7 +169,7 @@ namespace osu.Game.Overlays
 
         private void userLoadComplete(User user)
         {
-            header.User = user;
+            Header.User = user;
 
             foreach (string id in user.ProfileOrder)
             {

osu.Game/Screens/Ranking/Results.cs

@@ -17,6 +17,7 @@ using OpenTK.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Screens.Ranking
 {
@@ -183,7 +184,7 @@ namespace osu.Game.Screens.Ranking
                                     Height = 50,
                                     Margin = new MarginPadding { Bottom = 110 },
                                 },
-                                new SpriteText
+                                new OsuSpriteText
                                 {
                                     Text = $"{score.MaxCombo}x",
                                     TextSize = 40,
@@ -194,7 +195,7 @@ namespace osu.Game.Screens.Ranking
                                     Anchor = Anchor.CentreLeft,
                                     Origin = Anchor.BottomCentre,
                                 },
-                                new SpriteText
+                                new OsuSpriteText
                                 {
                                     Text = "max combo",
                                     TextSize = 20,
@@ -204,7 +205,7 @@ namespace osu.Game.Screens.Ranking
                                     Anchor = Anchor.CentreLeft,
                                     Origin = Anchor.TopCentre,
                                 },
-                                new SpriteText
+                                new OsuSpriteText
                                 {
                                     Text = $"{score.Accuracy:P2}",
                                     TextSize = 40,
@@ -215,7 +216,7 @@ namespace osu.Game.Screens.Ranking
                                     Anchor = Anchor.CentreLeft,
                                     Origin = Anchor.BottomCentre,
                                 },
-                                new SpriteText
+                                new OsuSpriteText
                                 {
                                     Text = "accuracy",
                                     TextSize = 20,

osu.Game/Screens/Ranking/ResultsPageScore.cs

@@ -201,14 +201,14 @@ namespace osu.Game.Screens.Ranking
             {
                 Children = new Drawable[]
                 {
-                    new SpriteText {
+                    new OsuSpriteText {
                         Text = statistic.Value.ToString().PadLeft(4, '0'),
                         Colour = colours.Gray7,
                         TextSize = 30,
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
                     },
-                    new SpriteText {
+                    new OsuSpriteText {
                         Text = statistic.Key,
                         Colour = colours.Gray7,
                         Font = @"Exo2.0-Bold",

osu.Game/Screens/Select/BeatmapCarousel.cs

@@ -142,7 +142,6 @@ namespace osu.Game.Screens.Select
                 if (newSet == null)
                 {
                     itemsCache.Invalidate();
-                    SelectNext();
                     return;
                 }
 
@@ -512,7 +511,7 @@ namespace osu.Game.Screens.Select
             currentY += DrawHeight / 2;
             scrollableContent.Height = currentY;
 
-            if (selectedBeatmapSet != null && selectedBeatmapSet.State.Value != CarouselItemState.Selected)
+            if (selectedBeatmapSet != null && (selectedBeatmap == null || selectedBeatmapSet.State.Value != CarouselItemState.Selected))
             {
                 selectedBeatmapSet = null;
                 SelectionChanged?.Invoke(null);

osu.Game/Screens/Select/BeatmapDetails.cs

@@ -17,6 +17,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Game.Screens.Select.Details;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.Select
 {
@@ -334,7 +335,7 @@ namespace osu.Game.Screens.Select
                                 TextSize = 14,
                             },
                         },
-                        textFlow = new TextFlowContainer
+                        textFlow = new OsuTextFlowContainer
                         {
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
@@ -359,7 +360,7 @@ namespace osu.Game.Screens.Select
 
             private void setTextAsync(string text)
             {
-                LoadComponentAsync(new TextFlowContainer(s => s.TextSize = 14)
+                LoadComponentAsync(new OsuTextFlowContainer(s => s.TextSize = 14)
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,

osu.Game/Tests/Visual/TestCasePerformancePoints.cs

@@ -12,7 +12,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
@@ -224,7 +223,7 @@ namespace osu.Game.Tests.Visual
 
                 if (!api.IsLoggedIn)
                 {
-                    InternalChild = new SpriteText
+                    InternalChild = new OsuSpriteText
                     {
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,

osu.Game/Users/UserPanel.cs

@@ -16,8 +16,8 @@ using osu.Game.Overlays;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Graphics.Cursor;
-using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Containers;
+using osu.Game.Overlays.Profile;
 
 namespace osu.Game.Users
 {
@@ -220,53 +220,5 @@ namespace osu.Game.Users
         {
             new OsuMenuItem("View Profile", MenuItemType.Highlighted, ViewProfile),
         };
-
-        private class SupporterIcon : CircularContainer
-        {
-            private readonly Box background;
-
-            public SupporterIcon()
-            {
-                Masking = true;
-                Children = new Drawable[]
-                {
-                    new Box { RelativeSizeAxes = Axes.Both },
-                    new CircularContainer
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        RelativeSizeAxes = Axes.Both,
-                        Scale = new Vector2(0.8f),
-                        Masking = true,
-                        Children = new Drawable[]
-                        {
-                            background = new Box { RelativeSizeAxes = Axes.Both },
-                            new Triangles
-                            {
-                                TriangleScale = 0.2f,
-                                ColourLight = OsuColour.FromHex(@"ff7db7"),
-                                ColourDark = OsuColour.FromHex(@"de5b95"),
-                                RelativeSizeAxes = Axes.Both,
-                                Velocity = 0.3f,
-                            },
-                        }
-                    },
-                    new SpriteIcon
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        RelativeSizeAxes = Axes.Both,
-                        Icon = FontAwesome.fa_heart,
-                        Scale = new Vector2(0.45f),
-                    }
-                };
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                background.Colour = colours.Pink;
-            }
-        }
     }
 }

osu.Game/osu.Game.csproj

@@ -268,6 +268,7 @@
     <Compile Include="Beatmaps\Formats\LegacyStoryboardDecoder.cs" />
     <Compile Include="Database\DatabaseContextFactory.cs" />
     <Compile Include="Database\IHasPrimaryKey.cs" />
+    <Compile Include="Overlays\Profile\SupporterIcon.cs" />
     <Compile Include="Overlays\Settings\DangerousSettingsButton.cs" />
     <Compile Include="Graphics\UserInterface\HoverClickSounds.cs" />
     <Compile Include="Graphics\UserInterface\HoverSounds.cs" />

osu.sln.DotSettings

@@ -172,6 +172,7 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
@@ -655,7 +656,11 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-frame
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>