Merge branch 'master' into reduce-logovis-allocs

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs

@@ -18,6 +18,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
     {
         private readonly ShakeContainer shakeContainer;
 
+        // Must be set to update IsHovered as it's used in relax mdo to detect osu hit objects.
+        public override bool HandlePositionalInput => true;
+
         protected DrawableOsuHitObject(OsuHitObject hitObject)
             : base(hitObject)
         {

osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs

@@ -9,5 +9,6 @@ namespace osu.Game.Rulesets.Taiko.Mods
     {
         public override string Description => @"Beats fade out before you hit them!";
         public override double ScoreMultiplier => 1.06;
+        public override bool HasImplementation => false;
     }
 }

osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs

@@ -3,19 +3,23 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
+using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
 using osu.Game.Online.Chat;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Chat;
+using osu.Game.Overlays.Chat.Selection;
 using osu.Game.Overlays.Chat.Tabs;
+using osu.Game.Users;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    [Description("Testing chat api and overlay")]
+    public class TestSceneChatOverlay : ManualInputManagerTestScene
-    public class TestSceneChatOverlay : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -28,17 +32,126 @@ namespace osu.Game.Tests.Visual.Online
             typeof(TabCloseButton)
         };
 
-        [Cached]
+        private TestChatOverlay chatOverlay;
-        private readonly ChannelManager channelManager = new ChannelManager();
+        private ChannelManager channelManager;
 
-        [BackgroundDependencyLoader]
+        private readonly Channel channel1 = new Channel(new User()) { Name = "test1" };
-        private void load()
+        private readonly Channel channel2 = new Channel(new User()) { Name = "test2" };
+
+        [SetUp]
+        public void Setup()
         {
-            Children = new Drawable[]
+            Schedule(() =>
             {
-                channelManager,
+                ChannelManagerContainer container;
-                new ChatOverlay { State = { Value = Visibility.Visible } }
+
-            };
+                Child = container = new ChannelManagerContainer(new List<Channel> { channel1, channel2 })
+                {
+                    RelativeSizeAxes = Axes.Both,
+                };
+
+                chatOverlay = container.ChatOverlay;
+                channelManager = container.ChannelManager;
+            });
+        }
+
+        [Test]
+        public void TestHideOverlay()
+        {
+            AddAssert("Chat overlay is visible", () => chatOverlay.State.Value == Visibility.Visible);
+            AddAssert("Selector is visible", () => chatOverlay.SelectionOverlayState == Visibility.Visible);
+
+            AddStep("Close chat overlay", () => chatOverlay.Hide());
+
+            AddAssert("Chat overlay was hidden", () => chatOverlay.State.Value == Visibility.Hidden);
+            AddAssert("Channel selection overlay was hidden", () => chatOverlay.SelectionOverlayState == Visibility.Hidden);
+        }
+
+        [Test]
+        public void TestSelectingChannelClosesSelector()
+        {
+            AddAssert("Selector is visible", () => chatOverlay.SelectionOverlayState == Visibility.Visible);
+
+            AddStep("Join channel 1", () => channelManager.JoinChannel(channel1));
+            AddStep("Switch to channel 1", () => clickDrawable(chatOverlay.TabMap[channel1]));
+
+            AddAssert("Current channel is channel 1", () => channelManager.CurrentChannel.Value == channel1);
+            AddAssert("Channel selector was closed", () => chatOverlay.SelectionOverlayState == Visibility.Hidden);
+        }
+
+        [Test]
+        public void TestCloseChannelWhileSelectorClosed()
+        {
+            AddStep("Join channel 1", () => channelManager.JoinChannel(channel1));
+            AddStep("Join channel 2", () => channelManager.JoinChannel(channel2));
+
+            AddStep("Switch to channel 2", () => clickDrawable(chatOverlay.TabMap[channel2]));
+            AddStep("Close channel 2", () => clickDrawable(((TestChannelTabItem)chatOverlay.TabMap[channel2]).CloseButton.Child));
+
+            AddAssert("Selector remained closed", () => chatOverlay.SelectionOverlayState == Visibility.Hidden);
+            AddAssert("Current channel is channel 1", () => channelManager.CurrentChannel.Value == channel1);
+
+            AddStep("Close channel 1", () => clickDrawable(((TestChannelTabItem)chatOverlay.TabMap[channel1]).CloseButton.Child));
+
+            AddAssert("Selector is visible", () => chatOverlay.SelectionOverlayState == Visibility.Visible);
+        }
+
+        private void clickDrawable(Drawable d)
+        {
+            InputManager.MoveMouseTo(d);
+            InputManager.Click(MouseButton.Left);
+        }
+
+        private class ChannelManagerContainer : Container
+        {
+            public TestChatOverlay ChatOverlay { get; private set; }
+
+            [Cached]
+            public ChannelManager ChannelManager { get; } = new ChannelManager();
+
+            private readonly List<Channel> channels;
+
+            public ChannelManagerContainer(List<Channel> channels)
+            {
+                this.channels = channels;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                ((BindableList<Channel>)ChannelManager.AvailableChannels).AddRange(channels);
+
+                Child = ChatOverlay = new TestChatOverlay { RelativeSizeAxes = Axes.Both, };
+                ChatOverlay.Show();
+            }
+        }
+
+        private class TestChatOverlay : ChatOverlay
+        {
+            public Visibility SelectionOverlayState => ChannelSelectionOverlay.State.Value;
+
+            public new ChannelSelectionOverlay ChannelSelectionOverlay => base.ChannelSelectionOverlay;
+
+            protected override ChannelTabControl CreateChannelTabControl() => new TestTabControl();
+
+            public IReadOnlyDictionary<Channel, TabItem<Channel>> TabMap => ((TestTabControl)ChannelTabControl).TabMap;
+        }
+
+        private class TestTabControl : ChannelTabControl
+        {
+            protected override TabItem<Channel> CreateTabItem(Channel value) => new TestChannelTabItem(value);
+
+            public new IReadOnlyDictionary<Channel, TabItem<Channel>> TabMap => base.TabMap;
+        }
+
+        private class TestChannelTabItem : PrivateChannelTabItem
+        {
+            public TestChannelTabItem(Channel channel)
+                : base(channel)
+            {
+            }
+
+            public new ClickableContainer CloseButton => base.CloseButton;
         }
     }
 }

