Merge branch 'master' into mod_content_centering

osu.Android.props

@@ -53,7 +53,7 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1227.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2019.1227.1" />
   </ItemGroup>
 </Project>

osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs

@@ -22,26 +22,15 @@ namespace osu.Game.Rulesets.Mania.UI.Components
 
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
-        private readonly Container hitTargetLine;
+        private readonly Drawable hitTarget;
-        private readonly Drawable hitTargetBar;
 
         public ColumnHitObjectArea(HitObjectContainer hitObjectContainer)
         {
             InternalChildren = new[]
             {
-                hitTargetBar = new Box
+                hitTarget = new DefaultHitTarget
                 {
                     RelativeSizeAxes = Axes.X,
-                    Height = NotePiece.NOTE_HEIGHT,
-                    Alpha = 0.6f,
-                    Colour = Color4.Black
-                },
-                hitTargetLine = new Container
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Height = hit_target_bar_height,
-                    Masking = true,
-                    Child = new Box { RelativeSizeAxes = Axes.Both }
                 },
                 hitObjectContainer
             };
@@ -55,17 +44,10 @@ namespace osu.Game.Rulesets.Mania.UI.Components
             {
                 Anchor anchor = dir.NewValue == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
 
-                hitTargetBar.Anchor = hitTargetBar.Origin = anchor;
+                hitTarget.Anchor = hitTarget.Origin = anchor;
-                hitTargetLine.Anchor = hitTargetLine.Origin = anchor;
             }, true);
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            updateColours();
-        }
-
         private Color4 accentColour;
 
         public Color4 AccentColour
@@ -78,21 +60,86 @@ namespace osu.Game.Rulesets.Mania.UI.Components
 
                 accentColour = value;
 
-                updateColours();
+                if (hitTarget is IHasAccentColour colouredHitTarget)
+                    colouredHitTarget.AccentColour = accentColour;
             }
         }
 
-        private void updateColours()
+        private class DefaultHitTarget : CompositeDrawable, IHasAccentColour
         {
-            if (!IsLoaded)
+            private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
-                return;
 
-            hitTargetLine.EdgeEffect = new EdgeEffectParameters
+            private readonly Container hitTargetLine;
+            private readonly Drawable hitTargetBar;
+
+            public DefaultHitTarget()
             {
-                Type = EdgeEffectType.Glow,
+                InternalChildren = new[]
-                Radius = 5,
+                {
-                Colour = accentColour.Opacity(0.5f),
+                    hitTargetBar = new Box
-            };
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = NotePiece.NOTE_HEIGHT,
+                        Alpha = 0.6f,
+                        Colour = Color4.Black
+                    },
+                    hitTargetLine = new Container
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = hit_target_bar_height,
+                        Masking = true,
+                        Child = new Box { RelativeSizeAxes = Axes.Both }
+                    },
+                };
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(IScrollingInfo scrollingInfo)
+            {
+                direction.BindTo(scrollingInfo.Direction);
+                direction.BindValueChanged(dir =>
+                {
+                    Anchor anchor = dir.NewValue == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
+
+                    hitTargetBar.Anchor = hitTargetBar.Origin = anchor;
+                    hitTargetLine.Anchor = hitTargetLine.Origin = anchor;
+                }, true);
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                updateColours();
+            }
+
+            private Color4 accentColour;
+
+            public Color4 AccentColour
+            {
+                get => accentColour;
+                set
+                {
+                    if (accentColour == value)
+                        return;
+
+                    accentColour = value;
+
+                    updateColours();
+                }
+            }
+
+            private void updateColours()
+            {
+                if (!IsLoaded)
+                    return;
+
+                hitTargetLine.EdgeEffect = new EdgeEffectParameters
+                {
+                    Type = EdgeEffectType.Glow,
+                    Radius = 5,
+                    Colour = accentColour.Opacity(0.5f),
+                };
+            }
         }
     }
 }

osu.Game/Overlays/Direct/DirectPanel.cs

