From 2342a17dbcdd3a6c4b681b5d17d1edcbbbd7e1be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Dec 2016 21:29:14 +0900
Subject: [PATCH] Move BufferedContainer usage to allow ripple to blend
 correctly with the background layer.

---
 osu.Game/Screens/Menu/OsuLogo.cs | 55 ++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index 50ef033942..c0d3b94737 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Menu
     /// <summary>
     /// osu! logo and its attachments (pulsing, visualiser etc.)
     /// </summary>
-    public partial class OsuLogo : BufferedContainer
+    public partial class OsuLogo : Container
     {
         private Sprite logo;
         private CircularContainer logoContainer;
@@ -82,39 +82,46 @@ namespace osu.Game.Screens.Menu
                             AutoSizeAxes = Axes.Both,
                             Children = new Drawable[]
                             {
-                                logoContainer = new CircularContainer
+                                new BufferedContainer
                                 {
-                                    Anchor = Anchor.Centre,
-                                    RelativeSizeAxes = Axes.Both,
-                                    Scale = new Vector2(0.8f),
+                                    AutoSizeAxes = Axes.Both,
                                     Children = new Drawable[]
                                     {
-                                        colourAndTriangles = new Container
+                                        logoContainer = new CircularContainer
                                         {
-                                            RelativeSizeAxes = Axes.Both,
                                             Anchor = Anchor.Centre,
-                                            Origin = Anchor.Centre,
+                                            RelativeSizeAxes = Axes.Both,
+                                            Scale = new Vector2(0.8f),
                                             Children = new Drawable[]
                                             {
-                                                new Box
+                                                colourAndTriangles = new Container
                                                 {
                                                     RelativeSizeAxes = Axes.Both,
-                                                    Colour = new Color4(233, 103, 161, 255),
+                                                    Anchor = Anchor.Centre,
+                                                    Origin = Anchor.Centre,
+                                                    Children = new Drawable[]
+                                                    {
+                                                        new Box
+                                                        {
+                                                            RelativeSizeAxes = Axes.Both,
+                                                            Colour = new Color4(233, 103, 161, 255),
+                                                        },
+                                                        new OsuLogoTriangles
+                                                        {
+                                                            RelativeSizeAxes = Axes.Both,
+                                                        },
+                                                    }
                                                 },
-                                                new OsuLogoTriangles
-                                                {
-                                                    RelativeSizeAxes = Axes.Both,
-                                                },
-                                            }
-                                        },
 
-                                    },
-                                },
-                                logo = new Sprite
-                                {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Scale = new Vector2(0.5f),
+                                            },
+                                        },
+                                        logo = new Sprite
+                                        {
+                                            Anchor = Anchor.Centre,
+                                            Origin = Anchor.Centre,
+                                            Scale = new Vector2(0.5f),
+                                        },
+                                    }
                                 },
                                 rippleContainer = new Container
                                 {
@@ -128,7 +135,7 @@ namespace osu.Game.Screens.Menu
                                             Origin = Anchor.Centre,
                                             BlendingMode = BlendingMode.Additive,
                                             Scale = new Vector2(0.5f),
-                                            Alpha = 0.05f
+                                            Alpha = 0.15f
                                         }
                                     }
                                 },