h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 07:43:00 +08:00
Code Issues Releases Wiki Activity

Steer touch input flag via bindable rather than config manager

Browse Source
This commit is contained in:
Bartłomiej Dach 2023-11-06 07:48:09 +01:00
parent 11bd801795
commit 3c72c5bccd
No known key found for this signature in database
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Game/Input/TouchInputInterceptor.cs
View File

@ -3,6 +3,7 @@
using System.Diagnostics;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Extensions.TypeExtensions;
using osu.Framework.Graphics;
using osu.Framework.Input.Events;
@ -22,12 +23,17 @@ namespace osu.Game.Input
{
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
[Resolved]
private SessionStatics statics { get; set; } = null!;
private readonly BindableBool touchInputActive = new BindableBool();
[BackgroundDependencyLoader]
private void load(SessionStatics statics)
{
statics.BindWith(Static.TouchInputActive, touchInputActive);
}
protected override bool Handle(UIEvent e)
{
bool touchInputWasActive = statics.Get<bool>(Static.TouchInputActive);
bool touchInputWasActive = touchInputActive.Value;
switch (e)
{
@ -36,7 +42,7 @@ namespace osu.Game.Input
{
if (touchInputWasActive)
Logger.Log($@"Touch input deactivated due to received {e.GetType().ReadableName()}", LoggingTarget.Input);
statics.SetValue(Static.TouchInputActive, false);
touchInputActive.Value = false;
}
break;
@ -44,7 +50,7 @@ namespace osu.Game.Input
case TouchEvent:
if (!touchInputWasActive)
Logger.Log($@"Touch input activated due to received {e.GetType().ReadableName()}", LoggingTarget.Input);
statics.SetValue(Static.TouchInputActive, true);
touchInputActive.Value = true;
break;
case KeyDownEvent keyDown:
@ -59,10 +65,8 @@ namespace osu.Game.Input
[Conditional("TOUCH_INPUT_DEBUG")]
private void debugToggleTouchInputActive()
{
bool oldValue = statics.Get<bool>(Static.TouchInputActive);
bool newValue = !oldValue;
Logger.Log($@"Debug-toggling touch input to {(newValue ? @"active" : @"inactive")}", LoggingTarget.Input, LogLevel.Debug);
statics.SetValue(Static.TouchInputActive, newValue);
Logger.Log($@"Debug-toggling touch input to {(touchInputActive.Value ? @"inactive" : @"active")}", LoggingTarget.Input, LogLevel.Debug);
touchInputActive.Toggle();
}
}
}