h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-05 01:04:16 +08:00
Code Issues Releases Wiki Activity

Apply conditionals directly rather than using an in-between property

Browse Source
This commit is contained in:
Dean Herbert
2018-01-16 20:34:14 +09:00
Unverified
parent e7a0a02466
commit 5e1cd8ddc4
5 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Graphics/UserInterface/BreadcrumbControl.cs
+3 -3
View File
@@ -42,9 +42,9 @@ namespace osu.Game.Graphics.UserInterface
//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 HandleKeyboardInput => handleInput;
public override bool HandleMouseInput => handleInput;
private bool handleInput => State == Visibility.Visible;
public override bool HandleKeyboardInput => State == Visibility.Visible;
public override bool HandleMouseInput => State == Visibility.Visible;
private Visibility state;
osu.Game/Overlays/Profile/ProfileHeader.cs
+2 -3
View File
@@ -489,9 +489,8 @@ namespace osu.Game.Overlays.Profile
{
private readonly OsuHoverContainer content;
public override bool HandleKeyboardInput => handleInput;
public override bool HandleMouseInput => handleInput;
private bool handleInput => content.Action != null;
public override bool HandleKeyboardInput => content.Action != null;
public override bool HandleMouseInput => content.Action != null;
protected override Container<Drawable> Content => content ?? (Container<Drawable>)this;
osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs
+2 -3
View File
@@ -87,9 +87,8 @@ namespace osu.Game.Overlays.Toolbar
ruleset.Value = rulesets.AvailableRulesets.FirstOrDefault();
}
public override bool HandleKeyboardInput => handleInput;
public override bool HandleMouseInput => handleInput;
private bool handleInput => !ruleset.Disabled;
public override bool HandleKeyboardInput => !ruleset.Disabled;
public override bool HandleMouseInput => !ruleset.Disabled;
private void disabledChanged(bool isDisabled) => this.FadeColour(isDisabled ? Color4.Gray : Color4.White, 300);
osu.Game/Screens/Menu/ButtonSystem.cs
+2 -3
View File
@@ -199,9 +199,8 @@ namespace osu.Game.Screens.Menu
private MenuState state;
public override bool HandleKeyboardInput => handleInput;
public override bool HandleMouseInput => handleInput;
private bool handleInput=> state != MenuState.Exit;
public override bool HandleKeyboardInput => state != MenuState.Exit;
public override bool HandleMouseInput => state != MenuState.Exit;
public MenuState State
{
osu.Game/Screens/Play/KeyCounterCollection.cs
+2 -3
View File
@@ -111,9 +111,8 @@ namespace osu.Game.Screens.Play
}
}
public override bool HandleKeyboardInput => handleInput;
public override bool HandleMouseInput => handleInput;
private bool handleInput => receptor == null;
public override bool HandleKeyboardInput => receptor == null;
public override bool HandleMouseInput => receptor == null;
private Receptor receptor;