From 2e8372fe906996996553d275f333358b3699c9b3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 28 Apr 2022 06:52:42 +0300
Subject: [PATCH] Minor cleanup

Just from reading diff.
---
 .../Editor/TestSceneSliderSnapping.cs                      | 3 +--
 .../Visual/Editing/TestSceneHitObjectComposer.cs           | 7 +++----
 osu.Game/Rulesets/Edit/HitObjectComposer.cs                | 4 +---
 .../Screens/Edit/Compose/Components/DistanceSnapGrid.cs    | 2 +-
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs
index 4833266dca..6b9a0ff531 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs
@@ -3,7 +3,6 @@
 
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Input.Events;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
@@ -63,7 +62,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             }));
             AddStep("set beat divisor to 1/1", () =>
             {
-                var beatDivisor = Editor.Dependencies.Get<BindableBeatDivisor>();
+                var beatDivisor = (BindableBeatDivisor)Editor.Dependencies.Get(typeof(BindableBeatDivisor));
                 beatDivisor.Value = 1;
             });
         }
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
index 7039d7d8a4..ae1b691767 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
@@ -8,7 +8,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
-using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Edit;
@@ -91,15 +90,15 @@ namespace osu.Game.Tests.Visual.Editing
         [Test]
         public void TestDistanceSpacingHotkeys()
         {
-            float originalSpacing = 0;
+            double originalSpacing = 0;
 
-            AddStep("retrieve original spacing", () => originalSpacing = (float)editorBeatmap.BeatmapInfo.DistanceSpacing);
+            AddStep("retrieve original spacing", () => originalSpacing = editorBeatmap.BeatmapInfo.DistanceSpacing);
 
             AddStep("hold ctrl", () => InputManager.PressKey(Key.LControl));
             AddStep("hold alt", () => InputManager.PressKey(Key.LAlt));
 
             AddStep("scroll mouse 5 steps", () => InputManager.ScrollVerticalBy(5));
-            AddAssert("distance spacing increased by 0.5", () => Precision.AlmostEquals(editorBeatmap.BeatmapInfo.DistanceSpacing, originalSpacing + 0.5f));
+            AddAssert("distance spacing increased by 0.5", () => editorBeatmap.BeatmapInfo.DistanceSpacing == originalSpacing + 0.5);
 
             AddStep("release alt", () => InputManager.ReleaseKey(Key.LAlt));
             AddStep("release ctrl", () => InputManager.ReleaseKey(Key.LControl));
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 9fc332d726..a235a5bc60 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -117,8 +117,6 @@ namespace osu.Game.Rulesets.Edit
                 },
                 new LeftToolboxFlow
                 {
-                    Anchor = Anchor.TopLeft,
-                    Origin = Anchor.TopLeft,
                     Children = new Drawable[]
                     {
                         new EditorToolboxGroup("toolbox (1-9)")
@@ -134,7 +132,7 @@ namespace osu.Game.Rulesets.Edit
                                 Direction = FillDirection.Vertical,
                                 Spacing = new Vector2(0, 5),
                             },
-                        },
+                        }
                     }
                 },
             };
diff --git a/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
index 9dd6cec8ce..4f348567b1 100644
--- a/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             base.LoadComplete();
 
-            beatDivisor.BindValueChanged(_ => updateSpacing(), true);
+            beatDivisor.BindValueChanged(_ => updateSpacing());
 
             distanceSpacingMultiplier = SnapProvider.DistanceSpacingMultiplier.GetBoundCopy();
             distanceSpacingMultiplier.BindValueChanged(_ => updateSpacing(), true);