From d580b07063f2c83bd165809f210c82c64ee7b19e Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Sat, 17 Sep 2022 14:40:36 +0100
Subject: [PATCH] Refactor update condition logic

---
 osu.Game/Screens/Play/SquareGraph.cs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index 092e056c85..210ae21156 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -15,7 +15,6 @@ using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Allocation;
-using osu.Framework.Layout;
 using osu.Framework.Threading;
 
 namespace osu.Game.Screens.Play
@@ -24,11 +23,6 @@ namespace osu.Game.Screens.Play
     {
         private BufferedContainer<Column> columns;
 
-        public SquareGraph()
-        {
-            AddLayout(layout);
-        }
-
         public int ColumnCount => columns?.Children.Count ?? 0;
 
         private int progress;
@@ -57,7 +51,7 @@ namespace osu.Game.Screens.Play
                 if (value == values) return;
 
                 values = value;
-                layout.Invalidate();
+                graphNeedsUpdate = true;
             }
         }
 
@@ -75,24 +69,25 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        private readonly LayoutValue layout = new LayoutValue(Invalidation.DrawSize);
         private ScheduledDelegate scheduledCreate;
 
+        private bool graphNeedsUpdate = false;
+
         private Vector2 previousDrawSize;
 
         protected override void Update()
         {
             base.Update();
 
-            if (values != null && !layout.IsValid && DrawSize != previousDrawSize)
+            if (graphNeedsUpdate || (values != null && DrawSize != previousDrawSize))
             {
                 columns?.FadeOut(500, Easing.OutQuint).Expire();
 
                 scheduledCreate?.Cancel();
                 scheduledCreate = Scheduler.AddDelayed(RecreateGraph, 500);
 
-                layout.Validate();
                 previousDrawSize = DrawSize;
+                graphNeedsUpdate = false;
             }
         }