From c4b1ba2979ede6c0b00c29c6912801ad6e4d0adf Mon Sep 17 00:00:00 2001
From: AlFasGD <kalfas.alex@gmail.com>
Date: Wed, 25 Jul 2018 15:14:40 +0300
Subject: [PATCH] Remove padding, fix corner radiuses

---
 .../Visual/TestCaseLabelledTextBox.cs         | 10 ++++---
 .../LabelledComponents/LabelledTextBox.cs     | 27 +++----------------
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Tests/Visual/TestCaseLabelledTextBox.cs b/osu.Game.Tests/Visual/TestCaseLabelledTextBox.cs
index be11562bb0..d41739bfb5 100644
--- a/osu.Game.Tests/Visual/TestCaseLabelledTextBox.cs
+++ b/osu.Game.Tests/Visual/TestCaseLabelledTextBox.cs
@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Screens.Edit.Screens.Setup.Components.LabelledComponents;
 using System;
 using System.Collections.Generic;
@@ -21,15 +22,18 @@ namespace osu.Game.Tests.Visual
         [BackgroundDependencyLoader]
         private void load()
         {
-            Children = new Drawable[]
+            Child = new Container
             {
-                new LabelledTextBox
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.X,
+                Padding = new MarginPadding { Left = 150, Right = 150 },
+                Child = new LabelledTextBox
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     LabelText = "Testing text",
                     PlaceholderText = "This is definitely working as intended",
-                    Padding = new MarginPadding { Left = 150, Right = 150 }
                 }
             };
         }
diff --git a/osu.Game/Screens/Edit/Screens/Setup/Components/LabelledComponents/LabelledTextBox.cs b/osu.Game/Screens/Edit/Screens/Setup/Components/LabelledComponents/LabelledTextBox.cs
index 736d785b41..94200b7f4e 100644
--- a/osu.Game/Screens/Edit/Screens/Setup/Components/LabelledComponents/LabelledTextBox.cs
+++ b/osu.Game/Screens/Edit/Screens/Setup/Components/LabelledComponents/LabelledTextBox.cs
@@ -16,8 +16,7 @@ namespace osu.Game.Screens.Edit.Screens.Setup.Components.LabelledComponents
     public class LabelledTextBox : CompositeDrawable
     {
         private const float label_container_width = 150;
-        private const float outer_corner_radius = 15;
-        private const float inner_corner_radius = 10;
+        private const float corner_radius = 15;
         private const float default_height = 40;
         private const float default_label_left_padding = 15;
         private const float default_label_top_padding = 12;
@@ -55,24 +54,6 @@ namespace osu.Game.Screens.Edit.Screens.Setup.Components.LabelledComponents
             set => textBox.Text = value;
         }
 
-        public MarginPadding Padding
-        {
-            get => base.Padding;
-            set => base.Padding = value;
-        }
-
-        public MarginPadding LabelPadding
-        {
-            get => label.Padding;
-            set => label.Padding = value;
-        }
-
-        public MarginPadding TextBoxPadding
-        {
-            get => textBox.Padding;
-            set => textBox.Padding = value;
-        }
-
         public Color4 LabelTextColour
         {
             get => label.Colour;
@@ -93,13 +74,13 @@ namespace osu.Game.Screens.Edit.Screens.Setup.Components.LabelledComponents
         {
             RelativeSizeAxes = Axes.X;
             Height = default_height;
-            CornerRadius = outer_corner_radius;
+            CornerRadius = corner_radius;
             Masking = true;
 
             InternalChild = new Container
             {
                 RelativeSizeAxes = Axes.Both,
-                CornerRadius = outer_corner_radius,
+                CornerRadius = corner_radius,
                 Masking = true,
                 Children = new Drawable[]
                 {
@@ -131,7 +112,7 @@ namespace osu.Game.Screens.Edit.Screens.Setup.Components.LabelledComponents
                                     Origin = Anchor.TopLeft,
                                     RelativeSizeAxes = Axes.Both,
                                     Height = 1,
-                                    CornerRadius = inner_corner_radius,
+                                    CornerRadius = corner_radius,
                                 },
                             },
                         },