osu.Game/OsuGameBase.cs

@@ -154,6 +154,7 @@ namespace osu.Game
 
             Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Venera"));
             Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Venera-Light"));
+            Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Venera-Medium"));
 
             runMigrations();
 

osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs

@@ -32,6 +32,8 @@ namespace osu.Game.Overlays.Chat.Selection
         private readonly SearchTextBox search;
         private readonly SearchContainer<ChannelSection> sectionsFlow;
 
+        protected override bool DimMainContent => false;
+
         public Action<Channel> OnRequestJoin;
         public Action<Channel> OnRequestLeave;
 

osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs

@@ -49,6 +49,8 @@ namespace osu.Game.Overlays.Chat.Tabs
                 // performTabSort might've made selectorTab's position wonky, fix it
                 TabContainer.SetLayoutPosition(selectorTab, float.MaxValue);
 
+            ((ChannelTabItem)item).OnRequestClose += tabCloseRequested;
+
             base.AddTabItem(item, addToDropdown);
         }
 
@@ -57,10 +59,10 @@ namespace osu.Game.Overlays.Chat.Tabs
             switch (value.Type)
             {
                 default:
-                    return new ChannelTabItem(value) { OnRequestClose = tabCloseRequested };
+                    return new ChannelTabItem(value);
 
                 case ChannelType.PM:
-                    return new PrivateChannelTabItem(value) { OnRequestClose = tabCloseRequested };
+                    return new PrivateChannelTabItem(value);
             }
         }
 

osu.Game/Overlays/ChatOverlay.cs

@@ -45,7 +45,9 @@ namespace osu.Game.Overlays
 
         public const float TAB_AREA_HEIGHT = 50;
 
-        private ChannelTabControl channelTabControl;
+        protected ChannelTabControl ChannelTabControl;
+
+        protected virtual ChannelTabControl CreateChannelTabControl() => new ChannelTabControl();
 
         private Container chatContainer;
         private TabsArea tabsArea;
@@ -55,9 +57,10 @@ namespace osu.Game.Overlays
         public Bindable<double> ChatHeight { get; set; }
 
         private Container channelSelectionContainer;
-        private ChannelSelectionOverlay channelSelectionOverlay;
+        protected ChannelSelectionOverlay ChannelSelectionOverlay;
 
