From 13752ffe9d86836affa22126bdf381e3b5cb9d33 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 5 Mar 2020 02:31:19 +0300
Subject: [PATCH] Revisit UserGridPanel layout

---
 osu.Game/Users/UserGridPanel.cs | 58 ++++++++++++++++++++++++---------
 1 file changed, 42 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Users/UserGridPanel.cs b/osu.Game/Users/UserGridPanel.cs
index 4bd40b3e76..b0ce557a19 100644
--- a/osu.Game/Users/UserGridPanel.cs
+++ b/osu.Game/Users/UserGridPanel.cs
@@ -45,6 +45,7 @@ namespace osu.Game.Users
                     RowDimensions = new[]
                     {
                         new Dimension(GridSizeMode.AutoSize),
+                        new Dimension(GridSizeMode.Absolute, margin),
                         new Dimension()
                     },
                     Content = new[]
@@ -54,32 +55,57 @@ namespace osu.Game.Users
                             CreateAvatar().With(avatar =>
                             {
                                 avatar.Size = new Vector2(60);
-                                avatar.Margin = new MarginPadding { Bottom = margin };
                                 avatar.Masking = true;
                                 avatar.CornerRadius = 6;
                             }),
-                            new FillFlowContainer
+                            new Container
                             {
-                                AutoSizeAxes = Axes.Both,
-                                Direction = FillDirection.Vertical,
-                                Spacing = new Vector2(0, 7),
-                                Margin = new MarginPadding { Left = margin },
-                                Children = new Drawable[]
+                                RelativeSizeAxes = Axes.Both,
+                                Padding = new MarginPadding { Left = margin },
+                                Child = new GridContainer
                                 {
-                                    details = new FillFlowContainer
+                                    RelativeSizeAxes = Axes.Both,
+                                    ColumnDimensions = new[]
                                     {
-                                        AutoSizeAxes = Axes.Both,
-                                        Direction = FillDirection.Horizontal,
-                                        Spacing = new Vector2(6),
-                                        Children = new Drawable[]
-                                        {
-                                            CreateFlag(),
-                                        }
+                                        new Dimension()
                                     },
-                                    CreateUsername(),
+                                    RowDimensions = new[]
+                                    {
+                                        new Dimension(GridSizeMode.AutoSize),
+                                        new Dimension()
+                                    },
+                                    Content = new[]
+                                    {
+                                        new Drawable[]
+                                        {
+                                            details = new FillFlowContainer
+                                            {
+                                                AutoSizeAxes = Axes.Both,
+                                                Direction = FillDirection.Horizontal,
+                                                Spacing = new Vector2(6),
+                                                Children = new Drawable[]
+                                                {
+                                                    CreateFlag(),
+                                                }
+                                            }
+                                        },
+                                        new Drawable[]
+                                        {
+                                            CreateUsername().With(username =>
+                                            {
+                                                username.Anchor = Anchor.CentreLeft;
+                                                username.Origin = Anchor.CentreLeft;
+                                            })
+                                        }
+                                    }
                                 }
                             }
                         },
+                        new[]
+                        {
+                            Empty(),
+                            Empty()
+                        },
                         new Drawable[]
                         {
                             CreateStatusIcon().With(icon =>