From 8de62b608e76e268fea5d03551c0ba6a9fc10949 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 Jun 2019 15:22:27 +0900
Subject: [PATCH 1/2] Allow FullscreenOverlay to surface to front on subsequent
 Show requests

---
 osu.Game/Overlays/FullscreenOverlay.cs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index 9706f75087..0911ee84de 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -40,6 +41,19 @@ namespace osu.Game.Overlays
             };
         }
 
+        public override void Show()
+        {
+            if (State.Value == Visibility.Visible)
+            {
+                // re-trigger the state changed so we can potentially surface to front
+                State.TriggerChange();
+            }
+            else
+            {
+                base.Show();
+            }
+        }
+
         protected override void PopIn()
         {
             base.PopIn();

From 620c2311ac887eebf82c8c31583661bfe0aba517 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 Jun 2019 15:39:12 +0900
Subject: [PATCH 2/2] Add test

---
 .../Online/TestSceneFullscreenOverlay.cs       | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs
index 6dc3428bff..fe8437be17 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs
@@ -18,8 +18,24 @@ namespace osu.Game.Tests.Visual.Online
         {
             base.LoadComplete();
 
+            int fireCount = 0;
+
             Add(overlay = new TestFullscreenOverlay());
-            AddStep(@"toggle", overlay.ToggleVisibility);
+
+            overlay.State.ValueChanged += _ => fireCount++;
+
+            AddStep(@"show", overlay.Show);
+
+            AddAssert("fire count 1", () => fireCount == 1);
+
+            AddStep(@"show again", overlay.Show);
+
+            // this logic is specific to FullscreenOverlay
+            AddAssert("fire count 2", () => fireCount == 2);
+
+            AddStep(@"hide", overlay.Hide);
+
+            AddAssert("fire count 3", () => fireCount == 3);
         }
 
         private class TestFullscreenOverlay : FullscreenOverlay