h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 08:12:56 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-ef-hiding

Browse Source
This commit is contained in:
Dan Balasescu 2017-10-20 17:22:50 +09:00 committed by GitHub
commit a9b9d82b74
2 changed files with 39 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Overlays/Notifications/ProgressNotification.cs
View File

@ -25,10 +25,7 @@ namespace osu.Game.Overlays.Notifications
public float Progress
{
get { return progressBar.Progress; }
set
{
progressBar.Progress = value;
}
set { Schedule(() => progressBar.Progress = value); }
}
protected override void LoadComplete()
@ -43,6 +40,8 @@ namespace osu.Game.Overlays.Notifications
{
get { return state; }
set
{
Schedule(() =>
{
bool stateChanged = state != value;
state = value;
@ -79,6 +78,7 @@ namespace osu.Game.Overlays.Notifications
break;
}
}
});
}
}

6
osu.Game/Tests/Visual/TestCaseNotificationOverlay.cs
View File

@ -66,12 +66,10 @@ namespace osu.Game.Tests.Visual
progressingNotifications.RemoveAll(n => n.State == ProgressNotificationState.Completed);
while (progressingNotifications.Count(n => n.State == ProgressNotificationState.Active) < 3)
if (progressingNotifications.Count(n => n.State == ProgressNotificationState.Active) < 3)
{
var p = progressingNotifications.FirstOrDefault(n => n.IsAlive && n.State == ProgressNotificationState.Queued);
if (p == null)
break;
if (p != null)
p.State = ProgressNotificationState.Active;
}