Merge branch 'master' into breadcrumb-fix

osu.Game/Graphics/OsuColour.cs

@@ -3,7 +3,6 @@
 
 using System;
 using osu.Game.Beatmaps;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Graphics
@@ -78,46 +77,6 @@ namespace osu.Game.Graphics
             }
         }
 
-        public Color4 ForOverlayElement(OverlayColourScheme colourScheme, float saturation, float lightness, float opacity = 1) => Color4.FromHsl(new Vector4(getBaseHue(colourScheme), saturation, lightness, opacity));
-
-        // See https://github.com/ppy/osu-web/blob/4218c288292d7c810b619075471eaea8bbb8f9d8/app/helpers.php#L1463
-        private static float getBaseHue(OverlayColourScheme colourScheme)
-        {
-            float hue;
-
-            switch (colourScheme)
-            {
-                default:
-                    throw new ArgumentException($@"{colourScheme} colour scheme does not provide a hue value in {nameof(getBaseHue)}.");
-
-                case OverlayColourScheme.Red:
-                    hue = 0;
-                    break;
-
-                case OverlayColourScheme.Pink:
-                    hue = 333;
-                    break;
-
-                case OverlayColourScheme.Orange:
-                    hue = 46;
-                    break;
-
-                case OverlayColourScheme.Green:
-                    hue = 115;
-                    break;
-
-                case OverlayColourScheme.Purple:
-                    hue = 255;
-                    break;
-
-                case OverlayColourScheme.Blue:
-                    hue = 200;
-                    break;
-            }
-
-            return hue / 360f;
-        }
-
         // See https://github.com/ppy/osu-web/blob/master/resources/assets/less/colors.less
         public readonly Color4 PurpleLighter = FromHex(@"eeeeff");
         public readonly Color4 PurpleLight = FromHex(@"aa88ff");
@@ -220,14 +179,4 @@ namespace osu.Game.Graphics
 
         public readonly Color4 ContextMenuGray = FromHex(@"223034");
     }
-
-    public enum OverlayColourScheme
-    {
-        Red,
-        Pink,
-        Orange,
-        Green,
-        Purple,
-        Blue
-    }
 }

osu.Game/Graphics/ScreenshotManager.cs

@@ -90,7 +90,7 @@ namespace osu.Game.Graphics
                 {
                     ScheduledDelegate waitDelegate = host.DrawThread.Scheduler.AddDelayed(() =>
                     {
-                        if (framesWaited++ < frames_to_wait)
+                        if (framesWaited++ >= frames_to_wait)
                             // ReSharper disable once AccessToDisposedClosure
                             framesWaitedEvent.Set();
                     }, 10, true);