From 8e8e0fb8d8c9abce26fe64a0098507c8967d0739 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 6 Aug 2021 18:36:43 +0300
Subject: [PATCH] Add placement-dependent horizontal screen offset properties

---
 osu.Game/Overlays/NotificationOverlay.cs | 5 +++++
 osu.Game/Overlays/SettingsOverlay.cs     | 2 ++
 osu.Game/Overlays/SettingsPanel.cs       | 6 ++++++
 3 files changed, 13 insertions(+)

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index b26e17b34c..af4f41901f 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -30,6 +30,11 @@ public class NotificationOverlay : OsuFocusedOverlayContainer, INamedOverlayComp
 
         private FlowContainer<NotificationSection> sections;
 
+        /// <summary>
+        /// A horizontal offset to apply to the game-wide screen.
+        /// </summary>
+        public float HorizontalScreenOffset => -width + X;
+
         /// <summary>
         /// Provide a source for the toolbar height.
         /// </summary>
diff --git a/osu.Game/Overlays/SettingsOverlay.cs b/osu.Game/Overlays/SettingsOverlay.cs
index 050502b3be..9ed1d950e3 100644
--- a/osu.Game/Overlays/SettingsOverlay.cs
+++ b/osu.Game/Overlays/SettingsOverlay.cs
@@ -21,6 +21,8 @@ public class SettingsOverlay : SettingsPanel, INamedOverlayComponent
         public LocalisableString Title => SettingsStrings.HeaderTitle;
         public LocalisableString Description => SettingsStrings.HeaderDescription;
 
+        public override float HorizontalScreenOffset => base.HorizontalScreenOffset + (lastOpenedSubPanel?.HorizontalScreenOffset ?? 0f);
+
         protected override IEnumerable<SettingsSection> CreateSections() => new SettingsSection[]
         {
             new GeneralSection(),
diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index eae828c142..2916ea013f 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -34,6 +34,11 @@ public abstract class SettingsPanel : OsuFocusedOverlayContainer
 
         protected override Container<Drawable> Content => ContentContainer;
 
+        /// <summary>
+        /// A horizontal offset to apply to the game-wide screen.
+        /// </summary>
+        public virtual float HorizontalScreenOffset => (WIDTH + Content?.X) ?? 0f;
+
         protected Sidebar Sidebar;
         private SidebarButton selectedSidebarButton;
 
@@ -64,6 +69,7 @@ private void load()
         {
             InternalChild = ContentContainer = new NonMaskedContent
             {
+                X = -WIDTH + ExpandedPosition,
                 Width = WIDTH,
                 RelativeSizeAxes = Axes.Y,
                 Children = new Drawable[]