Merge branch 'master' into online-overlay-login-placeholder

osu.Game/Collections/CollectionManager.cs

@@ -139,22 +139,19 @@ namespace osu.Game.Collections
             PostNotification?.Invoke(notification);
 
             var collection = readCollections(stream, notification);
-            bool importCompleted = false;
+            await importCollections(collection);
-
-            Schedule(() =>
-            {
-                importCollections(collection);
-                importCompleted = true;
-            });
-
-            while (!IsDisposed && !importCompleted)
-                await Task.Delay(10);
 
             notification.CompletionText = $"Imported {collection.Count} collections";
             notification.State = ProgressNotificationState.Completed;
         }
 
-        private void importCollections(List<BeatmapCollection> newCollections)
+        private Task importCollections(List<BeatmapCollection> newCollections)
+        {
+            var tcs = new TaskCompletionSource<bool>();
+
+            Schedule(() =>
+            {
+                try
                 {
                     foreach (var newCol in newCollections)
                     {
@@ -168,6 +165,17 @@ namespace osu.Game.Collections
                                 existing.Beatmaps.Add(newBeatmap);
                         }
                     }
+
+                    tcs.SetResult(true);
+                }
+                catch (Exception e)
+                {
+                    Logger.Error(e, "Failed to import collection.");
+                    tcs.SetException(e);
+                }
+            });
+
+            return tcs.Task;
         }
 
         private List<BeatmapCollection> readCollections(Stream stream, ProgressNotification notification = null)

osu.Game/Overlays/ChatOverlay.cs

@@ -24,6 +24,7 @@ using osu.Game.Overlays.Chat.Tabs;
 using osuTK.Input;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Game.Online;
 
 namespace osu.Game.Overlays
 {
@@ -118,6 +119,11 @@ namespace osu.Game.Overlays
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                 },
+                                new OnlineViewContainer("Sign in to chat")
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Children = new Drawable[]
+                                    {
                                         currentChannelContainer = new Container<DrawableChannel>
                                         {
                                             RelativeSizeAxes = Axes.Both,
@@ -152,6 +158,8 @@ namespace osu.Game.Overlays
                                             }
                                         },
                                         loading = new LoadingSpinner(),
+                                    },
+                                }
                             }
                         },
                         tabsArea = new TabsArea

osu.Game/Screens/Select/Carousel/CarouselHeader.cs

@@ -25,8 +25,13 @@ namespace osu.Game.Screens.Select.Carousel
 
         public readonly Bindable<CarouselItemState> State = new Bindable<CarouselItemState>(CarouselItemState.NotSelected);
 
+        private readonly HoverLayer hoverLayer;
+
         protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
 
+        private const float corner_radius = 10;
+        private const float border_thickness = 2.5f;
+
         public CarouselHeader()
         {
             RelativeSizeAxes = Axes.X;
@@ -36,12 +41,12 @@ namespace osu.Game.Screens.Select.Carousel
             {
                 RelativeSizeAxes = Axes.Both,
                 Masking = true,
-                CornerRadius = 10,
+                CornerRadius = corner_radius,
                 BorderColour = new Color4(221, 255, 255, 255),
                 Children = new Drawable[]
                 {
                     Content,
-                    new HoverLayer()
+                    hoverLayer = new HoverLayer()
                 }
             };
         }
@@ -59,6 +64,8 @@ namespace osu.Game.Screens.Select.Carousel
             {
                 case CarouselItemState.Collapsed:
                 case CarouselItemState.NotSelected:
+                    hoverLayer.InsetForBorder = false;
+
                     BorderContainer.BorderThickness = 0;
                     BorderContainer.EdgeEffect = new EdgeEffectParameters
                     {
@@ -70,7 +77,9 @@ namespace osu.Game.Screens.Select.Carousel
                     break;
 
                 case CarouselItemState.Selected:
-                    BorderContainer.BorderThickness = 2.5f;
+                    hoverLayer.InsetForBorder = true;
+
+                    BorderContainer.BorderThickness = border_thickness;
                     BorderContainer.EdgeEffect = new EdgeEffectParameters
                     {
                         Type = EdgeEffectType.Glow,
@@ -107,6 +116,26 @@ namespace osu.Game.Screens.Select.Carousel
                 sampleHover = audio.Samples.Get("SongSelect/song-ping");
             }
 
+            public bool InsetForBorder
+            {
+                set
+                {
+                    if (value)
+                    {
+                        // apply same border as above to avoid applying additive overlay to it (and blowing out the colour).
+                        Masking = true;
+                        CornerRadius = corner_radius;
+                        BorderThickness = border_thickness;
+                    }
+                    else
+                    {
+                        BorderThickness = 0;
+                        CornerRadius = 0;
+                        Masking = false;
+                    }
+                }
+            }
+
             protected override bool OnHover(HoverEvent e)
             {
                 box.FadeIn(100, Easing.OutQuint);