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

Made DialogOverlay use PopupDialog's direct valfixed last dialogs not expiring, DialogOverlay actually hides now, fixed an issue where multiple buttons could be pressed at once

Browse Source
This commit is contained in:
DrabWeb
2017-03-01 18:41:00 -04:00
parent d5d8352b62
commit befdf68abe
3 changed files with 44 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game/Overlays/DialogOverlay.cs
View File

@ -15,7 +15,6 @@ namespace osu.Game.Overlays
{
private Container dialogContainer;
private PopupDialog currentDialog;
private Container darken;
public void Push(PopupDialog dialog)
{
@ -25,26 +24,30 @@ namespace osu.Game.Overlays
dialog.Show();
dialog.StateChanged += delegate (OverlayContainer c, Visibility v)
{
if (v == Visibility.Hidden && c == currentDialog)
State = Visibility.Hidden;
if (v == Visibility.Hidden)
{
c.Delay(PopupDialog.EXIT_DURATION);
c.Expire();
if (c == currentDialog)
State = Visibility.Hidden;
}
};
var lastDialog = currentDialog;
currentDialog = dialog;
lastDialog?.Hide();
lastDialog?.Expire();
}
protected override void PopIn()
{
base.PopIn();
darken.FadeIn(500, EasingTypes.OutQuint);
FadeIn(PopupDialog.ENTER_DURATION, EasingTypes.OutQuint);
}
protected override void PopOut()
{
base.PopOut();
darken.FadeOut(200, EasingTypes.InSine);
FadeOut(PopupDialog.EXIT_DURATION, EasingTypes.InSine);
}
public DialogOverlay()
@ -53,7 +56,7 @@ namespace osu.Game.Overlays
Children = new Drawable[]
{
darken = new Container
new Container
{
RelativeSizeAxes = Axes.Both,
Children = new Drawable[]