From 932745e5c4049e8cf15074f5ecca437364d18fd9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 18:14:29 +0900
Subject: [PATCH] Fix remaining feedback loops

---
 .../Settings/Sections/Input/TabletSettings.cs | 51 ++++++++++++-------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 9fa74eda18..e94df7dc1b 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -1,7 +1,6 @@
 // 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 System.ComponentModel;
 using System.Drawing;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -80,7 +79,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
             aspectRatio.BindValueChanged(aspect =>
             {
-                forceAspectRatio(aspect.NewValue);
+                aspectRatioApplication?.Cancel();
+                aspectRatioApplication = Schedule(() => forceAspectRatio(aspect.NewValue));
             });
 
             ((IBindable<Size>)tabletSize).BindTo(tabletHandler.TabletSize);
@@ -102,31 +102,44 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             }, true);
         }
 
+        private float curentAspectRatio => (float)sizeX.Value / sizeY.Value;
+
         private void applyAspectRatio(ValueChangedEvent<Size> sizeChanged)
         {
-            float proposedAspectRatio = (float)sizeX.Value / sizeY.Value;
+            float proposedAspectRatio = curentAspectRatio;
 
-            if (!aspectLock.Value)
+            try
             {
-                aspectRatio.Value = proposedAspectRatio;
+                if (!aspectLock.Value)
+                {
+                    // aspect ratio was in a valid range.
+                    if (proposedAspectRatio >= aspectRatio.MinValue && proposedAspectRatio <= aspectRatio.MaxValue)
+                    {
+                        updateAspectRatio();
+                        return;
+                    }
+                }
 
-                // aspect ratio was in a valid range.
-                if (proposedAspectRatio >= aspectRatio.MinValue && proposedAspectRatio <= aspectRatio.MaxValue)
-                    return;
+                if (sizeChanged.NewValue.Width != sizeChanged.OldValue.Width)
+                {
+                    areaSize.Value = new Size(areaSize.Value.Width, (int)(areaSize.Value.Width / aspectRatio.Value));
+                }
+                else
+                {
+                    areaSize.Value = new Size((int)(areaSize.Value.Height * aspectRatio.Value), areaSize.Value.Height);
+                }
             }
-
-            if (sizeChanged.NewValue.Width != sizeChanged.OldValue.Width)
+            finally
             {
-                areaSize.Value = new Size(areaSize.Value.Width, (int)(areaSize.Value.Width / aspectRatio.Value));
-            }
-            else
-            {
-                areaSize.Value = new Size((int)(areaSize.Value.Height * aspectRatio.Value), areaSize.Value.Height);
+                // cancel any event which may have fired while updating variables as a result of aspect ratio limitations.
+                // this avoids a potential feedback loop.
+                aspectRatioApplication?.Cancel();
             }
+        }
 
-            // cancel any event which may have fired while updating variables as a result of aspect ratio limitations.
-            // this avoids a potential feedback loop.
-            aspectRatioApplication?.Cancel();
+        private void updateAspectRatio()
+        {
+            aspectRatio.Value = curentAspectRatio;
         }
 
         private void updateDisplay()
@@ -204,6 +217,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             else
                 sizeX.Value = (int)(sizeY.Value * aspectRatio);
 
+            updateAspectRatio();
+
             aspectRatioApplication?.Cancel();
             aspectLock.Value = true;
         }