h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 10:22:56 +08:00
Code Issues Releases Wiki Activity

Consume device name

Browse Source
This commit is contained in:
Dean Herbert 2021-03-16 16:23:46 +09:00
parent 94f184d113
commit 464702182d
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
View File

@ -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;

14
osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
View File

@ -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();
});
}