Merge remote-tracking branch 'refs/remotes/ppy/master' into page-selector

osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs

@@ -21,8 +21,6 @@ namespace osu.Game.Graphics.Containers
         private SampleChannel samplePopIn;
         private SampleChannel samplePopOut;
 
-        protected virtual bool PlaySamplesOnStateChange => true;
-
         protected override bool BlockNonPositionalInput => true;
 
         /// <summary>
@@ -32,7 +30,7 @@ namespace osu.Game.Graphics.Containers
         protected virtual bool DimMainContent => true;
 
         [Resolved(CanBeNull = true)]
-        private OsuGame osuGame { get; set; }
+        private OsuGame game { get; set; }
 
         [Resolved]
         private PreviewTrackManager previewTrackManager { get; set; }
@@ -42,13 +40,22 @@ namespace osu.Game.Graphics.Containers
         [BackgroundDependencyLoader(true)]
         private void load(AudioManager audio)
         {
-            if (osuGame != null)
-                OverlayActivationMode.BindTo(osuGame.OverlayActivationMode);
-
             samplePopIn = audio.Samples.Get(@"UI/overlay-pop-in");
             samplePopOut = audio.Samples.Get(@"UI/overlay-pop-out");
+        }
 
-            State.ValueChanged += onStateChanged;
+        protected override void LoadComplete()
+        {
+            if (game != null)
+                OverlayActivationMode.BindTo(game.OverlayActivationMode);
+
+            OverlayActivationMode.BindValueChanged(mode =>
+            {
+                if (mode.NewValue == OverlayActivation.Disabled)
+                    State.Value = Visibility.Hidden;
+            }, true);
+
+            base.LoadComplete();
         }
 
         /// <summary>
@@ -106,26 +113,28 @@ namespace osu.Game.Graphics.Containers
 
         public bool OnReleased(GlobalAction action) => false;
 
-        private void onStateChanged(ValueChangedEvent<Visibility> state)
+        protected override void UpdateState(ValueChangedEvent<Visibility> state)
         {
             switch (state.NewValue)
             {
                 case Visibility.Visible:
-                    if (OverlayActivationMode.Value != OverlayActivation.Disabled)
+                    if (OverlayActivationMode.Value == OverlayActivation.Disabled)
                     {
-                        if (PlaySamplesOnStateChange) samplePopIn?.Play();
-                        if (BlockScreenWideMouse && DimMainContent) osuGame?.AddBlockingOverlay(this);
+                        State.Value = Visibility.Hidden;
+                        return;
                     }
-                    else
-                        Hide();
 
+                    samplePopIn?.Play();
+                    if (BlockScreenWideMouse && DimMainContent) game?.AddBlockingOverlay(this);
                     break;
 
                 case Visibility.Hidden:
-                    if (PlaySamplesOnStateChange) samplePopOut?.Play();
-                    if (BlockScreenWideMouse) osuGame?.RemoveBlockingOverlay(this);
+                    samplePopOut?.Play();
+                    if (BlockScreenWideMouse) game?.RemoveBlockingOverlay(this);
                     break;
             }
+
+            base.UpdateState(state);
         }
 
         protected override void PopOut()
@@ -137,7 +146,7 @@ namespace osu.Game.Graphics.Containers
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            osuGame?.RemoveBlockingOverlay(this);
+            game?.RemoveBlockingOverlay(this);
         }
     }
 }

osu.Game/Graphics/Containers/UserDimContainer.cs

@@ -35,6 +35,8 @@ namespace osu.Game.Graphics.Containers
 
         protected Bindable<bool> ShowStoryboard { get; private set; }
 
+        protected Bindable<bool> ShowVideo { get; private set; }
+
         protected double DimLevel => EnableUserDim.Value ? UserDimLevel.Value : 0;
 
         protected override Container<Drawable> Content => dimContent;
@@ -54,10 +56,12 @@ namespace osu.Game.Graphics.Containers
         {
             UserDimLevel = config.GetBindable<double>(OsuSetting.DimLevel);
             ShowStoryboard = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
+            ShowVideo = config.GetBindable<bool>(OsuSetting.ShowVideoBackground);
 
             EnableUserDim.ValueChanged += _ => UpdateVisuals();
             UserDimLevel.ValueChanged += _ => UpdateVisuals();
             ShowStoryboard.ValueChanged += _ => UpdateVisuals();
+            ShowVideo.ValueChanged += _ => UpdateVisuals();
             StoryboardReplacesBackground.ValueChanged += _ => UpdateVisuals();
         }
 

