Merge branch 'master' into more-inspections

This commit is contained in:
Dean Herbert
2019-02-28 14:32:57 +09:00
committed by GitHub
130 changed files with 290 additions and 317 deletions

View File

@ -35,25 +35,25 @@ namespace osu.Game.Overlays.Toolbar
public FontAwesome Icon
{
set { SetIcon(value); }
set => SetIcon(value);
}
public string Text
{
get { return DrawableText.Text; }
set { DrawableText.Text = value; }
get => DrawableText.Text;
set => DrawableText.Text = value;
}
public string TooltipMain
{
get { return tooltip1.Text; }
set { tooltip1.Text = value; }
get => tooltip1.Text;
set => tooltip1.Text = value;
}
public string TooltipSub
{
get { return tooltip2.Text; }
set { tooltip2.Text = value; }
get => tooltip2.Text;
set => tooltip2.Text = value;
}
protected virtual Anchor TooltipAnchor => Anchor.TopLeft;