From ed81ed7c5431776f84dced2e97e89aaf8c05e7e4 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Mon, 11 Dec 2017 15:19:00 +0900 Subject: [PATCH] Add back HandleInput disable overrides --- .../Objects/Drawables/Pieces/SpinnerBackground.cs | 2 ++ osu.Game/Overlays/OnScreenDisplay.cs | 2 ++ osu.Game/Screens/Menu/LogoVisualisation.cs | 2 ++ osu.Game/Screens/Menu/MenuSideFlashes.cs | 2 ++ osu.Game/Screens/Play/SquareGraph.cs | 2 ++ osu.Game/Storyboards/Drawables/DrawableStoryboard.cs | 1 + 6 files changed, 11 insertions(+) diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBackground.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBackground.cs index bc362a4872..bdd5b71211 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBackground.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBackground.cs @@ -11,6 +11,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces { public class SpinnerBackground : CircularContainer, IHasAccentColour { + public override bool HandleInput => false; + protected Box Disc; public Color4 AccentColour diff --git a/osu.Game/Overlays/OnScreenDisplay.cs b/osu.Game/Overlays/OnScreenDisplay.cs index 6866804827..dcab942522 100644 --- a/osu.Game/Overlays/OnScreenDisplay.cs +++ b/osu.Game/Overlays/OnScreenDisplay.cs @@ -21,6 +21,8 @@ namespace osu.Game.Overlays { private readonly Container box; + public override bool HandleInput => false; + private readonly SpriteText textLine1; private readonly SpriteText textLine2; private readonly SpriteText textLine3; diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs index 5573542e69..5b86fd6ca3 100644 --- a/osu.Game/Screens/Menu/LogoVisualisation.cs +++ b/osu.Game/Screens/Menu/LogoVisualisation.cs @@ -64,6 +64,8 @@ namespace osu.Game.Screens.Menu private readonly float[] frequencyAmplitudes = new float[256]; + public override bool HandleInput => false; + private Shader shader; private readonly Texture texture; diff --git a/osu.Game/Screens/Menu/MenuSideFlashes.cs b/osu.Game/Screens/Menu/MenuSideFlashes.cs index 4e057b2d95..9317780eac 100644 --- a/osu.Game/Screens/Menu/MenuSideFlashes.cs +++ b/osu.Game/Screens/Menu/MenuSideFlashes.cs @@ -19,6 +19,8 @@ namespace osu.Game.Screens.Menu { public class MenuSideFlashes : BeatSyncedContainer { + public override bool HandleInput => false; + private readonly Bindable beatmap = new Bindable(); private readonly Box leftBox; diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs index 00888d8db4..81dbf3eca4 100644 --- a/osu.Game/Screens/Play/SquareGraph.cs +++ b/osu.Game/Screens/Play/SquareGraph.cs @@ -21,6 +21,8 @@ namespace osu.Game.Screens.Play public int ColumnCount => columns.Length; + public override bool HandleInput => false; + private int progress; public int Progress { diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs index 2230869213..5df88b342f 100644 --- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs +++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs @@ -26,6 +26,7 @@ namespace osu.Game.Storyboards.Drawables protected override Container Content => content; protected override Vector2 DrawScale => new Vector2(Parent.DrawHeight / 480); + public override bool HandleInput => false; private bool passing = true; public bool Passing