From 9d0c8902a6e6dcc1edc369b8ebf768089f22c8a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 23:57:05 +0900
Subject: [PATCH] Fix margins and spacing between sub flowed items

---
 .../Overlays/Settings/Sections/Input/TabletAreaSelection.cs | 6 +++---
 osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index af144c8102..3b1bae7cf0 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -32,13 +32,13 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         public TabletAreaSelection(ITabletHandler handler)
         {
             this.handler = handler;
+
+            Padding = new MarginPadding { Horizontal = SettingsPanel.CONTENT_MARGINS };
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            Padding = new MarginPadding(5);
-
             InternalChild = tabletContainer = new Container
             {
                 Anchor = Anchor.Centre,
@@ -131,7 +131,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             if (size == System.Drawing.Size.Empty)
                 return;
 
-            float fitX = size.Width / DrawWidth;
+            float fitX = size.Width / (DrawWidth - Padding.Left - Padding.Right);
             float fitY = size.Height / DrawHeight;
 
             float adjust = MathF.Max(fitX, fitY);
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 7da61cf192..b17cfced95 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -10,6 +10,7 @@ using osu.Framework.Input.Handlers.Tablet;
 using osu.Framework.Platform;
 using osu.Framework.Threading;
 using osu.Game.Graphics.Sprites;
+using osuTK;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
@@ -67,12 +68,14 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     Text = "No tablet detected!",
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
+                    Padding = new MarginPadding { Horizontal = SettingsPanel.CONTENT_MARGINS }
                 },
                 mainSettings = new FillFlowContainer
                 {
                     Alpha = 0,
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
+                    Spacing = new Vector2(0, 8),
                     Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
@@ -80,7 +83,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                         {
                             RelativeSizeAxes = Axes.X,
                             Height = 300,
-                            Margin = new MarginPadding(10)
                         },
                         new DangerousSettingsButton
                         {