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

Refactor hide logic a touch for better readability

Browse Source
This commit is contained in:
Dean Herbert 2022-07-14 14:00:33 +09:00
parent dccd81dbc7
commit 227871e8df
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,12 +49,11 @@ namespace osu.Game.Overlays
public void Push(PopupDialog dialog) public void Push(PopupDialog dialog)
{ {
if (dialog == CurrentDialog || dialog.State.Value != Visibility.Visible) return; if (dialog == CurrentDialog || dialog.State.Value == Visibility.Hidden) return;
var lastDialog = CurrentDialog;
// Immediately update the externally accessible property as this may be used for checks even before // Immediately update the externally accessible property as this may be used for checks even before
// a DialogOverlay instance has finished loading. // a DialogOverlay instance has finished loading.
var lastDialog = CurrentDialog;
CurrentDialog = dialog; CurrentDialog = dialog;
Schedule(() => Schedule(() =>
@ -62,31 +61,42 @@ namespace osu.Game.Overlays
// if any existing dialog is being displayed, dismiss it before showing a new one. // if any existing dialog is being displayed, dismiss it before showing a new one.
lastDialog?.Hide(); lastDialog?.Hide();
dialog.State.BindValueChanged(state => onDialogStateChanged(dialog, state.NewValue), true); // is the new dialog is hidden before added to the dialogContainer, bypass any further operations.
dialogContainer.Add(dialog); if (dialog.State.Value == Visibility.Hidden)
{
dismiss();
return;
}
dialogContainer.Add(dialog);
Show(); Show();
dialog.State.BindValueChanged(state =>
{
if (state.NewValue != Visibility.Hidden) return;
// Trigger the demise of the dialog as soon as it hides.
dialog.Delay(PopupDialog.EXIT_DURATION).Expire();
dismiss();
}); });
});
void dismiss()
{
if (dialog != CurrentDialog) return;
// Handle the case where the dialog is the currently displayed dialog.
// In this scenario, the overlay itself should also be hidden.
Hide();
CurrentDialog = null;
}
} }
public override bool IsPresent => Scheduler.HasPendingTasks || dialogContainer.Children.Count > 0; public override bool IsPresent => Scheduler.HasPendingTasks || dialogContainer.Children.Count > 0;
protected override bool BlockNonPositionalInput => true; protected override bool BlockNonPositionalInput => true;
private void onDialogStateChanged(VisibilityContainer dialog, Visibility newState)
{
if (newState != Visibility.Hidden) return;
// handle the dialog being dismissed.
dialog.Delay(PopupDialog.EXIT_DURATION).Expire();
if (dialog == CurrentDialog)
{
Hide();
CurrentDialog = null;
}
}
protected override void PopIn() protected override void PopIn()
{ {
base.PopIn(); base.PopIn();