Adjust usage of Handle(Non)PositionalInput to follow framework update

This commit is contained in:
ekrctb 2018-10-02 14:41:18 +09:00
parent b7a2ad1aa5
commit 68980fc477
15 changed files with 22 additions and 36 deletions

View File

@ -27,9 +27,6 @@ namespace osu.Desktop.Overlays
private NotificationOverlay notificationOverlay;
private GameHost host;
public override bool HandleNonPositionalInput => false;
public override bool HandlePositionalInput => false;
[BackgroundDependencyLoader]
private void load(NotificationOverlay notification, OsuColour colours, TextureStore textures, OsuGameBase game, OsuConfigManager config, GameHost host)
{

View File

@ -12,6 +12,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
{
public class CirclePiece : Container, IKeyBindingHandler<OsuAction>
{
// IsHovered is used
public override bool HandlePositionalInput => true;
public Func<bool> Hit;
public CirclePiece()

View File

@ -11,9 +11,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
{
public class SpinnerBackground : CircularContainer, IHasAccentColour
{
public override bool HandleNonPositionalInput => false;
public override bool HandlePositionalInput => false;
protected Box Disc;
public Color4 AccentColour

View File

@ -30,10 +30,6 @@ namespace osu.Game.Graphics.Backgrounds
/// </summary>
private const float edge_smoothness = 1;
public override bool HandleNonPositionalInput => false;
public override bool HandlePositionalInput => false;
public Color4 ColourLight = Color4.White;
public Color4 ColourDark = Color4.Black;

View File

@ -20,8 +20,6 @@ namespace osu.Game.Graphics.Containers
{
}
public override bool HandlePositionalInput => true;
private OsuGame game;
private Action showNotImplementedError;

View File

@ -54,8 +54,6 @@ namespace osu.Game.Graphics
Scheduler.AddDelayed(updateTimeWithReschedule, timeUntilNextUpdate);
}
public override bool HandlePositionalInput => true;
protected virtual string Format() => Date.Humanize();
private void updateTime() => Text = Format();

View File

@ -97,6 +97,9 @@ namespace osu.Game.Graphics.UserInterface
#region DrawableOsuDropdownMenuItem
public class DrawableOsuDropdownMenuItem : DrawableDropdownMenuItem, IHasAccentColour
{
// IsHovered is used
public override bool HandlePositionalInput => true;
private Color4? accentColour;
public Color4 AccentColour
{

View File

@ -51,7 +51,7 @@ namespace osu.Game.Overlays
private readonly ChatTabControl channelTabs;
private readonly Container chatContainer;
private readonly Container tabsArea;
private readonly TabsArea tabsArea;
private readonly Box chatBackground;
private readonly Box tabBackground;
@ -145,11 +145,8 @@ namespace osu.Game.Overlays
loading = new LoadingAnimation(),
}
},
tabsArea = new Container
tabsArea = new TabsArea
{
Name = @"tabs area",
RelativeSizeAxes = Axes.X,
Height = TAB_AREA_HEIGHT,
Children = new Drawable[]
{
tabBackground = new Box
@ -541,5 +538,18 @@ namespace osu.Game.Overlays
api.Queue(req);
}
private class TabsArea : Container
{
// IsHovered is used
public override bool HandlePositionalInput => true;
public TabsArea()
{
Name = @"tabs area";
RelativeSizeAxes = Axes.X;
Height = TAB_AREA_HEIGHT;
}
}
}
}

View File

@ -25,9 +25,6 @@ namespace osu.Game.Overlays
{
private readonly Container box;
public override bool HandleNonPositionalInput => false;
public override bool HandlePositionalInput => false;
private readonly SpriteText textLine1;
private readonly SpriteText textLine2;
private readonly SpriteText textLine3;

View File

@ -64,9 +64,6 @@ namespace osu.Game.Screens.Menu
private readonly float[] frequencyAmplitudes = new float[256];
public override bool HandleNonPositionalInput => false;
public override bool HandlePositionalInput => false;
private Shader shader;
private readonly Texture texture;

View File

@ -19,9 +19,6 @@ namespace osu.Game.Screens.Menu
{
public class MenuSideFlashes : BeatSyncedContainer
{
public override bool HandleNonPositionalInput => false;
public override bool HandlePositionalInput => false;
private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
private Box leftBox;

View File

@ -21,9 +21,6 @@ namespace osu.Game.Screens.Play
public int ColumnCount => columns.Length;
public override bool HandleNonPositionalInput => false;
public override bool HandlePositionalInput => false;
private int progress;
public int Progress
{

View File

@ -11,8 +11,6 @@ namespace osu.Game.Screens.Select.Leaderboards
{
protected const float TEXT_SIZE = 22;
public override bool HandlePositionalInput => true;
protected Placeholder()
: base(cp => cp.TextSize = TEXT_SIZE)
{

View File

@ -18,8 +18,6 @@ namespace osu.Game.Storyboards.Drawables
protected override Container<DrawableStoryboardLayer> Content => content;
protected override Vector2 DrawScale => new Vector2(Parent.DrawHeight / 480);
public override bool HandleNonPositionalInput => false;
public override bool HandlePositionalInput => false;
private bool passing = true;
public bool Passing

View File

@ -18,7 +18,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.1.3" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="ppy.osu.Framework" Version="0.0.7368" />
<PackageReference Include="ppy.osu.Framework" Version="2018.1002.0" />
<PackageReference Include="SharpCompress" Version="0.22.0" />
<PackageReference Include="NUnit" Version="3.10.1" />
<PackageReference Include="SharpRaven" Version="2.4.0" />