diff --git a/osu.Game/Graphics/Cursor/IProvideLocalCursor.cs b/osu.Game/Graphics/Cursor/IProvideCursor.cs
similarity index 84%
rename from osu.Game/Graphics/Cursor/IProvideLocalCursor.cs
rename to osu.Game/Graphics/Cursor/IProvideCursor.cs
index 61631b1220..eb17f72846 100644
--- a/osu.Game/Graphics/Cursor/IProvideLocalCursor.cs
+++ b/osu.Game/Graphics/Cursor/IProvideCursor.cs
@@ -6,12 +6,12 @@ using osu.Framework.Graphics.Cursor;
namespace osu.Game.Graphics.Cursor
{
- public interface IProvideLocalCursor : IDrawable
+ public interface IProvideCursor : IDrawable
{
///
/// The cursor provided by this .
///
- CursorContainer LocalCursor { get; }
+ CursorContainer Cursor { get; }
///
/// Whether the cursor provided by this should be displayed.
diff --git a/osu.Game/Graphics/Cursor/OsuCursorContainer.cs b/osu.Game/Graphics/Cursor/OsuCursorContainer.cs
index 8a25c9c587..bc4e084813 100644
--- a/osu.Game/Graphics/Cursor/OsuCursorContainer.cs
+++ b/osu.Game/Graphics/Cursor/OsuCursorContainer.cs
@@ -9,7 +9,7 @@ using osu.Framework.Input;
namespace osu.Game.Graphics.Cursor
{
- public class OsuCursorContainer : Container, IProvideLocalCursor
+ public class OsuCursorContainer : Container, IProvideCursor
{
protected override Container Content => content;
private readonly Container content;
@@ -19,14 +19,14 @@ namespace osu.Game.Graphics.Cursor
///
public bool CanShowCursor;
- public CursorContainer LocalCursor { get; }
+ public CursorContainer Cursor { get; }
public bool ProvidesUserCursor => true;
public OsuCursorContainer()
{
AddRangeInternal(new Drawable[]
{
- LocalCursor = new MenuCursor { State = Visibility.Hidden },
+ Cursor = new MenuCursor { State = Visibility.Hidden },
content = new Container { RelativeSizeAxes = Axes.Both }
});
}
@@ -39,24 +39,24 @@ namespace osu.Game.Graphics.Cursor
inputManager = GetContainingInputManager();
}
- private IProvideLocalCursor currentTarget;
+ private IProvideCursor currentTarget;
protected override void Update()
{
base.Update();
if (!CanShowCursor)
{
- currentTarget?.LocalCursor?.Hide();
+ currentTarget?.Cursor?.Hide();
return;
}
- var newTarget = inputManager.HoveredDrawables.OfType().FirstOrDefault(t => t.ProvidesUserCursor) ?? this;
+ var newTarget = inputManager.HoveredDrawables.OfType().FirstOrDefault(t => t.ProvidesUserCursor) ?? this;
if (currentTarget == newTarget)
return;
- currentTarget?.LocalCursor?.Hide();
- newTarget.LocalCursor?.Show();
+ currentTarget?.Cursor?.Hide();
+ newTarget.Cursor?.Show();
currentTarget = newTarget;
}
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index c88ffd3739..c615b212c3 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -215,7 +215,7 @@ namespace osu.Game
CursorContainer.Child = globalBinding = new GlobalKeyBindingInputManager(this)
{
RelativeSizeAxes = Axes.Both,
- Child = content = new OsuTooltipContainer(CursorContainer.LocalCursor) { RelativeSizeAxes = Axes.Both }
+ Child = content = new OsuTooltipContainer(CursorContainer.Cursor) { RelativeSizeAxes = Axes.Both }
};
base.Content.Add(new DrawSizePreservingFillContainer { Child = CursorContainer });
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index a2d1d161c4..4c294b08ff 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -33,7 +33,7 @@ using osu.Game.Storyboards.Drawables;
namespace osu.Game.Screens.Play
{
- public class Player : OsuScreen, IProvideLocalCursor
+ public class Player : OsuScreen, IProvideCursor
{
protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap);
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Play
public int RestartCount;
- public CursorContainer LocalCursor => RulesetContainer.Cursor;
+ public CursorContainer Cursor => RulesetContainer.Cursor;
public bool ProvidesUserCursor => RulesetContainer?.Cursor != null && !RulesetContainer.HasReplayLoaded;
private IAdjustableClock adjustableSourceClock;
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b87c1a0c6e..7175e813f4 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -374,7 +374,7 @@
-
+