From a8764b67e1ac962cdbb78d97ddba6ab270167e78 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 6 Jun 2022 18:27:41 +0900
Subject: [PATCH] Add padding and avoid using invalidation (triggers too often
 when toolbar is being toggled)

---
 osu.Game/Skinning/Editor/SkinEditorOverlay.cs | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditorOverlay.cs b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
index 6b4b8abe1a..c96abe3e1e 100644
--- a/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
+++ b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
@@ -15,6 +15,7 @@
 using osu.Game.Input.Bindings;
 using osu.Game.Screens;
 using osu.Game.Screens.Edit.Components;
+using osuTK;
 
 namespace osu.Game.Skinning.Editor
 {
@@ -36,6 +37,8 @@ public class SkinEditorOverlay : OverlayContainer, IKeyBindingHandler<GlobalActi
 
         private OsuScreen lastTargetScreen;
 
+        private Vector2 lastDrawSize;
+
         public SkinEditorOverlay(ScalingContainer scalingContainer)
         {
             this.scalingContainer = scalingContainer;
@@ -92,18 +95,31 @@ protected override bool OnInvalidate(Invalidation invalidation, InvalidationSour
             return base.OnInvalidate(invalidation, source);
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            if (game.DrawSize != lastDrawSize)
+            {
+                lastDrawSize = game.DrawSize;
+                updateScreenSizing();
+            }
+        }
+
         private void updateScreenSizing()
         {
             if (skinEditor?.State.Value != Visibility.Visible) return;
 
-            float relativeSidebarWidth = EditorSidebar.WIDTH / DrawWidth;
-            float relativeToolbarHeight = (SkinEditorSceneLibrary.HEIGHT + SkinEditor.MENU_HEIGHT) / DrawHeight;
+            const float padding = 10;
+
+            float relativeSidebarWidth = (EditorSidebar.WIDTH + padding) / DrawWidth;
+            float relativeToolbarHeight = (SkinEditorSceneLibrary.HEIGHT + SkinEditor.MENU_HEIGHT + padding) / DrawHeight;
 
             var rect = new RectangleF(
                 relativeSidebarWidth,
                 relativeToolbarHeight,
                 1 - relativeSidebarWidth * 2,
-                1f - relativeToolbarHeight);
+                1f - relativeToolbarHeight - padding / DrawHeight);
 
             scalingContainer.SetCustomRect(rect, true);
         }