-        public override bool Contains(Vector2 screenSpacePos) => chatContainer.ReceivePositionalInputAt(screenSpacePos) || (channelSelectionOverlay.State.Value == Visibility.Visible && channelSelectionOverlay.ReceivePositionalInputAt(screenSpacePos));
+        public override bool Contains(Vector2 screenSpacePos) => chatContainer.ReceivePositionalInputAt(screenSpacePos)
+                                                                 || (ChannelSelectionOverlay.State.Value == Visibility.Visible && ChannelSelectionOverlay.ReceivePositionalInputAt(screenSpacePos));
 
         public ChatOverlay()
         {
@@ -81,7 +84,7 @@ namespace osu.Game.Overlays
                     Masking = true,
                     Children = new[]
                     {
-                        channelSelectionOverlay = new ChannelSelectionOverlay
+                        ChannelSelectionOverlay = new ChannelSelectionOverlay
                         {
                             RelativeSizeAxes = Axes.Both,
                         },
@@ -154,31 +157,25 @@ namespace osu.Game.Overlays
                                     RelativeSizeAxes = Axes.Both,
                                     Colour = Color4.Black,
                                 },
-                                channelTabControl = new ChannelTabControl
+                                ChannelTabControl = CreateChannelTabControl().With(d =>
                                 {
-                                    Anchor = Anchor.BottomLeft,
+                                    d.Anchor = Anchor.BottomLeft;
-                                    Origin = Anchor.BottomLeft,
+                                    d.Origin = Anchor.BottomLeft;
-                                    RelativeSizeAxes = Axes.Both,
+                                    d.RelativeSizeAxes = Axes.Both;
-                                    OnRequestLeave = channelManager.LeaveChannel
+                                    d.OnRequestLeave = channelManager.LeaveChannel;
-                                },
+                                }),
                             }
                         },
                     },
                 },
             };
 
-            channelTabControl.Current.ValueChanged += current => channelManager.CurrentChannel.Value = current.NewValue;
+            ChannelTabControl.Current.ValueChanged += current => channelManager.CurrentChannel.Value = current.NewValue;
-            channelTabControl.ChannelSelectorActive.ValueChanged += active => channelSelectionOverlay.State.Value = active.NewValue ? Visibility.Visible : Visibility.Hidden;
+            ChannelTabControl.ChannelSelectorActive.ValueChanged += active => ChannelSelectionOverlay.State.Value = active.NewValue ? Visibility.Visible : Visibility.Hidden;
-            channelSelectionOverlay.State.ValueChanged += state =>
+            ChannelSelectionOverlay.State.ValueChanged += state =>
             {
-                if (state.NewValue == Visibility.Hidden && channelManager.JoinedChannels.Count == 0)
+                // Propagate the visibility state to ChannelSelectorActive
-                {
+                ChannelTabControl.ChannelSelectorActive.Value = state.NewValue == Visibility.Visible;
-                    channelSelectionOverlay.Show();
-                    Hide();
-                    return;
-                }
-
-                channelTabControl.ChannelSelectorActive.Value = state.NewValue == Visibility.Visible;
 
                 if (state.NewValue == Visibility.Visible)
                 {
@@ -190,8 +187,8 @@ namespace osu.Game.Overlays
                     textbox.HoldFocus = true;
             };
 
-            channelSelectionOverlay.OnRequestJoin = channel => channelManager.JoinChannel(channel);
+            ChannelSelectionOverlay.OnRequestJoin = channel => channelManager.JoinChannel(channel);
-            channelSelectionOverlay.OnRequestLeave = channelManager.LeaveChannel;
+            ChannelSelectionOverlay.OnRequestLeave = channelManager.LeaveChannel;
 
             ChatHeight = config.GetBindable<double>(OsuSetting.ChatDisplayHeight);
             ChatHeight.ValueChanged += height =>
@@ -217,11 +214,11 @@ namespace osu.Game.Overlays
                 channelManager.JoinedChannels.ItemsAdded += onChannelAddedToJoinedChannels;
                 channelManager.JoinedChannels.ItemsRemoved += onChannelRemovedFromJoinedChannels;
                 foreach (Channel channel in channelManager.JoinedChannels)
-                    channelTabControl.AddChannel(channel);
+                    ChannelTabControl.AddChannel(channel);
 
                 channelManager.AvailableChannels.ItemsAdded += availableChannelsChanged;
                 channelManager.AvailableChannels.ItemsRemoved += availableChannelsChanged;
-                channelSelectionOverlay.UpdateAvailableChannels(channelManager.AvailableChannels);
+                ChannelSelectionOverlay.UpdateAvailableChannels(channelManager.AvailableChannels);
 
                 currentChannel = channelManager.CurrentChannel.GetBoundCopy();
                 currentChannel.BindValueChanged(currentChannelChanged, true);
@@ -236,7 +233,7 @@ namespace osu.Game.Overlays
             {
                 textbox.Current.Disabled = true;
                 currentChannelContainer.Clear(false);
-                channelSelectionOverlay.Show();
+                ChannelSelectionOverlay.Show();
                 return;
             }
 
@@ -245,8 +242,8 @@ namespace osu.Game.Overlays
 
             textbox.Current.Disabled = e.NewValue.ReadOnly;
 
-            if (channelTabControl.Current.Value != e.NewValue)
+            if (ChannelTabControl.Current.Value != e.NewValue)
-                Scheduler.Add(() => channelTabControl.Current.Value = e.NewValue);
+                Scheduler.Add(() => ChannelTabControl.Current.Value = e.NewValue);
 
             var loaded = loadedChannels.Find(d => d.Channel == e.NewValue);
 
@@ -294,7 +291,7 @@ namespace osu.Game.Overlays
                 double targetChatHeight = startDragChatHeight - (e.MousePosition.Y - e.MouseDownPosition.Y) / Parent.DrawSize.Y;
 
                 // If the channel selection screen is shown, mind its minimum height
-                if (channelSelectionOverlay.State.Value == Visibility.Visible && targetChatHeight > 1f - channel_selection_min_height)
+                if (ChannelSelectionOverlay.State.Value == Visibility.Visible && targetChatHeight > 1f - channel_selection_min_height)
                     targetChatHeight = 1f - channel_selection_min_height;
 
                 ChatHeight.Value = targetChatHeight;
@@ -311,9 +308,9 @@ namespace osu.Game.Overlays
 
         private void selectTab(int index)
         {
-            var channel = channelTabControl.Items.Skip(index).FirstOrDefault();
+            var channel = ChannelTabControl.Items.Skip(index).FirstOrDefault();
             if (channel != null && !(channel is ChannelSelectorTabItem.ChannelSelectorTabChannel))
-                channelTabControl.Current.Value = channel;
+                ChannelTabControl.Current.Value = channel;
         }
 
         protected override bool OnKeyDown(KeyDownEvent e)
@@ -358,6 +355,7 @@ namespace osu.Game.Overlays
             this.FadeIn(transition_length, Easing.OutQuint);
 
             textbox.HoldFocus = true;
+
             base.PopIn();
         }
 
