From 42dc73d84964fda205fdd6dd94e4d02a0baf8246 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Jan 2026 02:55:48 +0900
Subject: [PATCH] Standardise animations

---
 .../Graphics/UserInterfaceV2/FormSliderBar.cs | 22 ++++++++++---------
 .../Graphics/UserInterfaceV2/SwitchButton.cs  |  6 ++++-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Graphics/UserInterfaceV2/FormSliderBar.cs b/osu.Game/Graphics/UserInterfaceV2/FormSliderBar.cs
index 95c5fc1b54..d6c7c36785 100644
--- a/osu.Game/Graphics/UserInterfaceV2/FormSliderBar.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/FormSliderBar.cs
@@ -200,6 +200,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
 
             Masking = true;
             CornerRadius = 5;
+            CornerExponent = 2.5f;
 
             InternalChildren = new Drawable[]
             {
@@ -558,20 +559,20 @@ namespace osu.Game.Graphics.UserInterfaceV2
             private void updateState()
             {
                 sounds.Enabled.Value = !Current.Disabled;
-                rightBox.Colour = colourProvider.Background6;
+                rightBox.Colour = colourProvider.Background5;
 
-                Color4 leftColour;
+                Color4 leftColour = colourProvider.Light4;
                 Color4 nubColour;
 
+                if (IsHovered || HasFocus || IsDragged)
+                    nubColour = colourProvider.Highlight1;
+                else
+                    nubColour = colourProvider.Highlight1.Darken(0.1f);
+
                 if (Current.Disabled)
                 {
-                    leftColour = colourProvider.Dark3;
-                    nubColour = colourProvider.Dark1;
-                }
-                else
-                {
-                    leftColour = HasFocus || IsHovered || IsDragged ? colourProvider.Highlight1.Opacity(0.5f) : colourProvider.Highlight1.Opacity(0.3f);
-                    nubColour = HasFocus || IsHovered || IsDragged ? colourProvider.Highlight1 : colourProvider.Light4;
+                    nubColour = nubColour.Darken(0.4f);
+                    leftColour = leftColour.Darken(0.4f);
                 }
 
                 leftBox.FadeColour(leftColour, 250, Easing.OutQuint);
@@ -580,7 +581,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
 
             protected override void UpdateValue(float value)
             {
-                nub.MoveToX(value, 200, Easing.OutPow10);
+                nub.MoveToX(value, 250, Easing.OutElasticQuarter);
             }
 
             protected override bool Commit()
@@ -603,6 +604,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
             [BackgroundDependencyLoader]
             private void load()
             {
+                CornerExponent = 2.5f;
                 Width = InnerSlider.NUB_WIDTH;
                 RelativeSizeAxes = Axes.Y;
                 RelativePositionAxes = Axes.X;
diff --git a/osu.Game/Graphics/UserInterfaceV2/SwitchButton.cs b/osu.Game/Graphics/UserInterfaceV2/SwitchButton.cs
index 3afb6d756b..802b91451a 100644
--- a/osu.Game/Graphics/UserInterfaceV2/SwitchButton.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/SwitchButton.cs
@@ -121,7 +121,11 @@ namespace osu.Game.Graphics.UserInterfaceV2
             fill.FadeColour(fillColour, 250, Easing.OutQuint);
 
             content.TransformTo(nameof(BorderColour), (ColourInfo)borderColour, 250, Easing.OutQuint);
-            content.ResizeWidthTo(ExpandOnCurrent && Current.Value ? 1 : 0.75f, 250, Easing.OutQuint);
+
+            if (ExpandOnCurrent && Current.Value)
+                content.ResizeWidthTo(1f, 200, Easing.OutElasticQuarter);
+            else
+                content.ResizeWidthTo(0.75f, 120, Easing.OutExpo);
         }
     }
 }