mirror of
https://github.com/ppy/osu.git
synced 2025-01-30 21:32:57 +08:00
Merge pull request #31414 from frenzibyte/fix-display
Fix mobile release dialog obstructed by the software keyboard
This commit is contained in:
commit
d6e73d75d2
@ -297,15 +297,6 @@ namespace osu.Game.Screens.Menu
|
|||||||
|
|
||||||
private bool onLogoClick(Func<bool> originalAction)
|
private bool onLogoClick(Func<bool> originalAction)
|
||||||
{
|
{
|
||||||
if (!api.IsLoggedIn || api.State.Value == APIState.RequiresSecondFactorAuth)
|
|
||||||
{
|
|
||||||
if (!loginDisplayed.Value)
|
|
||||||
{
|
|
||||||
Scheduler.AddDelayed(() => login?.Show(), 500);
|
|
||||||
loginDisplayed.Value = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (showMobileDisclaimer.Value)
|
if (showMobileDisclaimer.Value)
|
||||||
{
|
{
|
||||||
mobileDisclaimerSchedule?.Cancel();
|
mobileDisclaimerSchedule?.Cancel();
|
||||||
@ -314,13 +305,27 @@ namespace osu.Game.Screens.Menu
|
|||||||
dialogOverlay.Push(new MobileDisclaimerDialog(() =>
|
dialogOverlay.Push(new MobileDisclaimerDialog(() =>
|
||||||
{
|
{
|
||||||
showMobileDisclaimer.Value = false;
|
showMobileDisclaimer.Value = false;
|
||||||
|
displayLoginIfApplicable();
|
||||||
}));
|
}));
|
||||||
}, 500);
|
}, 500);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
displayLoginIfApplicable();
|
||||||
|
|
||||||
return originalAction.Invoke();
|
return originalAction.Invoke();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void displayLoginIfApplicable()
|
||||||
|
{
|
||||||
|
if (loginDisplayed.Value) return;
|
||||||
|
|
||||||
|
if (!api.IsLoggedIn || api.State.Value == APIState.RequiresSecondFactorAuth)
|
||||||
|
{
|
||||||
|
Scheduler.AddDelayed(() => login?.Show(), 500);
|
||||||
|
loginDisplayed.Value = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
protected override void LogoSuspending(OsuLogo logo)
|
protected override void LogoSuspending(OsuLogo logo)
|
||||||
{
|
{
|
||||||
var seq = logo.FadeOut(300, Easing.InSine)
|
var seq = logo.FadeOut(300, Easing.InSine)
|
||||||
|
Loading…
Reference in New Issue
Block a user