Merge branch 'master' into fix-push-disabled-crash

osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs

@@ -48,7 +48,7 @@ public DrawableScore(int index, OnlineScore score)
                     Font = @"Exo2.0-RegularItalic",
                     Margin = new MarginPadding { Left = side_margin }
                 },
-                new DrawableFlag(score.User.Country?.FlagName)
+                new DrawableFlag(score.User.Country)
                 {
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,

osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs

@@ -52,7 +52,7 @@ public OnlineScore Score
                 score = value;
 
                 avatar.User = username.User = score.User;
-                flag.FlagName = score.User.Country?.FlagName;
+                flag.Country = score.User.Country;
                 date.Text = $@"achieved {score.Date:MMM d, yyyy}";
                 rank.UpdateRank(score.Rank);
 

osu.Game/Overlays/Profile/ProfileHeader.cs

@@ -109,7 +109,7 @@ public ProfileHeader(User user)
                                             Origin = Anchor.BottomLeft,
                                             Y = -48,
                                         },
-                                        countryFlag = new DrawableFlag(user.Country?.FlagName)
+                                        countryFlag = new DrawableFlag(user.Country)
                                         {
                                             Anchor = Anchor.BottomLeft,
                                             Origin = Anchor.BottomLeft,
@@ -333,7 +333,7 @@ private void loadUser()
             {
                 infoTextLeft.AddText("from ");
                 infoTextLeft.AddText(user.Country.FullName, boldItalic);
-                countryFlag.FlagName = user.Country.FlagName;
+                countryFlag.Country = user.Country;
             }
             infoTextLeft.NewParagraph();
 

osu.Game/Screens/Multiplayer/ParticipantInfo.cs

@@ -27,7 +27,7 @@ public User Host
             set
             {
                 host.Text = value.Username;
-                flagContainer.Children = new[] { new DrawableFlag(value.Country?.FlagName) { RelativeSizeAxes = Axes.Both } };
+                flagContainer.Children = new[] { new DrawableFlag(value.Country) { RelativeSizeAxes = Axes.Both } };
             }
         }
 

osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs

@@ -145,7 +145,7 @@ private void load()
                                                     Masking = true,
                                                     Children = new Drawable[]
                                                     {
-                                                        new DrawableFlag(Score.User?.Country?.FlagName)
+                                                        new DrawableFlag(Score.User?.Country)
                                                         {
                                                             Width = 30,
                                                             RelativeSizeAxes = Axes.Y,

osu.Game/Users/Country.cs

@@ -6,6 +6,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 
@@ -26,36 +27,30 @@ public class Country
         public string FlagName;
     }
 
-    public class DrawableFlag : Container
+    public class DrawableFlag : Container, IHasTooltip
     {
         private readonly Sprite sprite;
         private TextureStore textures;
 
-        private string flagName;
-        public string FlagName
+        private Country country;
+        public Country Country
         {
-            get { return flagName; }
+            get { return country; }
             set
             {
-                if (value == flagName) return;
-                flagName = value;
-                sprite.Texture = textures.Get($@"Flags/{flagName}");
+                if (value == country)
+                    return;
+
+                country = value;
+                sprite.Texture = getFlagTexture();
             }
         }
 
-        [BackgroundDependencyLoader]
-        private void load(TextureStore ts)
+        public string TooltipText => country?.FullName;
+
+        public DrawableFlag(Country country = null)
         {
-            if (ts == null)
-                throw new ArgumentNullException(nameof(ts));
-
-            textures = ts;
-            sprite.Texture = textures.Get($@"Flags/{flagName}");
-        }
-
-        public DrawableFlag(string name = null)
-        {
-            flagName = name ?? @"__";
+            this.country = country;
 
             Children = new Drawable[]
             {
@@ -65,5 +60,17 @@ public DrawableFlag(string name = null)
                 },
             };
         }
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore ts)
+        {
+            if (ts == null)
+                throw new ArgumentNullException(nameof(ts));
+
+            textures = ts;
+            sprite.Texture = getFlagTexture();
+        }
+
+        private Texture getFlagTexture() => textures.Get($@"Flags/{country?.FlagName ?? @"__"}");
     }
 }

osu.Game/Users/UserPanel.cs

@@ -114,7 +114,7 @@ public UserPanel(User user)
                                     Spacing = new Vector2(5f, 0f),
                                     Children = new Drawable[]
                                     {
-                                        new DrawableFlag(user.Country?.FlagName)
+                                        new DrawableFlag(user.Country)
                                         {
                                             Width = 30f,
                                             RelativeSizeAxes = Axes.Y,