From 0c48aec265275d24cef316e072ec1018a7eac30f Mon Sep 17 00:00:00 2001
From: EVAST9919 <megaman9919@gmail.com>
Date: Tue, 4 Jun 2019 18:37:31 +0300
Subject: [PATCH] Split SetDefaultGamemode into two functions

---
 .../Header/Components/GamemodeControl.cs      | 11 +++-
 .../Header/Components/GamemodeTabItem.cs      | 54 +++++++++----------
 osu.Game/Overlays/Profile/ProfileHeader.cs    |  1 +
 3 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/GamemodeControl.cs b/osu.Game/Overlays/Profile/Header/Components/GamemodeControl.cs
index bca4cd0cfa..59c8ec8ecb 100644
--- a/osu.Game/Overlays/Profile/Header/Components/GamemodeControl.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/GamemodeControl.cs
@@ -59,9 +59,16 @@ namespace osu.Game.Overlays.Profile.Header.Components
         {
             foreach (GamemodeTabItem i in TabContainer)
             {
-                if (i.Value.ShortName == gamemode)
+                i.IsDefault = i.Value.ShortName == gamemode;
+            }
+        }
+
+        public void SelectDefaultGamemode()
+        {
+            foreach (GamemodeTabItem i in TabContainer)
+            {
+                if (i.IsDefault)
                 {
-                    i.IsDefault = true;
                     Current.Value = i.Value;
                     return;
                 }
diff --git a/osu.Game/Overlays/Profile/Header/Components/GamemodeTabItem.cs b/osu.Game/Overlays/Profile/Header/Components/GamemodeTabItem.cs
index b6e27da522..688109ad2f 100644
--- a/osu.Game/Overlays/Profile/Header/Components/GamemodeTabItem.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/GamemodeTabItem.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
                 isDefault = value;
 
-                icon.FadeTo(isDefault ? 1 : 0, 100, Easing.OutQuint);
+                icon.FadeTo(isDefault ? 1 : 0, 200, Easing.OutQuint);
             }
         }
 
@@ -59,34 +59,34 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
             Children = new Drawable[]
             {
-                    new FillFlowContainer
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Origin = Anchor.BottomLeft,
+                    Anchor = Anchor.BottomLeft,
+                    Direction = FillDirection.Horizontal,
+                    Spacing = new Vector2(3, 0),
+                    Children = new Drawable[]
                     {
-                        AutoSizeAxes = Axes.Both,
-                        Origin = Anchor.BottomLeft,
-                        Anchor = Anchor.BottomLeft,
-                        Direction = FillDirection.Horizontal,
-                        Spacing = new Vector2(3, 0),
-                        Children = new Drawable[]
+                        text = new OsuSpriteText
                         {
-                            text = new OsuSpriteText
-                            {
-                                Origin = Anchor.Centre,
-                                Anchor = Anchor.Centre,
-                                Text = value.Name,
-                                Font = OsuFont.GetFont()
-                            },
-                            icon = new SpriteIcon
-                            {
-                                Origin = Anchor.Centre,
-                                Anchor = Anchor.Centre,
-                                Alpha = 0,
-                                AlwaysPresent = true,
-                                Icon = FontAwesome.Solid.Star,
-                                Size = new Vector2(12),
-                            },
-                        }
-                    },
-                    new HoverClickSounds()
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                            Text = value.Name,
+                            Font = OsuFont.GetFont()
+                        },
+                        icon = new SpriteIcon
+                        {
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                            Alpha = 0,
+                            AlwaysPresent = true,
+                            Icon = FontAwesome.Solid.Star,
+                            Size = new Vector2(12),
+                        },
+                    }
+                },
+                new HoverClickSounds()
             };
         }
 
diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs
index 85541cd0ae..b0c1f9a587 100644
--- a/osu.Game/Overlays/Profile/ProfileHeader.cs
+++ b/osu.Game/Overlays/Profile/ProfileHeader.cs
@@ -113,6 +113,7 @@ namespace osu.Game.Overlays.Profile
             string playMode = user.PlayMode;
 
             gamemodeControl.SetDefaultGamemode(playMode);
+            gamemodeControl.SelectDefaultGamemode();
             gamemodeControl.FadeInFromZero(100, Easing.OutQuint);
         }