Merge branch 'master' into ParallaxContainerImprovement

osu.Game/Graphics/Containers/BeatSyncedContainer.cs

@@ -12,7 +12,7 @@ namespace osu.Game.Graphics.Containers
 {
     public class BeatSyncedContainer : Container
     {
-        protected readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
+        protected readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
 
         private int lastBeat;
         private TimingControlPoint lastTimingPoint;
@@ -74,9 +74,9 @@ namespace osu.Game.Graphics.Containers
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase game)
+        private void load(IBindableBeatmap beatmap)
         {
-            Beatmap.BindTo(game.Beatmap);
+            Beatmap.BindTo(beatmap);
         }
 
         protected virtual void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)

osu.Game/Graphics/Containers/LinkFlowContainer.cs

@@ -3,11 +3,11 @@
 
 using osu.Game.Online.Chat;
 using System;
-using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
 using System.Collections.Generic;
+using osu.Framework.Platform;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 
@@ -25,12 +25,14 @@ namespace osu.Game.Graphics.Containers
         private OsuGame game;
 
         private Action showNotImplementedError;
+        private GameHost host;
 
         [BackgroundDependencyLoader(true)]
-        private void load(OsuGame game, NotificationOverlay notifications)
+        private void load(OsuGame game, NotificationOverlay notifications, GameHost host)
         {
             // will be null in tests
             this.game = game;
+            this.host = host;
 
             showNotImplementedError = () => notifications?.Post(new SimpleNotification
             {
@@ -88,7 +90,7 @@ namespace osu.Game.Graphics.Containers
                             showNotImplementedError?.Invoke();
                             break;
                         case LinkAction.External:
-                            Process.Start(url);
+                            host.OpenUrlExternally(url);
                             break;
                         case LinkAction.OpenUserProfile:
                             if (long.TryParse(linkArgument, out long userId))

osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs

@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using OpenTK;
 using osu.Framework.Configuration;
+using osu.Game.Overlays;
 
 namespace osu.Game.Graphics.Containers
 {
@@ -16,13 +17,13 @@ namespace osu.Game.Graphics.Containers
         private SampleChannel samplePopIn;
         private SampleChannel samplePopOut;
 
-        private readonly BindableBool allowOpeningOverlays = new BindableBool(true);
+        protected readonly Bindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.All);
 
         [BackgroundDependencyLoader(true)]
         private void load(OsuGame osuGame, AudioManager audio)
         {
             if (osuGame != null)
-                allowOpeningOverlays.BindTo(osuGame.AllowOpeningOverlays);
+                OverlayActivationMode.BindTo(osuGame.OverlayActivationMode);
 
             samplePopIn = audio.Sample.Get(@"UI/overlay-pop-in");
             samplePopOut = audio.Sample.Get(@"UI/overlay-pop-out");
@@ -32,7 +33,7 @@ namespace osu.Game.Graphics.Containers
 
         /// <summary>
         /// Whether mouse input should be blocked screen-wide while this overlay is visible.
-        /// Performing mouse actions outside of the valid extents will hide the overlay but pass the events through.
+        /// Performing mouse actions outside of the valid extents will hide the overlay.
         /// </summary>
         public virtual bool BlockScreenWideMouse => BlockPassThroughMouse;
 
@@ -52,20 +53,18 @@ namespace osu.Game.Graphics.Containers
 
         private void onStateChanged(Visibility visibility)
         {
-            if (allowOpeningOverlays)
+            switch (visibility)
             {
-                switch (visibility)
-                {
-                    case Visibility.Visible:
+                case Visibility.Visible:
+                    if (OverlayActivationMode != OverlayActivation.Disabled)
                         samplePopIn?.Play();
-                        break;
-                    case Visibility.Hidden:
-                        samplePopOut?.Play();
-                        break;
-                }
+                    else
+                        State = Visibility.Hidden;
+                    break;
+                case Visibility.Hidden:
+                    samplePopOut?.Play();
+                    break;
             }
-            else
-                State = Visibility.Hidden;
         }
     }
 }

osu.Game/Graphics/Cursor/MenuCursorContainer.cs

@@ -12,7 +12,7 @@ namespace osu.Game.Graphics.Cursor
     /// <summary>
     /// A container which provides a <see cref="MenuCursor"/> which can be overridden by hovered <see cref="Drawable"/>s.
     /// </summary>
-    public class CursorOverrideContainer : Container, IProvideCursor
+    public class MenuCursorContainer : Container, IProvideCursor
     {
         protected override Container<Drawable> Content => content;
         private readonly Container content;
@@ -25,7 +25,7 @@ namespace osu.Game.Graphics.Cursor
         public CursorContainer Cursor { get; }
         public bool ProvidingUserCursor => true;
 
-        public CursorOverrideContainer()
+        public MenuCursorContainer()
         {
             AddRangeInternal(new Drawable[]
             {

osu.Game/Graphics/UserInterface/ExternalLinkButton.cs

@@ -0,0 +1,61 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Input;
+using osu.Framework.Platform;
+using OpenTK;
+using OpenTK.Graphics;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public class ExternalLinkButton : CompositeDrawable, IHasTooltip
+    {
+        public string Link { get; set; }
+
+        private Color4 hoverColour;
+        private GameHost host;
+
+        public ExternalLinkButton(string link = null)
+        {
+            Link = link;
+            Size = new Vector2(12);
+            InternalChild = new SpriteIcon
+            {
+                Icon = FontAwesome.fa_external_link,
+                RelativeSizeAxes = Axes.Both
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours, GameHost host)
+        {
+            hoverColour = colours.Yellow;
+            this.host = host;
+        }
+
+        protected override bool OnHover(InputState state)
+        {
+            InternalChild.FadeColour(hoverColour, 500, Easing.OutQuint);
+            return base.OnHover(state);
+        }
+
+        protected override void OnHoverLost(InputState state)
+        {
+            InternalChild.FadeColour(Color4.White, 500, Easing.OutQuint);
+            base.OnHoverLost(state);
+        }
+
+        protected override bool OnClick(InputState state)
+        {
+            if(Link != null)
+                host.OpenUrlExternally(Link);
+            return true;
+        }
+
+        public string TooltipText => "View in browser";
+    }
+}

osu.Game/Graphics/UserInterface/OsuTabControl.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -157,7 +158,7 @@ namespace osu.Game.Graphics.UserInterface
                         Margin = new MarginPadding { Top = 5, Bottom = 5 },
                         Origin = Anchor.BottomLeft,
                         Anchor = Anchor.BottomLeft,
-                        Text = (value as Enum)?.GetDescription() ?? value.ToString(),
+                        Text = (value as IHasDescription)?.Description ?? (value as Enum)?.GetDescription() ?? value.ToString(),
                         TextSize = 14,
                         Font = @"Exo2.0-Bold", // Font should only turn bold when active?
                     },