@@ -1,6 +1,7 @@
 // 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 System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -9,21 +10,25 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Direct
 {
-    public abstract class DirectPanel : Container
+    public abstract class DirectPanel : OsuClickableContainer, IHasContextMenu
     {
         public readonly BeatmapSetInfo SetInfo;
 
@@ -32,8 +37,6 @@ namespace osu.Game.Overlays.Direct
 
         private Container content;
 
-        private BeatmapSetOverlay beatmapSetOverlay;
-
         public PreviewTrack Preview => PlayButton.Preview;
         public Bindable<bool> PreviewPlaying => PlayButton?.Playing;
 
@@ -44,6 +47,8 @@ namespace osu.Game.Overlays.Direct
 
         protected override Container<Drawable> Content => content;
 
+        protected Action ViewBeatmap;
+
         protected DirectPanel(BeatmapSetInfo setInfo)
         {
             Debug.Assert(setInfo.OnlineBeatmapSetID != null);
@@ -70,8 +75,6 @@ namespace osu.Game.Overlays.Direct
         [BackgroundDependencyLoader(permitNulls: true)]
         private void load(BeatmapManager beatmaps, OsuColour colours, BeatmapSetOverlay beatmapSetOverlay)
         {
-            this.beatmapSetOverlay = beatmapSetOverlay;
-
             AddInternal(content = new Container
             {
                 RelativeSizeAxes = Axes.Both,
@@ -88,6 +91,12 @@ namespace osu.Game.Overlays.Direct
                     },
                 }
             });
+
+            Action = ViewBeatmap = () =>
+            {
+                Debug.Assert(SetInfo.OnlineBeatmapSetID != null);
+                beatmapSetOverlay?.FetchAndShowBeatmapSet(SetInfo.OnlineBeatmapSetID.Value);
+            };
         }
 
         protected override void Update()
@@ -120,13 +129,6 @@ namespace osu.Game.Overlays.Direct
             base.OnHoverLost(e);
         }
 
-        protected override bool OnClick(ClickEvent e)
-        {
-            Debug.Assert(SetInfo.OnlineBeatmapSetID != null);
-            beatmapSetOverlay?.FetchAndShowBeatmapSet(SetInfo.OnlineBeatmapSetID.Value);
-            return true;
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -203,5 +205,10 @@ namespace osu.Game.Overlays.Direct
                 Value = value;
             }
         }
+
+        public MenuItem[] ContextMenuItems => new MenuItem[]
+        {
+            new OsuMenuItem("View Beatmap", MenuItemType.Highlighted, ViewBeatmap),
+        };
     }
 }

osu.Game/Overlays/SearchableList/SearchableListOverlay.cs

@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Cursor;
 
 namespace osu.Game.Overlays.SearchableList
 {
@@ -61,21 +62,20 @@ namespace osu.Game.Overlays.SearchableList
                 scrollContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Children = new[]
+                    Child = new OsuContextMenuContainer
                     {
-                        new OsuScrollContainer
+                        RelativeSizeAxes = Axes.Both,
+                        Masking = true,
+                        Child = new OsuScrollContainer
                         {
                             RelativeSizeAxes = Axes.Both,
                             ScrollbarVisible = false,
-                            Children = new[]
+                            Child = ScrollFlow = new FillFlowContainer
                             {
-                                ScrollFlow = new FillFlowContainer
+                                RelativeSizeAxes = Axes.X,
-                                {
+                                AutoSizeAxes = Axes.Y,
-                                    RelativeSizeAxes = Axes.X,
+                                Padding = new MarginPadding { Horizontal = WIDTH_PADDING, Bottom = 50 },
-                                    AutoSizeAxes = Axes.Y,
+                                Direction = FillDirection.Vertical,
-                                    Padding = new MarginPadding { Horizontal = WIDTH_PADDING, Bottom = 50 },
-                                    Direction = FillDirection.Vertical,
-                                },
                             },
                         },
                     },

osu.Game/osu.Game.csproj

@@ -22,7 +22,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1227.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2019.1227.1" />
     <PackageReference Include="Sentry" Version="1.2.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />

osu.iOS.props

@@ -73,7 +73,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1227.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.1227.1" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->