h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 09:32:55 +08:00
Code Issues Releases Wiki Activity

Merge pull request #1759 from peppy/quieter-notifications

Browse Source 
Fix notification read lamp and notification count
This commit is contained in:
Dan Balasescu 2017-12-26 18:35:25 +09:00 committed by GitHub
commit 2aea729062
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Notifications/Notification.cs
View File

@ -261,4 +261,4 @@ namespace osu.Game.Overlays.Notifications
}
}
}
}
}

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

@ -95,7 +95,7 @@ namespace osu.Game.Overlays.Notifications
protected virtual void Completed()
{
Expire();
base.Close();
CompletionTarget?.Invoke(CreateCompletionNotification());
}

4
osu.Game/Overlays/Notifications/SimpleNotification.cs
View File

@ -83,8 +83,10 @@ namespace osu.Game.Overlays.Notifications
set
{
if (value == base.Read) return;
base.Read = value;
Light.FadeTo(value ? 1 : 0, 100);
Light.FadeTo(value ? 0 : 1, 100);
}
}
}

21
osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs
View File

@ -59,16 +59,27 @@ namespace osu.Game.Overlays.Toolbar
private class CountCircle : CompositeDrawable
{
private readonly OsuSpriteText count;
private readonly OsuSpriteText countText;
private readonly Circle circle;
private int count;
public int Count
{
get { return count; }
set
{
count.Text = value.ToString("#,0");
circle.FlashColour(Color4.White, 600, Easing.OutQuint);
this.ScaleTo(1.1f).Then().ScaleTo(1, 600, Easing.OutElastic);
if (count == value)
return;
if (value > count)
{
circle.FlashColour(Color4.White, 600, Easing.OutQuint);
this.ScaleTo(1.1f).Then().ScaleTo(1, 600, Easing.OutElastic);
}
count = value;
countText.Text = value.ToString("#,0");
}
}
@ -83,7 +94,7 @@ namespace osu.Game.Overlays.Toolbar
RelativeSizeAxes = Axes.Both,
Colour = Color4.Red
},
count = new OsuSpriteText
countText = new OsuSpriteText
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,