From 6b57456681b82e7d47f061e5bff3578d40ebd43c Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Sat, 28 Jan 2017 20:30:37 -0400
Subject: [PATCH] Removed depth setting from PauseOverlay, removed shadow
 offset on PauseButton color(why was that even there?), fixed the triangles on
 PauseButton not masking to the sheared container, made PauseButton call it's
 action on MouseUp instead of MouseDown to match stable

---
 osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs | 2 +-
 osu.Game/Overlays/Pause/PauseButton.cs                | 9 +--------
 osu.Game/Overlays/Pause/PauseOverlay.cs               | 4 ++--
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs b/osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs
index be1f9d57d7..8b48779666 100644
--- a/osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs
@@ -28,7 +28,7 @@ namespace osu.Desktop.VisualTests.Tests
                 ColourInfo = ColourInfo.GradientVertical(Color4.Gray, Color4.WhiteSmoke),
                 RelativeSizeAxes = Framework.Graphics.Axes.Both,
             });
-            Add(pauseOverlay = new PauseOverlay());
+            Add(pauseOverlay = new PauseOverlay { Depth = -1 });
 
             Add(new Button
             {
diff --git a/osu.Game/Overlays/Pause/PauseButton.cs b/osu.Game/Overlays/Pause/PauseButton.cs
index 956cb31109..49c4e472d5 100644
--- a/osu.Game/Overlays/Pause/PauseButton.cs
+++ b/osu.Game/Overlays/Pause/PauseButton.cs
@@ -59,15 +59,10 @@ namespace osu.Game.Overlays.Pause
         public override bool Contains(Vector2 screenSpacePos) => backgroundContainer.Contains(screenSpacePos);
 
         protected override bool OnMouseDown(Framework.Input.InputState state, MouseDownEventArgs args)
-        {
-            colourContainer.ResizeTo(new Vector2(colourWidth, 1f), 1000, EasingTypes.Out);
-            return true;
-        }
-
-        protected override bool OnMouseUp(Framework.Input.InputState state, MouseUpEventArgs args)
         {
             colourContainer.ResizeTo(new Vector2(1.1f, 1f), pressExpandTime, EasingTypes.In);
             sampleClick?.Play();
+            Action?.Invoke();
             return true;
         }
 
@@ -170,7 +165,6 @@ namespace osu.Game.Overlays.Pause
                                 Type = EdgeEffectType.Shadow,
                                 Colour = Color4.Black.Opacity(0.2f),
                                 Radius = 5,
-                                Offset = new Vector2(0, 5),
                             },
                             Colour = buttonColour,
                             Shear = new Vector2(shear, 0),
@@ -183,7 +177,6 @@ namespace osu.Game.Overlays.Pause
                                 },
                                 new Triangles
                                 {
-                                    Masking = true,
                                     BlendingMode = BlendingMode.Additive,
                                     RelativeSizeAxes = Axes.Both,
                                     TriangleScale = 4,
diff --git a/osu.Game/Overlays/Pause/PauseOverlay.cs b/osu.Game/Overlays/Pause/PauseOverlay.cs
index 2fa4239749..ffa8955d46 100644
--- a/osu.Game/Overlays/Pause/PauseOverlay.cs
+++ b/osu.Game/Overlays/Pause/PauseOverlay.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Pause
         public Action OnRetry;
         public Action OnQuit;
 
-        private SpriteText retryCounter;
        private PauseProgressBar progressBar;
+        private SpriteText retryCounter;
 
 
         [BackgroundDependencyLoader]
@@ -76,7 +76,7 @@ namespace osu.Game.Overlays.Pause
                     ShadowColour = new Color4(0, 0, 0, 0.25f),
                     TextSize = 18,
                 },
-                progressBar = new PauseProgressBar
+                new PauseProgressBar
                 {
                     Origin = Anchor.BottomCentre,
                     Anchor = Anchor.BottomCentre,