Resolve merge conflicts

osu.Game/Overlays/Chat/ChatLine.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System;
 using System.Linq;
 using OpenTK;
 using OpenTK.Graphics;
@@ -81,6 +82,8 @@ namespace osu.Game.Overlays.Chat
             Padding = new MarginPadding { Left = padding, Right = padding };
         }
 
+        private ChannelManager chatManager;
+
         private Message message;
         private OsuSpriteText username;
         private LinkFlowContainer contentFlow;
@@ -104,9 +107,9 @@ namespace osu.Game.Overlays.Chat
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(OsuColour colours, ChatOverlay chat)
+        private void load(OsuColour colours, ChannelManager chatManager)
         {
-            this.chat = chat;
+            this.chatManager = chatManager;
             customUsernameColour = colours.ChatBlue;
         }
 
@@ -215,8 +218,6 @@ namespace osu.Game.Overlays.Chat
             FinishTransforms(true);
         }
 
-        private ChatOverlay chat;
-
         private void updateMessageContent()
         {
             this.FadeTo(message is LocalEchoMessage ? 0.4f : 1.0f, 500, Easing.OutQuint);
@@ -226,7 +227,7 @@ namespace osu.Game.Overlays.Chat
             username.Text = $@"{message.Sender.Username}" + (senderHasBackground || message.IsAction ? "" : ":");
 
             // remove non-existent channels from the link list
-            message.Links.RemoveAll(link => link.Action == LinkAction.OpenChannel && chat?.AvailableChannels.Any(c => c.Name == link.Argument) != true);
+            message.Links.RemoveAll(link => link.Action == LinkAction.OpenChannel && chatManager?.AvailableChannels.Any(c => c.Name == link.Argument) != true);
 
             contentFlow.Clear();
             contentFlow.AddLinks(message.DisplayContent, message.Links);
@@ -236,20 +237,24 @@ namespace osu.Game.Overlays.Chat
         {
             private readonly User sender;
 
+            private Action startChatAction;
+
             public MessageSender(User sender)
             {
                 this.sender = sender;
             }
 
             [BackgroundDependencyLoader(true)]
-            private void load(UserProfileOverlay profile)
+            private void load(UserProfileOverlay profile, ChannelManager chatManager)
             {
                 Action = () => profile?.ShowUser(sender);
+                startChatAction = () => chatManager?.OpenPrivateChannel(sender);
             }
 
             public MenuItem[] ContextMenuItems => new MenuItem[]
             {
                 new OsuMenuItem("View Profile", MenuItemType.Highlighted, Action),
+                new OsuMenuItem("Start Chat", MenuItemType.Standard, startChatAction),
             };
         }
     }

osu.Game/Overlays/Chat/DrawableChannel.cs

@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using OpenTK.Graphics;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Containers;
@@ -55,15 +54,11 @@ namespace osu.Game.Overlays.Chat
             Channel.PendingMessageResolved += pendingMessageResolved;
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            newMessagesArrived(Channel.Messages);
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
+
+            newMessagesArrived(Channel.Messages);
             scrollToEnd();
         }
 
