sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add ability to make cursor show even during touch input

Browse Source 
I completely disagree with this from a UX perspective, but it's come up
so often that I figure we should just let users bone themselves.
This commit is contained in:
Dean Herbert
2022-07-26 14:07:33 +09:00
parent a7598c62ac
commit ee0c67e114
4 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Graphics/Cursor/MenuCursorContainer.cs
View File

@ -3,16 +3,20 @@
#nullable disable
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Input;
using osu.Framework.Input.StateChanges;
using osu.Game.Configuration;
namespace osu.Game.Graphics.Cursor
{
/// <summary>
/// A container which provides a <see cref="MenuCursor"/> which can be overridden by hovered <see cref="Drawable"/>s.
/// A container which provides a <see cref="MenuCursor"/>.
/// It also handles cases where a more localised cursor is provided by another component (via <see cref="IProvideCursor"/>).
/// </summary>
public class MenuCursorContainer : Container, IProvideCursor
{
@ -36,12 +40,19 @@ namespace osu.Game.Graphics.Cursor
});
}
private Bindable<bool> showDuringTouch;
private InputManager inputManager;
[Resolved]
private OsuConfigManager config { get; set; }
protected override void LoadComplete()
{
base.LoadComplete();
inputManager = GetContainingInputManager();
showDuringTouch = config.GetBindable<bool>(OsuSetting.GameplayCursorDuringTouch);
}
private IProvideCursor currentTarget;
@ -51,7 +62,7 @@ namespace osu.Game.Graphics.Cursor
base.Update();
var lastMouseSource = inputManager.CurrentState.Mouse.LastSource;
bool hasValidInput = lastMouseSource != null && !(lastMouseSource is ISourcedFromTouch);
bool hasValidInput = lastMouseSource != null && (showDuringTouch.Value || lastMouseSource is not ISourcedFromTouch);
if (!hasValidInput || !CanShowCursor)
{