From 09d679de8d6367ec6894e470318d3cda625d5fd3 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 12 Jul 2019 08:50:53 +0200
Subject: [PATCH] Move text display layout to Toast.

---
 .../UserInterface/TestSceneOnScreenDisplay.cs |  4 ++
 osu.Game/Overlays/OSD/Toast.cs                | 35 +++++++++++++++-
 osu.Game/Overlays/OSD/TrackedSettingToast.cs  | 41 +++----------------
 3 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOnScreenDisplay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOnScreenDisplay.cs
index ca14822205..4decfc7dd6 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOnScreenDisplay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOnScreenDisplay.cs
@@ -90,6 +90,10 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private class EmptyToast : Toast
         {
+            public EmptyToast()
+                : base("", "", "")
+            {
+            }
         }
 
         private class TestOnScreenDisplay : OnScreenDisplay
diff --git a/osu.Game/Overlays/OSD/Toast.cs b/osu.Game/Overlays/OSD/Toast.cs
index c6e3227cd1..6572830d10 100644
--- a/osu.Game/Overlays/OSD/Toast.cs
+++ b/osu.Game/Overlays/OSD/Toast.cs
@@ -4,6 +4,9 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Overlays.OSD
@@ -13,7 +16,7 @@ namespace osu.Game.Overlays.OSD
         private readonly Container content;
         protected override Container<Drawable> Content => content;
 
-        protected Toast()
+        protected Toast(string description, string value, string keybinding)
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -35,7 +38,35 @@ namespace osu.Game.Overlays.OSD
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
-                }
+                },
+                new OsuSpriteText
+                {
+                    Padding = new MarginPadding(10),
+                    Name = "Description",
+                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.Black),
+                    Spacing = new Vector2(1, 0),
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                    Text = description.ToUpperInvariant()
+                },
+                new OsuSpriteText
+                {
+                    Font = OsuFont.GetFont(size: 24, weight: FontWeight.Light),
+                    Padding = new MarginPadding { Left = 10, Right = 10 },
+                    Name = "Value",
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.BottomCentre,
+                    Text = value
+                },
+                new OsuSpriteText
+                {
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
+                    Name = "Shortcut",
+                    Margin = new MarginPadding { Bottom = 15 },
+                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
+                    Text = string.IsNullOrEmpty(keybinding) ? "NO KEY BOUND" : keybinding.ToUpperInvariant()
+                },
             };
         }
     }
diff --git a/osu.Game/Overlays/OSD/TrackedSettingToast.cs b/osu.Game/Overlays/OSD/TrackedSettingToast.cs
index 8def8476f0..454ba84d70 100644
--- a/osu.Game/Overlays/OSD/TrackedSettingToast.cs
+++ b/osu.Game/Overlays/OSD/TrackedSettingToast.cs
@@ -9,9 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
 
@@ -20,55 +18,29 @@ namespace osu.Game.Overlays.OSD
     public class TrackedSettingToast : Toast
     {
         public TrackedSettingToast(SettingDescription description)
+            : base(description.Name, description.Value, description.Shortcut)
         {
-            SpriteText textLine2;
             FillFlowContainer<OptionLight> optionLights;
 
             Children = new Drawable[]
             {
-                new OsuSpriteText
-                {
-                    Padding = new MarginPadding(10),
-                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.Black),
-                    Spacing = new Vector2(1, 0),
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                    Text = description.Name.ToUpperInvariant()
-                },
-                textLine2 = new OsuSpriteText
-                {
-                    Font = OsuFont.GetFont(size: 24, weight: FontWeight.Light),
-                    Padding = new MarginPadding { Left = 10, Right = 10 },
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.BottomCentre,
-                    Text = description.Value
-                },
                 new FillFlowContainer
                 {
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
-                    AutoSizeAxes = Axes.Both,
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
                     Direction = FillDirection.Vertical,
+                    Margin = new MarginPadding { Top = 70 },
                     Children = new Drawable[]
                     {
                         optionLights = new FillFlowContainer<OptionLight>
                         {
-                            Padding = new MarginPadding { Top = 20, Bottom = 5 },
+                            Padding = new MarginPadding { Bottom = 5 },
                             Spacing = new Vector2(5, 0),
                             Direction = FillDirection.Horizontal,
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
                             AutoSizeAxes = Axes.Both
                         },
-                        new OsuSpriteText
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            Margin = new MarginPadding { Bottom = 15 },
-                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
-                            Alpha = 0.3f,
-                            Text = string.IsNullOrEmpty(description.Shortcut) ? "NO KEY BOUND" : description.Shortcut.ToUpperInvariant()
-                        },
                     }
                 }
             };
@@ -90,9 +62,6 @@ namespace osu.Game.Overlays.OSD
                     break;
             }
 
-            textLine2.Origin = optionCount > 0 ? Anchor.BottomCentre : Anchor.Centre;
-            textLine2.Y = optionCount > 0 ? 0 : 5;
-
             for (int i = 0; i < optionCount; i++)
             {
                 optionLights.Add(new OptionLight