osu.Game/Graphics/ScreenshotManager.cs

@@ -83,11 +83,19 @@ namespace osu.Game.Graphics
                 const int frames_to_wait = 3;
 
                 int framesWaited = 0;
-                ScheduledDelegate waitDelegate = host.DrawThread.Scheduler.AddDelayed(() => framesWaited++, 0, true);
-                while (framesWaited < frames_to_wait)
-                    Thread.Sleep(10);
 
-                waitDelegate.Cancel();
+                using (var framesWaitedEvent = new ManualResetEventSlim(false))
+                {
+                    ScheduledDelegate waitDelegate = host.DrawThread.Scheduler.AddDelayed(() =>
+                    {
+                        if (framesWaited++ < frames_to_wait)
+                            // ReSharper disable once AccessToDisposedClosure
+                            framesWaitedEvent.Set();
+                    }, 10, true);
+
+                    framesWaitedEvent.Wait();
+                    waitDelegate.Cancel();
+                }
             }
 
             using (var image = await host.TakeScreenshotAsync())

osu.Game/Graphics/UserInterface/GradientLineTabControl.cs

@@ -0,0 +1,84 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osuTK;
+using osu.Framework.Graphics.Shapes;
+using osuTK.Graphics;
+using osu.Framework.Graphics.Colour;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public abstract class GradientLineTabControl<TModel> : PageTabControl<TModel>
+    {
+        protected Color4 LineColour
+        {
+            get => line.Colour;
+            set => line.Colour = value;
+        }
+
+        private readonly GradientLine line;
+
+        protected GradientLineTabControl()
+        {
+            RelativeSizeAxes = Axes.X;
+
+            AddInternal(line = new GradientLine
+            {
+                Anchor = Anchor.BottomCentre,
+                Origin = Anchor.BottomCentre,
+            });
+        }
+
+        protected override Dropdown<TModel> CreateDropdown() => null;
+
+        protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
+        {
+            Anchor = Anchor.BottomCentre,
+            Origin = Anchor.BottomCentre,
+            AutoSizeAxes = Axes.X,
+            RelativeSizeAxes = Axes.Y,
+            Direction = FillDirection.Horizontal,
+            Spacing = new Vector2(20, 0),
+        };
+
+        private class GradientLine : GridContainer
+        {
+            public GradientLine()
+            {
+                RelativeSizeAxes = Axes.X;
+                Size = new Vector2(0.8f, 1.5f);
+
+                ColumnDimensions = new[]
+                {
+                    new Dimension(),
+                    new Dimension(mode: GridSizeMode.Relative, size: 0.4f),
+                    new Dimension(),
+                };
+
+                Content = new[]
+                {
+                    new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = ColourInfo.GradientHorizontal(Color4.Transparent, Color4.White)
+                        },
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = ColourInfo.GradientHorizontal(Color4.White, Color4.Transparent)
+                        },
+                    }
+                };
+            }
+        }
+    }
+}

osu.Game/Graphics/UserInterface/PageTabControl.cs

@@ -63,7 +63,7 @@ namespace osu.Game.Graphics.UserInterface
                         Margin = new MarginPadding { Top = 8, Bottom = 8 },
                         Origin = Anchor.BottomLeft,
                         Anchor = Anchor.BottomLeft,
-                        Text = (value as Enum)?.GetDescription() ?? value.ToString(),
+                        Text = CreateText(),
                         Font = OsuFont.GetFont(size: 14)
                     },
                     box = new Box
@@ -81,6 +81,8 @@ namespace osu.Game.Graphics.UserInterface
                 Active.BindValueChanged(active => Text.Font = Text.Font.With(Typeface.Exo, weight: active.NewValue ? FontWeight.Bold : FontWeight.Medium), true);
             }
 
+            protected virtual string CreateText() => (Value as Enum)?.GetDescription() ?? Value.ToString();
+
             protected override bool OnHover(HoverEvent e)
             {
                 if (!Active.Value)