From c119a6a13587830469b009919e376d8e3c5048d6 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 12 May 2019 09:30:43 -0700
Subject: [PATCH 1/2] Use VolumeMute icon for mute button

---
 osu.Game/Overlays/Volume/MuteButton.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Volume/MuteButton.cs b/osu.Game/Overlays/Volume/MuteButton.cs
index 2b1f78243b..c87ca65dba 100644
--- a/osu.Game/Overlays/Volume/MuteButton.cs
+++ b/osu.Game/Overlays/Volume/MuteButton.cs
@@ -64,16 +64,15 @@ namespace osu.Game.Overlays.Volume
                 },
                 icon = new SpriteIcon
                 {
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
                     Size = new Vector2(20),
                 }
             });
 
             Current.ValueChanged += muted =>
             {
-                icon.Icon = muted.NewValue ? FontAwesome.Solid.VolumeOff : FontAwesome.Solid.VolumeUp;
-                icon.Margin = new MarginPadding { Left = muted.NewValue ? width / 2 - 15 : width / 2 - 10 }; //Magic numbers to line up both icons because they're different widths
+                icon.Icon = muted.NewValue ? FontAwesome.Solid.VolumeMute : FontAwesome.Solid.VolumeUp;
             };
             Current.TriggerChange();
         }

From 8110d6768c14ba88d2aae8d8ebd63e177fde35bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 13 May 2019 07:24:34 +0900
Subject: [PATCH 2/2] Inherit OsuButton

---
 osu.Game/Overlays/Volume/MuteButton.cs | 36 +++++++++++---------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Overlays/Volume/MuteButton.cs b/osu.Game/Overlays/Volume/MuteButton.cs
index c87ca65dba..a4884dc2c1 100644
--- a/osu.Game/Overlays/Volume/MuteButton.cs
+++ b/osu.Game/Overlays/Volume/MuteButton.cs
@@ -4,21 +4,20 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 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.UserInterface;
 using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Volume
 {
-    public class MuteButton : Container, IHasCurrentValue<bool>
+    public class MuteButton : OsuButton, IHasCurrentValue<bool>
     {
         private readonly Bindable<bool> current = new Bindable<bool>();
 
@@ -36,32 +35,32 @@ namespace osu.Game.Overlays.Volume
         }
 
         private Color4 hoveredColour, unhoveredColour;
+
         private const float width = 100;
         public const float HEIGHT = 35;
 
         public MuteButton()
         {
-            Masking = true;
-            BorderThickness = 3;
-            CornerRadius = HEIGHT / 2;
+            Content.BorderThickness = 3;
+            Content.CornerRadius = HEIGHT / 2;
+
             Size = new Vector2(width, HEIGHT);
+
+            Action = () => Current.Value = !Current.Value;
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
             hoveredColour = colours.YellowDark;
-            BorderColour = unhoveredColour = colours.Gray1.Opacity(0.9f);
+
+            Content.BorderColour = unhoveredColour = colours.Gray1;
+            BackgroundColour = colours.Gray1;
 
             SpriteIcon icon;
+
             AddRange(new Drawable[]
             {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = colours.Gray1,
-                    Alpha = 0.9f,
-                },
                 icon = new SpriteIcon
                 {
                     Anchor = Anchor.Centre,
@@ -74,24 +73,19 @@ namespace osu.Game.Overlays.Volume
             {
                 icon.Icon = muted.NewValue ? FontAwesome.Solid.VolumeMute : FontAwesome.Solid.VolumeUp;
             };
+
             Current.TriggerChange();
         }
 
         protected override bool OnHover(HoverEvent e)
         {
-            this.TransformTo<MuteButton, SRGBColour>("BorderColour", hoveredColour, 500, Easing.OutQuint);
+            Content.TransformTo<Container<Drawable>, SRGBColour>("BorderColour", hoveredColour, 500, Easing.OutQuint);
             return false;
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            this.TransformTo<MuteButton, SRGBColour>("BorderColour", unhoveredColour, 500, Easing.OutQuint);
-        }
-
-        protected override bool OnClick(ClickEvent e)
-        {
-            Current.Value = !Current.Value;
-            return true;
+            Content.TransformTo<Container<Drawable>, SRGBColour>("BorderColour", unhoveredColour, 500, Easing.OutQuint);
         }
     }
 }