@@ -79,7 +74,7 @@ namespace osu.Game.Overlays.Chat
         private void newMessagesArrived(IEnumerable<Message> newMessages)
         {
             // Add up to last Channel.MAX_HISTORY messages
-            var displayMessages = newMessages.Skip(Math.Max(0, newMessages.Count() - Channel.MAX_HISTORY));
+            var displayMessages = newMessages.Skip(Math.Max(0, newMessages.Count() - Channel.MaxHistory));
 
             flow.AddRange(displayMessages.Select(m => new ChatLine(m)));
 
@@ -89,7 +84,7 @@ namespace osu.Game.Overlays.Chat
                 scrollToEnd();
 
             var staleMessages = flow.Children.Where(c => c.LifetimeEnd == double.MaxValue).ToArray();
-            int count = staleMessages.Length - Channel.MAX_HISTORY;
+            int count = staleMessages.Length - Channel.MaxHistory;
 
             for (int i = 0; i < count; i++)
             {

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

@@ -15,7 +15,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Chat;
 using osu.Game.Graphics.Containers;
 
-namespace osu.Game.Overlays.Chat
+namespace osu.Game.Overlays.Chat.Selection
 {
     public class ChannelListItem : OsuClickableContainer, IFilterable
     {

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

@@ -9,7 +9,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Chat;
 
-namespace osu.Game.Overlays.Chat
+namespace osu.Game.Overlays.Chat.Selection
 {
     public class ChannelSection : Container, IHasFilterableChildren
     {

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

@@ -18,7 +18,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Chat;
 using osu.Game.Graphics.Containers;
 
-namespace osu.Game.Overlays.Chat
+namespace osu.Game.Overlays.Chat.Selection
 {
     public class ChannelSelectionOverlay : OsuFocusedOverlayContainer
     {
@@ -35,23 +35,6 @@ namespace osu.Game.Overlays.Chat
         public Action<Channel> OnRequestJoin;
         public Action<Channel> OnRequestLeave;
 
-        public IEnumerable<ChannelSection> Sections
-        {
-            set
-            {
-                sectionsFlow.ChildrenEnumerable = value;
-
-                foreach (ChannelSection s in sectionsFlow.Children)
-                {
-                    foreach (ChannelListItem c in s.ChannelFlow.Children)
-                    {
-                        c.OnRequestJoin = channel => { OnRequestJoin?.Invoke(channel); };
-                        c.OnRequestLeave = channel => { OnRequestLeave?.Invoke(channel); };
-                    }
-                }
-            }
-        }
-
         public ChannelSelectionOverlay()
         {
             RelativeSizeAxes = Axes.X;
@@ -140,6 +123,30 @@ namespace osu.Game.Overlays.Chat
             search.Current.ValueChanged += newValue => sectionsFlow.SearchTerm = newValue;
         }
 
+        public void UpdateAvailableChannels(IEnumerable<Channel> channels)
+        {
+            Scheduler.Add(() =>
+            {
+                sectionsFlow.ChildrenEnumerable = new[]
+                {
+                    new ChannelSection
+                    {
+                        Header = "All Channels",
+                        Channels = channels,
+                    },
+                };
+
+                foreach (ChannelSection s in sectionsFlow.Children)
+                {
+                    foreach (ChannelListItem c in s.ChannelFlow.Children)
+                    {
+                        c.OnRequestJoin = channel => { OnRequestJoin?.Invoke(channel); };
+                        c.OnRequestLeave = channel => { OnRequestLeave?.Invoke(channel); };
+                    }
+                }
+            });
+        }
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {

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

@@ -0,0 +1,32 @@
+// 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.Game.Graphics;
+using osu.Game.Online.Chat;
+
+namespace osu.Game.Overlays.Chat.Tabs
+{
+    public class ChannelSelectorTabItem : ChannelTabItem
+    {
+        public override bool IsRemovable => false;
+
+        public ChannelSelectorTabItem(Channel value) : base(value)
+        {
+            Depth = float.MaxValue;
+            Width = 45;
+
+            Icon.Alpha = 0;
+
+            Text.TextSize = 45;
+            TextBold.TextSize = 45;
+        }
+
+        [BackgroundDependencyLoader]
+        private new void load(OsuColour colour)
+        {
+            BackgroundInactive = colour.Gray2;
+            BackgroundActive = colour.Gray3;
+        }
+    }
+}

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

@@ -0,0 +1,123 @@
+// 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.Graphics;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.Chat;
+using OpenTK;
+using osu.Framework.Configuration;
+using System;
+using System.Linq;
+
+namespace osu.Game.Overlays.Chat.Tabs
+{
+    public class ChannelTabControl : OsuTabControl<Channel>
+    {
+        public static readonly float SHEAR_WIDTH = 10;
+
+        public Action<Channel> OnRequestLeave;
+
+        public readonly Bindable<bool> ChannelSelectorActive = new Bindable<bool>();
+
+        private readonly ChannelSelectorTabItem selectorTab;
+
+        public ChannelTabControl()
+        {
+            TabContainer.Margin = new MarginPadding { Left = 50 };
+            TabContainer.Spacing = new Vector2(-SHEAR_WIDTH, 0);
+            TabContainer.Masking = false;
+
+            AddInternal(new SpriteIcon
+            {
+                Icon = FontAwesome.fa_comments,
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+                Size = new Vector2(20),
+                Margin = new MarginPadding(10),
+            });
+
+            AddTabItem(selectorTab = new ChannelSelectorTabItem(new Channel { Name = "+" }));
+
+            ChannelSelectorActive.BindTo(selectorTab.Active);
+        }
+
+        protected override void AddTabItem(TabItem<Channel> item, bool addToDropdown = true)
+        {
+            if (item != selectorTab && TabContainer.GetLayoutPosition(selectorTab) < float.MaxValue)
+                // performTabSort might've made selectorTab's position wonky, fix it
+                TabContainer.SetLayoutPosition(selectorTab, float.MaxValue);
+
+            base.AddTabItem(item, addToDropdown);
+        }
+
+        protected override TabItem<Channel> CreateTabItem(Channel value)
+        {
+            switch (value.Type)
+            {
+                case ChannelType.Public:
+                    return new ChannelTabItem(value) { OnRequestClose = tabCloseRequested };
+                case ChannelType.PM:
+                    return new PrivateChannelTabItem(value) { OnRequestClose = tabCloseRequested };
+                default:
+                    throw new InvalidOperationException("Only TargetType User and Channel are supported.");
+            }
+        }
+
+        /// <summary>
+        /// Adds a channel to the ChannelTabControl.
+        /// The first channel added will automaticly selected.
+        /// </summary>
+        /// <param name="channel">The channel that is going to be added.</param>
+        public void AddChannel(Channel channel)
+        {
+            if (!Items.Contains(channel))
+                AddItem(channel);
+
+            if (Current.Value == null)
+                Current.Value = channel;
+        }
+
+        /// <summary>
+        /// Removes a channel from the ChannelTabControl.
+        /// If the selected channel is the one that is beeing removed, the next available channel will be selected.
+        /// </summary>
+        /// <param name="channel">The channel that is going to be removed.</param>
+        public void RemoveChannel(Channel channel)
+        {
+            RemoveItem(channel);
+
+            if (Current.Value == channel)
+                Current.Value = Items.FirstOrDefault();
+        }
+
+        protected override void SelectTab(TabItem<Channel> tab)
+        {
+            if (tab is ChannelSelectorTabItem)
+            {
+                tab.Active.Toggle();
+                return;
+            }
+
+            selectorTab.Active.Value = false;
+
+            base.SelectTab(tab);
+        }
+
+        private void tabCloseRequested(TabItem<Channel> tab)
+        {
+            int totalTabs = TabContainer.Count - 1; // account for selectorTab
+            int currentIndex = MathHelper.Clamp(TabContainer.IndexOf(tab), 1, totalTabs);
+
+            if (tab == SelectedTab && totalTabs > 1)
+                // Select the tab after tab-to-be-removed's index, or the tab before if current == last
+                SelectTab(TabContainer[currentIndex == totalTabs ? currentIndex - 1 : currentIndex + 1]);
+            else if (totalTabs == 1 && !selectorTab.Active)
+                // Open channel selection overlay if all channel tabs will be closed after removing this tab
+                SelectTab(selectorTab);
+
+            OnRequestLeave?.Invoke(tab.Value);
+        }
+    }
+}

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

@@ -0,0 +1,212 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Online.Chat;
+using OpenTK;
+using OpenTK.Graphics;
+
+namespace osu.Game.Overlays.Chat.Tabs
+{
+    public class ChannelTabItem : TabItem<Channel>
+    {
+        protected Color4 BackgroundInactive;
+        private Color4 backgroundHover;
+        protected Color4 BackgroundActive;
+
+        public override bool IsRemovable => !Pinned;
+
+        protected readonly SpriteText Text;
+        protected readonly SpriteText TextBold;
+        protected readonly ClickableContainer CloseButton;
+        private readonly Box box;
+        private readonly Box highlightBox;
+        protected readonly SpriteIcon Icon;
+
+        public Action<ChannelTabItem> OnRequestClose;
+        private readonly Container content;
+
+        protected override Container<Drawable> Content => content;
+
+        public ChannelTabItem(Channel value)
+            : base(value)
+        {
+            Width = 150;
+
+            RelativeSizeAxes = Axes.Y;
+
+            Anchor = Anchor.BottomLeft;
+            Origin = Anchor.BottomLeft;
+
+            Shear = new Vector2(ChannelTabControl.SHEAR_WIDTH / ChatOverlay.TAB_AREA_HEIGHT, 0);
+
+            Masking = true;
+
+            InternalChildren = new Drawable[]
+            {
+                box = new Box
+                {
+                    EdgeSmoothness = new Vector2(1, 0),
+                    RelativeSizeAxes = Axes.Both,
+                },
+                highlightBox = new Box
+                {
+                    Width = 5,
+                    Alpha = 0,
+                    Anchor = Anchor.BottomRight,
+                    Origin = Anchor.BottomRight,
+                    EdgeSmoothness = new Vector2(1, 0),
+                    RelativeSizeAxes = Axes.Y,
+                },
+                content = new Container
+                {
+                    Shear = new Vector2(-ChannelTabControl.SHEAR_WIDTH / ChatOverlay.TAB_AREA_HEIGHT, 0),
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        Icon = new SpriteIcon
+                        {
+                            Icon = DisplayIcon,
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Colour = Color4.Black,
+                            X = -10,
+                            Alpha = 0.2f,
+                            Size = new Vector2(ChatOverlay.TAB_AREA_HEIGHT),
+                        },
+                        Text = new OsuSpriteText
+                        {
+                            Margin = new MarginPadding(5),
+                            Origin = Anchor.CentreLeft,
+                            Anchor = Anchor.CentreLeft,
+                            Text = value.ToString(),
+                            TextSize = 18,
+                        },
+                        TextBold = new OsuSpriteText
+                        {
+                            Alpha = 0,
+                            Margin = new MarginPadding(5),
+                            Origin = Anchor.CentreLeft,
+                            Anchor = Anchor.CentreLeft,
+                            Text = value.ToString(),
+                            Font = @"Exo2.0-Bold",
+                            TextSize = 18,
+                        },
+                        CloseButton = new TabCloseButton
+                        {
+                            Alpha = 0,
+                            Margin = new MarginPadding { Right = 20 },
+                            Origin = Anchor.CentreRight,
+                            Anchor = Anchor.CentreRight,
+                            Action = delegate
+                            {
+                                if (IsRemovable) OnRequestClose?.Invoke(this);
+                            },
+                        },
+                    },
+                },
+            };
+        }
+
+        protected virtual FontAwesome DisplayIcon => FontAwesome.fa_hashtag;
+
+        protected virtual bool ShowCloseOnHover => true;
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            if (IsRemovable && ShowCloseOnHover)
+                CloseButton.FadeIn(200, Easing.OutQuint);
+
+            if (!Active)
+                box.FadeColour(backgroundHover, TRANSITION_LENGTH, Easing.OutQuint);
+            return true;
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            CloseButton.FadeOut(200, Easing.OutQuint);
+            updateState();
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            BackgroundActive = colours.ChatBlue;
+            BackgroundInactive = colours.Gray4;
+            backgroundHover = colours.Gray7;
+
+            highlightBox.Colour = colours.Yellow;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            updateState();
+            FinishTransforms(true);
+        }
+
+        private void updateState()
+        {
+            if (Active)
+                FadeActive();
+            else
+                FadeInactive();
+        }
+
+        protected const float TRANSITION_LENGTH = 400;
+
+        private readonly EdgeEffectParameters activateEdgeEffect = new EdgeEffectParameters
+        {
+            Type = EdgeEffectType.Shadow,
+            Radius = 15,
+            Colour = Color4.Black.Opacity(0.4f),
+        };
+
+        private readonly EdgeEffectParameters deactivateEdgeEffect = new EdgeEffectParameters
+        {
+            Type = EdgeEffectType.Shadow,
+            Radius = 10,
+            Colour = Color4.Black.Opacity(0.2f),
+        };
+
+        protected virtual void FadeActive()
+        {
+            this.ResizeHeightTo(1.1f, TRANSITION_LENGTH, Easing.OutQuint);
+
+            TweenEdgeEffectTo(activateEdgeEffect, TRANSITION_LENGTH);
+
+            box.FadeColour(BackgroundActive, TRANSITION_LENGTH, Easing.OutQuint);
+            highlightBox.FadeIn(TRANSITION_LENGTH, Easing.OutQuint);
+
+            Text.FadeOut(TRANSITION_LENGTH, Easing.OutQuint);
+            TextBold.FadeIn(TRANSITION_LENGTH, Easing.OutQuint);
+        }
+
+        protected virtual void FadeInactive()
+        {
+            this.ResizeHeightTo(1, TRANSITION_LENGTH, Easing.OutQuint);
+
+            TweenEdgeEffectTo(deactivateEdgeEffect, TRANSITION_LENGTH);
+
+            box.FadeColour(BackgroundInactive, TRANSITION_LENGTH, Easing.OutQuint);
+            highlightBox.FadeOut(TRANSITION_LENGTH, Easing.OutQuint);
+
+            Text.FadeIn(TRANSITION_LENGTH, Easing.OutQuint);
+            TextBold.FadeOut(TRANSITION_LENGTH, Easing.OutQuint);
+        }
+
+        protected override void OnActivated() => updateState();
+        protected override void OnDeactivated() => updateState();
+    }
+}

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

@@ -0,0 +1,97 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Online.Chat;
+using osu.Game.Users;
+using OpenTK;
+
+namespace osu.Game.Overlays.Chat.Tabs
+{
+    public class PrivateChannelTabItem : ChannelTabItem
+    {
+        private readonly OsuSpriteText username;
+        private readonly Avatar avatarContainer;
+
+        protected override FontAwesome DisplayIcon => FontAwesome.fa_at;
+
+        public PrivateChannelTabItem(Channel value)
+            : base(value)
+        {
+            if (value.Type != ChannelType.PM)
+                throw new ArgumentException("Argument value needs to have the targettype user!");
+
+            AddRange(new Drawable[]
+            {
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Y,
+                    AutoSizeAxes = Axes.X,
+                    Margin = new MarginPadding
+                    {
+                        Horizontal = 3
+                    },
+                    Origin = Anchor.BottomLeft,
+                    Anchor = Anchor.BottomLeft,
+                    Children = new Drawable[]
+                    {
+                        new CircularContainer
+                        {
+                            Scale = new Vector2(0.95f),
+                            Size = new Vector2(ChatOverlay.TAB_AREA_HEIGHT),
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Masking = true,
+                            Child = new DelayedLoadWrapper(new Avatar(value.Users.First())
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                OnLoadComplete = d => d.FadeInFromZero(300, Easing.OutQuint),
+                            })
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                            }
+                        },
+                    }
+                },
+            });
+
+            Text.X = ChatOverlay.TAB_AREA_HEIGHT;
+            TextBold.X = ChatOverlay.TAB_AREA_HEIGHT;
+        }
+
+        protected override bool ShowCloseOnHover => false;
+
+        protected override void FadeActive()
+        {
+            base.FadeActive();
+
+            this.ResizeWidthTo(200, TRANSITION_LENGTH, Easing.OutQuint);
+            CloseButton.FadeIn(TRANSITION_LENGTH, Easing.OutQuint);
+        }
+
+
+        protected override void FadeInactive()
+        {
+            base.FadeInactive();
+
+            this.ResizeWidthTo(ChatOverlay.TAB_AREA_HEIGHT + 10, TRANSITION_LENGTH, Easing.OutQuint);
+            CloseButton.FadeOut(TRANSITION_LENGTH, Easing.OutQuint);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            var user = Value.Users.First();
+
+            BackgroundActive = user.Colour != null ? OsuColour.FromHex(user.Colour) : colours.BlueDark;
+            BackgroundInactive = BackgroundActive.Darken(0.5f);
+        }
+    }
+}

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

@@ -0,0 +1,55 @@
+// 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.Graphics;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using OpenTK;
+using OpenTK.Graphics;
+
+namespace osu.Game.Overlays.Chat.Tabs
+{
+    public class TabCloseButton : OsuClickableContainer
+    {
+        private readonly SpriteIcon icon;
+
+        public TabCloseButton()
+        {
+            Size = new Vector2(20);
+
+            Child = icon = new SpriteIcon
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Scale = new Vector2(0.75f),
+                Icon = FontAwesome.fa_close,
+                RelativeSizeAxes = Axes.Both,
+            };
+        }
+
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            icon.ScaleTo(0.5f, 1000, Easing.OutQuint);
+            return base.OnMouseDown(e);
+        }
+
+        protected override bool OnMouseUp(MouseUpEvent e)
+        {
+            icon.ScaleTo(0.75f, 1000, Easing.OutElastic);
+            return base.OnMouseUp(e);
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            icon.FadeColour(Color4.Red, 200, Easing.OutQuint);
+            return base.OnHover(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            icon.FadeColour(Color4.White, 200, Easing.OutQuint);
+            base.OnHoverLost(e);
+        }
+    }
+}