From 2c22158dbdaa13f3e27622e1df4317536e94300e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 1 Jul 2025 11:23:55 +0200
Subject: [PATCH] Move external skin edit overlay out of `OsuGame`

---
 osu.Game/OsuGame.cs                           |  1 -
 .../Overlays/SkinEditor/SkinEditorOverlay.cs  | 22 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 9e524878dc..394917dc62 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1225,7 +1225,6 @@ namespace osu.Game
             loadComponentSingleFile(beatmapSetOverlay = new BeatmapSetOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(wikiOverlay = new WikiOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(skinEditor = new SkinEditorOverlay(ScreenContainer), overlayContent.Add, true);
-            loadComponentSingleFile(new ExternalEditOverlay(), overlayContent.Add, true);
 
             loadComponentSingleFile(new LoginOverlay
             {
diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
index 344dcc0d66..7553c83056 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
@@ -49,9 +49,15 @@ namespace osu.Game.Overlays.SkinEditor
         [Resolved]
         private IPerformFromScreenRunner? performer { get; set; }
 
+        [Resolved]
+        private IOverlayManager? overlayManager { get; set; }
+
         [Cached]
         public readonly EditorClipboard Clipboard = new EditorClipboard();
 
+        [Cached]
+        private readonly ExternalEditOverlay externalEditOverlay = new ExternalEditOverlay();
+
         [Resolved]
         private OsuGame game { get; set; } = null!;
 
@@ -69,6 +75,7 @@ namespace osu.Game.Overlays.SkinEditor
 
         private OsuScreen? lastTargetScreen;
         private InvokeOnDisposal? nestedInputManagerDisable;
+        private IDisposable? externalEditOverlayRegistration;
 
         private readonly LayoutValue drawSizeLayout;
 
@@ -86,6 +93,13 @@ namespace osu.Game.Overlays.SkinEditor
             config.BindWith(OsuSetting.BeatmapSkins, beatmapSkins);
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            externalEditOverlayRegistration = overlayManager?.RegisterBlockingOverlay(externalEditOverlay);
+        }
+
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
             switch (e.Action)
@@ -342,6 +356,14 @@ namespace osu.Game.Overlays.SkinEditor
             base.ToggleVisibility();
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            externalEditOverlayRegistration?.Dispose();
+            externalEditOverlayRegistration = null;
+        }
+
         private partial class EndlessPlayer : ReplayPlayer
         {
             protected override UserActivity? InitialActivity => null;