From 9b70f0ee1fca97f9d8d686c131dd66f5a8be20ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 16:24:51 +0900
Subject: [PATCH] Tidy up visual appearance of settings and add a reset button

---
 .../Settings/Sections/Input/TabletSettings.cs | 57 ++++++++++++-------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index ac4a42e984..ca0a0349ab 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -66,6 +66,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 offsetY.MaxValue = val.NewValue.Height;
                 sizeY.Default = sizeY.MaxValue = val.NewValue.Height;
 
+                areaSize.Default = new Size(sizeX.Default, sizeY.Default);
+
                 updateDisplay();
             }, true);
         }
@@ -77,31 +79,44 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
             Children = new Drawable[]
             {
-                new SettingsSlider<int>
-                {
-                    LabelText = "Offset X",
-                    Current = offsetX
-                },
-                new SettingsSlider<int>
-                {
-                    LabelText = "Offset Y",
-                    Current = offsetY
-                },
-                new SettingsSlider<int>
-                {
-                    LabelText = "Size X",
-                    Current = sizeX
-                },
-                new SettingsSlider<int>
-                {
-                    LabelText = "Size Y",
-                    Current = sizeY
-                },
                 new TabletAreaSelection(tabletHandler)
                 {
                     RelativeSizeAxes = Axes.X,
                     Height = 300,
-                }
+                },
+                new SettingsButton
+                {
+                    Text = "Reset to full area",
+                    Action = () =>
+                    {
+                        areaOffset.SetDefault();
+                        areaSize.SetDefault();
+                    },
+                },
+                new SettingsCheckbox
+                {
+                    LabelText = "Lock aspect ratio",
+                },
+                new SettingsSlider<int>
+                {
+                    LabelText = "X Offset",
+                    Current = offsetX
+                },
+                new SettingsSlider<int>
+                {
+                    LabelText = "Y Offset",
+                    Current = offsetY
+                },
+                new SettingsSlider<int>
+                {
+                    LabelText = "Width",
+                    Current = sizeX
+                },
+                new SettingsSlider<int>
+                {
+                    LabelText = "Height",
+                    Current = sizeY
+                },
             };
         }
     }