Merge branch 'master' into use-pattern-matching

This commit is contained in:
Dean Herbert
2019-02-28 14:53:07 +09:00
committed by GitHub
306 changed files with 1009 additions and 623 deletions

View File

@ -58,9 +58,10 @@ namespace osu.Game.Graphics.UserInterface
}
private Color4 accentColour;
public Color4 AccentColour
{
get { return accentColour; }
get => accentColour;
set
{
accentColour = value;
@ -100,9 +101,10 @@ namespace osu.Game.Graphics.UserInterface
protected readonly Box Bar;
private Color4 accentColour;
public Color4 AccentColour
{
get { return accentColour; }
get => accentColour;
set
{
accentColour = value;
@ -145,7 +147,8 @@ namespace osu.Game.Graphics.UserInterface
AccentColour = colours.Blue;
}
public OsuTabItem(T value) : base(value)
public OsuTabItem(T value)
: base(value)
{
AutoSizeAxes = Axes.X;
RelativeSizeAxes = Axes.Y;
@ -223,11 +226,7 @@ namespace osu.Game.Graphics.UserInterface
{
public override Color4 AccentColour
{
get
{
return base.AccentColour;
}
get => base.AccentColour;
set
{
base.AccentColour = value;