sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-07 00:23:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3029 from peppy/fix-informational-overlay-hiding

Browse Source 
Fix informational overlays not hiding when user toggles other overlay views
This commit is contained in:
Dean Herbert
2018-07-13 20:56:01 +09:00
committed by GitHub
parent 9d8060d5e0 96eb44425b
commit 7b106bd0c1
1 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
osu.Game/OsuGame.cs
View File

@ -19,6 +19,7 @@ using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using osu.Framework.Audio; using osu.Framework.Audio;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Framework.Input.Bindings; using osu.Framework.Input.Bindings;
using osu.Framework.Platform; using osu.Framework.Platform;
@ -322,24 +323,6 @@ namespace osu.Game
dependencies.Cache(notifications); dependencies.Cache(notifications);
dependencies.Cache(dialogOverlay); dependencies.Cache(dialogOverlay);
// ensure only one of these overlays are open at once.
var singleDisplayOverlays = new OverlayContainer[] { chat, social, direct };
overlays.AddRange(singleDisplayOverlays);
foreach (var overlay in singleDisplayOverlays)
{
overlay.StateChanged += state =>
{
if (state == Visibility.Hidden) return;
foreach (var c in singleDisplayOverlays)
{
if (c == overlay) continue;
c.State = Visibility.Hidden;
}
};
}
var singleDisplaySideOverlays = new OverlayContainer[] { settings, notifications }; var singleDisplaySideOverlays = new OverlayContainer[] { settings, notifications };
overlays.AddRange(singleDisplaySideOverlays); overlays.AddRange(singleDisplaySideOverlays);
@ -348,12 +331,7 @@ namespace osu.Game
overlay.StateChanged += state => overlay.StateChanged += state =>
{ {
if (state == Visibility.Hidden) return; if (state == Visibility.Hidden) return;
singleDisplaySideOverlays.Where(o => o != overlay).ForEach(o => o.Hide());
foreach (var c in singleDisplaySideOverlays)
{
if (c == overlay) continue;
c.State = Visibility.Hidden;
}
}; };
} }
@ -366,12 +344,24 @@ namespace osu.Game
overlay.StateChanged += state => overlay.StateChanged += state =>
{ {
if (state == Visibility.Hidden) return; if (state == Visibility.Hidden) return;
informationalOverlays.Where(o => o != overlay).ForEach(o => o.Hide());
};
}
foreach (var c in informationalOverlays) // ensure only one of these overlays are open at once.
{ var singleDisplayOverlays = new OverlayContainer[] { chat, social, direct };
if (c == overlay) continue; overlays.AddRange(singleDisplayOverlays);
c.State = Visibility.Hidden;
} foreach (var overlay in singleDisplayOverlays)
{
overlay.StateChanged += state =>
{
// informational overlays should be dismissed on a show or hide of a full overlay.
informationalOverlays.ForEach(o => o.Hide());
if (state == Visibility.Hidden) return;
singleDisplayOverlays.Where(o => o != overlay).ForEach(o => o.Hide());
}; };
} }