From 0886107ec911c79d6d3f25317b31c0586ddc0ba2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Dec 2017 01:56:57 +0900
Subject: [PATCH] Connect counter with button display

---
 .../Toolbar/ToolbarNotificationButton.cs      | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs b/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs
index 78a04d156a..faf802f5e7 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Toolbar
 
         public BindableInt NotificationCount = new BindableInt();
 
-        private CountCircle countDisplay;
+        private readonly CountCircle countDisplay;
 
         public ToolbarNotificationButton()
         {
@@ -32,8 +32,8 @@ namespace osu.Game.Overlays.Toolbar
                 Alpha = 0,
                 Height = 16,
                 RelativePositionAxes = Axes.Both,
-                Origin = Anchor.TopCentre,
-                Position = new Vector2(0.7f, 0.05f),
+                Origin = Anchor.Centre,
+                Position = new Vector2(0.7f, 0.25f),
             });
         }
 
@@ -42,24 +42,34 @@ namespace osu.Game.Overlays.Toolbar
         {
             StateContainer = notificationOverlay;
 
+            if (notificationOverlay != null)
+                NotificationCount.BindTo(notificationOverlay.UnreadCount);
+
             NotificationCount.ValueChanged += count =>
             {
                 if (count == 0)
                     countDisplay.FadeOut(200, Easing.OutQuint);
                 else
+                {
+                    countDisplay.Count = count;
                     countDisplay.FadeIn(200, Easing.OutQuint);
-
-                countDisplay.Count = count;
+                }
             };
         }
 
         private class CountCircle : CompositeDrawable
         {
             private readonly OsuSpriteText count;
+            private readonly Circle circle;
 
             public int Count
             {
-                set { count.Text = value.ToString("#,0"); }
+                set
+                {
+                    count.Text = value.ToString("#,0");
+                    circle.FlashColour(Color4.White, 600, Easing.OutQuint);
+                    this.ScaleTo(1.1f).Then().ScaleTo(1, 600, Easing.OutElastic);
+                }
             }
 
             public CountCircle()
@@ -68,7 +78,7 @@ namespace osu.Game.Overlays.Toolbar
 
                 InternalChildren = new Drawable[]
                 {
-                    new Circle
+                    circle = new Circle
                     {
                         RelativeSizeAxes = Axes.Both,
                         Colour = Color4.Red