@@ -366,7 +364,7 @@ namespace osu.Game.Overlays
             this.MoveToY(Height, transition_length, Easing.InSine);
             this.FadeOut(transition_length, Easing.InSine);
 
-            channelSelectionOverlay.Hide();
+            ChannelSelectionOverlay.Hide();
 
             textbox.HoldFocus = false;
             base.PopOut();
@@ -375,20 +373,20 @@ namespace osu.Game.Overlays
         private void onChannelAddedToJoinedChannels(IEnumerable<Channel> channels)
         {
             foreach (Channel channel in channels)
-                channelTabControl.AddChannel(channel);
+                ChannelTabControl.AddChannel(channel);
         }
 
         private void onChannelRemovedFromJoinedChannels(IEnumerable<Channel> channels)
         {
             foreach (Channel channel in channels)
             {
-                channelTabControl.RemoveChannel(channel);
+                ChannelTabControl.RemoveChannel(channel);
                 loadedChannels.Remove(loadedChannels.Find(c => c.Channel == channel));
             }
         }
 
         private void availableChannelsChanged(IEnumerable<Channel> channels)
-            => channelSelectionOverlay.UpdateAvailableChannels(channelManager.AvailableChannels);
+            => ChannelSelectionOverlay.UpdateAvailableChannels(channelManager.AvailableChannels);
 
         protected override void Dispose(bool isDisposing)
         {

osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs

@@ -18,7 +18,7 @@ namespace osu.Game.Screens.Backgrounds
         private Background background;
 
         private int currentDisplay;
-        private const int background_count = 5;
+        private const int background_count = 7;
 
         private string backgroundName => $@"Menu/menu-background-{currentDisplay % background_count + 1}";
 

osu.Game/Screens/Select/BeatmapCarousel.cs

@@ -11,7 +11,6 @@ using osu.Game.Configuration;
 using osuTK.Input;
 using osu.Framework.MathUtils;
 using System.Diagnostics;
-using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Caching;
@@ -64,35 +63,29 @@ namespace osu.Game.Screens.Select
         public IEnumerable<BeatmapSetInfo> BeatmapSets
         {
             get => beatmapSets.Select(g => g.BeatmapSet);
-            set => loadBeatmapSets(() => value);
+            set => loadBeatmapSets(value);
         }
 
-        public void LoadBeatmapSetsFromManager(BeatmapManager manager) => loadBeatmapSets(manager.GetAllUsableBeatmapSetsEnumerable);
+        private void loadBeatmapSets(IEnumerable<BeatmapSetInfo> beatmapSets)
-
-        private void loadBeatmapSets(Func<IEnumerable<BeatmapSetInfo>> beatmapSets)
         {
             CarouselRoot newRoot = new CarouselRoot(this);
 
-            Task.Run(() =>
+            beatmapSets.Select(createCarouselSet).Where(g => g != null).ForEach(newRoot.AddChild);
-            {
+            newRoot.Filter(activeCriteria);
-                beatmapSets().Select(createCarouselSet).Where(g => g != null).ForEach(newRoot.AddChild);
-                newRoot.Filter(activeCriteria);
 
-                // preload drawables as the ctor overhead is quite high currently.
+            // preload drawables as the ctor overhead is quite high currently.
-                var _ = newRoot.Drawables;
+            var _ = newRoot.Drawables;
-            }).ContinueWith(_ => Schedule(() =>
-            {
-                root = newRoot;
-                scrollableContent.Clear(false);
-                itemsCache.Invalidate();
-                scrollPositionCache.Invalidate();
 
-                Schedule(() =>
+            root = newRoot;
-                {
+            scrollableContent.Clear(false);
-                    BeatmapSetsChanged?.Invoke();
+            itemsCache.Invalidate();
-                    BeatmapSetsLoaded = true;
+            scrollPositionCache.Invalidate();
-                });
+
-            }));
+            Schedule(() =>
+            {
+                BeatmapSetsChanged?.Invoke();
+                BeatmapSetsLoaded = true;
+            });
         }
 
         private readonly List<float> yPositions = new List<float>();
@@ -125,13 +118,15 @@ namespace osu.Game.Screens.Select
         }
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(OsuConfigManager config)
+        private void load(OsuConfigManager config, BeatmapManager beatmaps)
         {
             config.BindWith(OsuSetting.RandomSelectAlgorithm, RandomAlgorithm);
             config.BindWith(OsuSetting.SongSelectRightMouseScroll, RightClickScrollingEnabled);
 
             RightClickScrollingEnabled.ValueChanged += enabled => RightMouseScrollbar = enabled.NewValue;
             RightClickScrollingEnabled.TriggerChange();
+
+            loadBeatmapSets(beatmaps.GetAllUsableBeatmapSetsEnumerable());
         }
 
         public void RemoveBeatmapSet(BeatmapSetInfo beatmapSet)

