From 8eb23f8a604818b6ce94dc0810a551c2a5455a4d Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 28 May 2024 16:19:57 +0200
Subject: [PATCH] remove redundant CanScaleFromSelectionOrigin

---
 .../Edit/OsuSelectionScaleHandler.cs             |  1 -
 .../Edit/PreciseScalePopover.cs                  | 16 ++++++++++++----
 .../Compose/Components/SelectionScaleHandler.cs  |  5 -----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionScaleHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionScaleHandler.cs
index a9cbc1b8f1..f120c8bd75 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionScaleHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionScaleHandler.cs
@@ -53,7 +53,6 @@ namespace osu.Game.Rulesets.Osu.Edit
             CanScaleX.Value = quad.Width > 0;
             CanScaleY.Value = quad.Height > 0;
             CanScaleDiagonally.Value = CanScaleX.Value && CanScaleY.Value;
-            CanScaleFromSelectionOrigin.Value = CanScaleX.Value || CanScaleY.Value;
             CanScaleFromPlayfieldOrigin.Value = selectedMovableObjects.Any();
         }
 
diff --git a/osu.Game.Rulesets.Osu/Edit/PreciseScalePopover.cs b/osu.Game.Rulesets.Osu/Edit/PreciseScalePopover.cs
index 124a79390a..dca262cf5a 100644
--- a/osu.Game.Rulesets.Osu/Edit/PreciseScalePopover.cs
+++ b/osu.Game.Rulesets.Osu/Edit/PreciseScalePopover.cs
@@ -32,6 +32,9 @@ namespace osu.Game.Rulesets.Osu.Edit
         private OsuCheckbox xCheckBox = null!;
         private OsuCheckbox yCheckBox = null!;
 
+        private Bindable<bool> canScaleX = null!;
+        private Bindable<bool> canScaleY = null!;
+
         public PreciseScalePopover(SelectionScaleHandler scaleHandler)
         {
             this.scaleHandler = scaleHandler;
@@ -118,10 +121,15 @@ namespace osu.Game.Rulesets.Osu.Edit
             xCheckBox.Current.BindValueChanged(x => setAxis(x.NewValue, yCheckBox.Current.Value));
             yCheckBox.Current.BindValueChanged(y => setAxis(xCheckBox.Current.Value, y.NewValue));
 
-            scaleHandler.CanScaleFromSelectionOrigin.BindValueChanged(e =>
-            {
-                selectionCentreButton.Selected.Disabled = !e.NewValue;
-            }, true);
+            // aggregate two values into canScaleFromSelectionCentre
+            canScaleX = scaleHandler.CanScaleX.GetBoundCopy();
+            canScaleX.BindValueChanged(_ => updateCanScaleFromSelectionCentre());
+
+            canScaleY = scaleHandler.CanScaleY.GetBoundCopy();
+            canScaleY.BindValueChanged(_ => updateCanScaleFromSelectionCentre(), true);
+
+            void updateCanScaleFromSelectionCentre() =>
+                selectionCentreButton.Selected.Disabled = !(scaleHandler.CanScaleY.Value || scaleHandler.CanScaleFromPlayfieldOrigin.Value);
 
             scaleInfo.BindValueChanged(scale =>
             {
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionScaleHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionScaleHandler.cs
index b72c3406f1..2c8b413560 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionScaleHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionScaleHandler.cs
@@ -32,11 +32,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </remarks>
         public Bindable<bool> CanScaleDiagonally { get; private set; } = new BindableBool();
 
-        /// <summary>
-        /// Whether scaling anchored by the selection origin can currently be performed.
-        /// </summary>
-        public Bindable<bool> CanScaleFromSelectionOrigin { get; private set; } = new BindableBool();
-
         /// <summary>
         /// Whether scaling anchored by the center of the playfield can currently be performed.
         /// </summary>