Move click-to-expand logic to a higher level

Think it makes more sense there.
ppy · Dec 26, 2024 · d37b4bc · d37b4bc
1 parent df3e581
commit d37b4bc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/osu.Game/Graphics/Containers/ExpandingContainer.cs b/osu.Game/Graphics/Containers/ExpandingContainer.cs
@@ -71,6 +71,16 @@ protected override bool OnHover(HoverEvent e)
             return true;
         }
 
+        protected override bool OnClick(ClickEvent e)
+        {
+            base.OnClick(e);
+
+            if (!Expanded.Value)
+                Expanded.Value = true;
+
+            return true;
+        }
+
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
             updateHoverExpansion();

diff --git a/osu.Game/Rulesets/Edit/ExpandingToolboxContainer.cs b/osu.Game/Rulesets/Edit/ExpandingToolboxContainer.cs
@@ -62,15 +62,5 @@ protected override void Update()
         private bool anyToolboxHovered(Vector2 screenSpacePos) => FillFlow.ScreenSpaceDrawQuad.Contains(screenSpacePos);
 
         protected override bool OnMouseDown(MouseDownEvent e) => true;
-
-        protected override bool OnClick(ClickEvent e)
-        {
-            base.OnClick(e);
-
-            if (!Expanded.Value)
-                Expanded.Value = true;
-
-            return true;
-        }
     }
 }