From 43f8a8e8c57adc0266412687d65c6d8cb3037505 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Mon, 15 Jan 2018 14:00:13 +0900 Subject: [PATCH] Rename OsuCursorVisualiser -> CursorOverrideContainer --- ...uCursorVisualiser.cs => CursorOverrideContainer.cs} | 6 +++--- osu.Game/OsuGame.cs | 2 +- osu.Game/OsuGameBase.cs | 10 +++++----- osu.Game/osu.Game.csproj | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) rename osu.Game/Graphics/Cursor/{OsuCursorVisualiser.cs => CursorOverrideContainer.cs} (85%) diff --git a/osu.Game/Graphics/Cursor/OsuCursorVisualiser.cs b/osu.Game/Graphics/Cursor/CursorOverrideContainer.cs similarity index 85% rename from osu.Game/Graphics/Cursor/OsuCursorVisualiser.cs rename to osu.Game/Graphics/Cursor/CursorOverrideContainer.cs index 2b2ab593aa..5035020492 100644 --- a/osu.Game/Graphics/Cursor/OsuCursorVisualiser.cs +++ b/osu.Game/Graphics/Cursor/CursorOverrideContainer.cs @@ -10,9 +10,9 @@ using osu.Framework.Input; namespace osu.Game.Graphics.Cursor { /// - /// Visualises different cursors depending on the currently-hovered s. + /// A container which provides a which can be overridden by hovered s. /// - public class OsuCursorVisualiser : Container, IProvideCursor + public class CursorOverrideContainer : Container, IProvideCursor { protected override Container Content => content; private readonly Container content; @@ -25,7 +25,7 @@ namespace osu.Game.Graphics.Cursor public CursorContainer Cursor { get; } public bool ProvidesUserCursor => true; - public OsuCursorVisualiser() + public CursorOverrideContainer() { AddRangeInternal(new Drawable[] { diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index 3dda26fc02..124b9364b3 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -445,7 +445,7 @@ namespace osu.Game mainContent.Padding = new MarginPadding { Top = ToolbarOffset }; - CursorVisualiser.CanShowCursor = currentScreen?.CursorVisible ?? false; + CursorOverrideContainer.CanShowCursor = currentScreen?.CursorVisible ?? false; } private void screenAdded(Screen newScreen) diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs index 61ad4024f0..ef02f1a7ec 100644 --- a/osu.Game/OsuGameBase.cs +++ b/osu.Game/OsuGameBase.cs @@ -44,7 +44,7 @@ namespace osu.Game protected KeyBindingStore KeyBindingStore; - protected OsuCursorVisualiser CursorVisualiser; + protected CursorOverrideContainer CursorOverrideContainer; protected override string MainResourceFile => @"osu.Game.Resources.dll"; @@ -211,14 +211,14 @@ namespace osu.Game GlobalKeyBindingInputManager globalBinding; - CursorVisualiser = new OsuCursorVisualiser { RelativeSizeAxes = Axes.Both }; - CursorVisualiser.Child = globalBinding = new GlobalKeyBindingInputManager(this) + CursorOverrideContainer = new CursorOverrideContainer { RelativeSizeAxes = Axes.Both }; + CursorOverrideContainer.Child = globalBinding = new GlobalKeyBindingInputManager(this) { RelativeSizeAxes = Axes.Both, - Child = content = new OsuTooltipContainer(CursorVisualiser.Cursor) { RelativeSizeAxes = Axes.Both } + Child = content = new OsuTooltipContainer(CursorOverrideContainer.Cursor) { RelativeSizeAxes = Axes.Both } }; - base.Content.Add(new DrawSizePreservingFillContainer { Child = CursorVisualiser }); + base.Content.Add(new DrawSizePreservingFillContainer { Child = CursorOverrideContainer }); KeyBindingStore.Register(globalBinding); dependencies.Cache(globalBinding); diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index fd53a211e0..7b97d46531 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -377,7 +377,7 @@ - +