From 464702182d6064023064720824403e8277bd19a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 16:23:46 +0900
Subject: [PATCH] Consume device name

---
 .../Visual/Settings/TestSceneTabletSettings.cs     |  1 +
 .../Settings/Sections/Input/TabletAreaSelection.cs | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
index 6455f51ab9..1c9cd6c2ba 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
@@ -46,6 +46,7 @@ namespace osu.Game.Tests.Visual.Settings
             public BindableSize AreaOffset { get; } = new BindableSize();
             public BindableSize AreaSize { get; } = new BindableSize();
             public IBindable<Size> TabletSize => tabletSize;
+            public string DeviceName => "test tablet T-421";
             public BindableBool Enabled { get; } = new BindableBool(true);
 
             public void SetTabletSize(Size size) => tabletSize.Value = size;
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index 77b16a970d..54a14cd822 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         private readonly Bindable<Size> areaSize = new BindableSize();
         private readonly Bindable<Size> tabletSize = new BindableSize();
 
+        private OsuSpriteText tabletName;
+
         public TabletAreaSelection(ITabletHandler handler)
         {
             this.handler = handler;
@@ -44,13 +46,13 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 Masking = true,
                 CornerRadius = 5,
                 BorderThickness = 2,
-                BorderColour = Color4.Black,
+                BorderColour = colour.Gray3,
                 Children = new Drawable[]
                 {
                     new Box
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.White,
+                        Colour = colour.Gray1,
                     },
                     usableAreaContainer = new Container
                     {
@@ -59,7 +61,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                Colour = Color4.White,
+                                Alpha = 0.6f,
                             },
                             new OsuSpriteText
                             {
@@ -71,6 +73,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             }
                         }
                     },
+                    tabletName = new OsuSpriteText
+                    {
+                        Padding = new MarginPadding(3),
+                        Font = OsuFont.Default.With(size: 8)
+                    },
                 }
             };
 
@@ -92,6 +99,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             tabletSize.BindValueChanged(val =>
             {
                 tabletContainer.Size = new Vector2(val.NewValue.Width, val.NewValue.Height);
+                tabletName.Text = handler.DeviceName;
                 checkBounds();
             });
         }