sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 17:37:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1920 from peppy/input-queue-code-quality

Browse Source 
Simplify some mouse/keyboard handling overrides
This commit is contained in:
Dan Balasescu 2018-01-16 20:52:45 +09:00 committed by GitHub
commit 0ee9bcd70c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Graphics/UserInterface/BreadcrumbControl.cs
View File

@ -42,9 +42,9 @@ namespace osu.Game.Graphics.UserInterface
//don't allow clicking between transitions and don't make the chevron clickable //don't allow clicking between transitions and don't make the chevron clickable
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => Alpha == 1f && Text.ReceiveMouseInputAt(screenSpacePos); public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => Alpha == 1f && Text.ReceiveMouseInputAt(screenSpacePos);
public override bool HandleKeyboardInput => handleInput;
public override bool HandleMouseInput => handleInput; public override bool HandleKeyboardInput => State == Visibility.Visible;
private bool handleInput => State == Visibility.Visible; public override bool HandleMouseInput => State == Visibility.Visible;
private Visibility state; private Visibility state;

5
osu.Game/Overlays/Profile/ProfileHeader.cs
View File

@ -489,9 +489,8 @@ namespace osu.Game.Overlays.Profile
{ {
private readonly OsuHoverContainer content; private readonly OsuHoverContainer content;
public override bool HandleKeyboardInput => handleInput; public override bool HandleKeyboardInput => content.Action != null;
public override bool HandleMouseInput => handleInput; public override bool HandleMouseInput => content.Action != null;
private bool handleInput => content.Action != null;
protected override Container<Drawable> Content => content ?? (Container<Drawable>)this; protected override Container<Drawable> Content => content ?? (Container<Drawable>)this;

5
osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs
View File

@ -87,9 +87,8 @@ namespace osu.Game.Overlays.Toolbar
ruleset.Value = rulesets.AvailableRulesets.FirstOrDefault(); ruleset.Value = rulesets.AvailableRulesets.FirstOrDefault();
} }
public override bool HandleKeyboardInput => handleInput; public override bool HandleKeyboardInput => !ruleset.Disabled;
public override bool HandleMouseInput => handleInput; public override bool HandleMouseInput => !ruleset.Disabled;
private bool handleInput => !ruleset.Disabled;
private void disabledChanged(bool isDisabled) => this.FadeColour(isDisabled ? Color4.Gray : Color4.White, 300); private void disabledChanged(bool isDisabled) => this.FadeColour(isDisabled ? Color4.Gray : Color4.White, 300);

5
osu.Game/Screens/Menu/Button.cs
View File

@ -222,9 +222,8 @@ namespace osu.Game.Screens.Menu
boxHoverLayer.FadeOut(800, Easing.OutExpo); boxHoverLayer.FadeOut(800, Easing.OutExpo);
} }
public override bool HandleKeyboardInput => handleInput; public override bool HandleKeyboardInput => state != ButtonState.Exploded;
public override bool HandleMouseInput => handleInput; public override bool HandleMouseInput => state != ButtonState.Exploded && box.Scale.X >= 0.8f;
private bool handleInput => state != ButtonState.Exploded && box.Scale.X >= 0.8f;
protected override void Update() protected override void Update()
{ {

5
osu.Game/Screens/Menu/ButtonSystem.cs
View File

@ -199,9 +199,8 @@ namespace osu.Game.Screens.Menu
private MenuState state; private MenuState state;
public override bool HandleKeyboardInput => handleInput; public override bool HandleKeyboardInput => state != MenuState.Exit;
public override bool HandleMouseInput => handleInput; public override bool HandleMouseInput => state != MenuState.Exit;
private bool handleInput=> state != MenuState.Exit;
public MenuState State public MenuState State
{ {

4
osu.Game/Screens/Play/GameplayMenuOverlay.cs
View File

@ -142,10 +142,6 @@ namespace osu.Game.Screens.Play
} }
} }
public override bool HandleKeyboardInput => handleInput;
public override bool HandleMouseInput => handleInput;
private bool handleInput => State == Visibility.Visible;
protected override void PopIn() => this.FadeIn(transition_duration, Easing.In); protected override void PopIn() => this.FadeIn(transition_duration, Easing.In);
protected override void PopOut() => this.FadeOut(transition_duration, Easing.In); protected override void PopOut() => this.FadeOut(transition_duration, Easing.In);

5
osu.Game/Screens/Play/KeyCounterCollection.cs
View File

@ -111,9 +111,8 @@ namespace osu.Game.Screens.Play
} }
} }
public override bool HandleKeyboardInput => handleInput; public override bool HandleKeyboardInput => receptor == null;
public override bool HandleMouseInput => handleInput; public override bool HandleMouseInput => receptor == null;
private bool handleInput => receptor == null;
private Receptor receptor; private Receptor receptor;