osu.Game/Screens/Select/SongSelect.cs

@@ -244,8 +244,6 @@ namespace osu.Game.Screens.Select
             sampleChangeBeatmap = audio.Samples.Get(@"SongSelect/select-expand");
             SampleConfirm = audio.Samples.Get(@"SongSelect/confirm-selection");
 
-            Carousel.LoadBeatmapSetsFromManager(this.beatmaps);
-
             if (dialogOverlay != null)
             {
                 Schedule(() =>

osu.Game/Skinning/LegacySkin.cs

@@ -81,7 +81,10 @@ namespace osu.Game.Skinning
                         };
             }
 
-            var texture = GetTexture(componentName);
+            // temporary allowance is given for skins the fact that stable handles non-animatable items such as hitcircles (incorrectly)
+            // by (incorrectly) displaying the first frame of animation rather than the non-animated version.
+            // users have used this to "hide" certain elements like hit300.
+            var texture = GetTexture($"{componentName}-0") ?? GetTexture(componentName);
 
             if (texture == null)
                 return null;

osu.Game/osu.Game.csproj

@@ -14,8 +14,8 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.4" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2019.627.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2019.702.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2019.628.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.702.0" />
     <PackageReference Include="SharpCompress" Version="0.23.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

osu.iOS.props

@@ -104,9 +104,9 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2019.627.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2019.702.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2019.628.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.702.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.628.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.702.0" />
     <PackageReference Include="SharpCompress" Version="0.22.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />