From 1b5a23311ef36d80566fb8e555d250f9eec072d4 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 28 Jul 2020 00:29:17 +0300
Subject: [PATCH] Update ChevronButton position/colour

---
 .../Comments/Buttons/ChevronButton.cs         | 48 +++++++++++++++++++
 osu.Game/Overlays/Comments/DrawableComment.cs | 32 ++++---------
 .../Overlays/Comments/ShowChildrenButton.cs   | 33 -------------
 3 files changed, 58 insertions(+), 55 deletions(-)
 create mode 100644 osu.Game/Overlays/Comments/Buttons/ChevronButton.cs
 delete mode 100644 osu.Game/Overlays/Comments/ShowChildrenButton.cs

diff --git a/osu.Game/Overlays/Comments/Buttons/ChevronButton.cs b/osu.Game/Overlays/Comments/Buttons/ChevronButton.cs
new file mode 100644
index 0000000000..48f34e8f59
--- /dev/null
+++ b/osu.Game/Overlays/Comments/Buttons/ChevronButton.cs
@@ -0,0 +1,48 @@
+// 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 osu.Framework.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Sprites;
+using osuTK;
+using osu.Framework.Allocation;
+
+namespace osu.Game.Overlays.Comments.Buttons
+{
+    public class ChevronButton : OsuHoverContainer
+    {
+        public readonly BindableBool Expanded = new BindableBool(true);
+
+        private readonly SpriteIcon icon;
+
+        public ChevronButton()
+        {
+            Size = new Vector2(40, 22);
+            Child = icon = new SpriteIcon
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(12),
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            IdleColour = HoverColour = colourProvider.Foreground1;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Action = Expanded.Toggle;
+            Expanded.BindValueChanged(onExpandedChanged, true);
+        }
+
+        private void onExpandedChanged(ValueChangedEvent<bool> expanded)
+        {
+            icon.Icon = expanded.NewValue ? FontAwesome.Solid.ChevronUp : FontAwesome.Solid.ChevronDown;
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 3cdc0a0cbd..39ad60b61c 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -228,13 +228,19 @@ namespace osu.Game.Overlays.Comments
                         },
                     }
                 },
-                chevronButton = new ChevronButton
+                new Container
                 {
+                    Size = new Vector2(70, 40),
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
-                    Margin = new MarginPadding { Right = 30, Top = margin },
-                    Expanded = { BindTarget = childrenExpanded },
-                    Alpha = 0
+                    Margin = new MarginPadding { Horizontal = 5 },
+                    Child = chevronButton = new ChevronButton
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Expanded = { BindTarget = childrenExpanded },
+                        Alpha = 0
+                    }
                 }
             };
 
@@ -357,24 +363,6 @@ namespace osu.Game.Overlays.Comments
             showMoreButton.IsLoading = loadRepliesButton.IsLoading = false;
         }
 
-        private class ChevronButton : ShowChildrenButton
-        {
-            private readonly SpriteIcon icon;
-
-            public ChevronButton()
-            {
-                Child = icon = new SpriteIcon
-                {
-                    Size = new Vector2(12),
-                };
-            }
-
-            protected override void OnExpandedChanged(ValueChangedEvent<bool> expanded)
-            {
-                icon.Icon = expanded.NewValue ? FontAwesome.Solid.ChevronUp : FontAwesome.Solid.ChevronDown;
-            }
-        }
-
         private class ShowMoreButton : GetCommentRepliesButton
         {
             [BackgroundDependencyLoader]
diff --git a/osu.Game/Overlays/Comments/ShowChildrenButton.cs b/osu.Game/Overlays/Comments/ShowChildrenButton.cs
deleted file mode 100644
index 5ec7c1d471..0000000000
--- a/osu.Game/Overlays/Comments/ShowChildrenButton.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// 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 osu.Framework.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Framework.Bindables;
-using osuTK.Graphics;
-using osu.Game.Graphics;
-
-namespace osu.Game.Overlays.Comments
-{
-    public abstract class ShowChildrenButton : OsuHoverContainer
-    {
-        public readonly BindableBool Expanded = new BindableBool(true);
-
-        protected ShowChildrenButton()
-        {
-            AutoSizeAxes = Axes.Both;
-            IdleColour = OsuColour.Gray(0.7f);
-            HoverColour = Color4.White;
-        }
-
-        protected override void LoadComplete()
-        {
-            Action = Expanded.Toggle;
-
-            Expanded.BindValueChanged(OnExpandedChanged, true);
-            base.LoadComplete();
-        }
-
-        protected abstract void OnExpandedChanged(ValueChangedEvent<bool> expanded);
-    }
-}