-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #19389 from peppy/cursor-with-touch
Add ability to make cursor show even during touch input
- Loading branch information
Showing
14 changed files
with
153 additions
and
132 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. | ||
| // See the LICENCE file in the repository root for full licence text. | ||
|
|
||
| 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 the main <see cref="Cursor.MenuCursor"/>. | ||
| /// Also handles cases where a more localised cursor is provided by another component (via <see cref="IProvideCursor"/>). | ||
| /// </summary> | ||
| public class GlobalCursorDisplay : Container, IProvideCursor | ||
| { | ||
| /// <summary> | ||
| /// Control whether any cursor should be displayed. | ||
| /// </summary> | ||
| internal bool ShowCursor = true; | ||
|
|
||
| public CursorContainer MenuCursor { get; } | ||
|
|
||
| public bool ProvidingUserCursor => true; | ||
|
|
||
| protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both }; | ||
|
|
||
| private Bindable<bool> showDuringTouch = null!; | ||
|
|
||
| private InputManager inputManager = null!; | ||
|
|
||
| private IProvideCursor? currentOverrideProvider; | ||
|
|
||
| [Resolved] | ||
| private OsuConfigManager config { get; set; } = null!; | ||
|
|
||
| public GlobalCursorDisplay() | ||
| { | ||
| AddRangeInternal(new Drawable[] | ||
| { | ||
| MenuCursor = new MenuCursor { State = { Value = Visibility.Hidden } }, | ||
| Content = new Container { RelativeSizeAxes = Axes.Both } | ||
| }); | ||
| } | ||
|
|
||
| protected override void LoadComplete() | ||
| { | ||
| base.LoadComplete(); | ||
|
|
||
| inputManager = GetContainingInputManager(); | ||
| showDuringTouch = config.GetBindable<bool>(OsuSetting.GameplayCursorDuringTouch); | ||
| } | ||
|
|
||
| protected override void Update() | ||
| { | ||
| base.Update(); | ||
|
|
||
| var lastMouseSource = inputManager.CurrentState.Mouse.LastSource; | ||
| bool hasValidInput = lastMouseSource != null && (showDuringTouch.Value || lastMouseSource is not ISourcedFromTouch); | ||
|
|
||
| if (!hasValidInput || !ShowCursor) | ||
| { | ||
| currentOverrideProvider?.MenuCursor?.Hide(); | ||
| currentOverrideProvider = null; | ||
| return; | ||
| } | ||
|
|
||
| IProvideCursor newOverrideProvider = this; | ||
|
|
||
| foreach (var d in inputManager.HoveredDrawables) | ||
| { | ||
| if (d is IProvideCursor p && p.ProvidingUserCursor) | ||
| { | ||
| newOverrideProvider = p; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| if (currentOverrideProvider == newOverrideProvider) | ||
| return; | ||
|
|
||
| currentOverrideProvider?.MenuCursor?.Hide(); | ||
| newOverrideProvider.MenuCursor?.Show(); | ||
|
|
||
| currentOverrideProvider = newOverrideProvider; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.