Merge remote-tracking branch 'origin/master' into backgrounded-beatmap-status-lookups

# Conflicts:
#	osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
This commit is contained in:
smoogipoo
2019-06-12 17:24:16 +09:00
4 changed files with 20 additions and 8 deletions

View File

@ -10,11 +10,14 @@ namespace osu.Game.Overlays.Settings
{
private OsuCheckbox checkbox;
private string labelText;
protected override Drawable CreateControl() => checkbox = new OsuCheckbox();
public override string LabelText
{
set => checkbox.LabelText = value;
get => labelText;
set => checkbox.LabelText = labelText = value;
}
}
}