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

@ -17,15 +17,15 @@ namespace osu.Game.Overlays.Notifications
{
public string Text
{
set { Schedule(() => textDrawable.Text = value); }
set => Schedule(() => textDrawable.Text = value);
}
public string CompletionText { get; set; } = "Task has completed!";
public float Progress
{
get { return progressBar.Progress; }
set { Schedule(() => progressBar.Progress = value); }
get => progressBar.Progress;
set => Schedule(() => progressBar.Progress = value);
}
protected override void LoadComplete()
@ -38,9 +38,8 @@ namespace osu.Game.Overlays.Notifications
public virtual ProgressNotificationState State
{
get { return state; }
set
{
get => state;
set =>
Schedule(() =>
{
bool stateChanged = state != value;
@ -79,7 +78,6 @@ namespace osu.Game.Overlays.Notifications
}
}
});
}
}
private ProgressNotificationState state;
@ -178,7 +176,7 @@ namespace osu.Game.Overlays.Notifications
public float Progress
{
get { return progress; }
get => progress;
set
{
if (progress == value) return;
@ -192,7 +190,7 @@ namespace osu.Game.Overlays.Notifications
public bool Active
{
get { return active; }
get => active;
set
{
active = value;