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

Merge branch 'master' into no-unranked-display

Browse Source
This commit is contained in:
Dan Balasescu
2021-06-10 17:09:46 +09:00
committed by GitHub
parent 020c63017e 05b46b4743
commit a44fd887ee
51 changed files with 923 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Screens/Ranking/ResultsScreen.cs
View File

@ -13,6 +13,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Bindings;
using osu.Framework.Screens;
using osu.Game.Audio;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
using osu.Game.Input.Bindings;
@ -256,7 +257,7 @@ namespace osu.Game.Screens.Ranking
ApplyToBackground(b =>
{
b.BlurAmount.Value = BACKGROUND_BLUR;
b.FadeTo(0.5f, 250);
b.FadeColour(OsuColour.Gray(0.5f), 250);
});
bottomPanel.FadeTo(1, 250);
@ -264,9 +265,11 @@ namespace osu.Game.Screens.Ranking
public override bool OnExiting(IScreen next)
{
ApplyToBackground(b => b.FadeTo(1, 250));
if (base.OnExiting(next))
return true;
return base.OnExiting(next);
this.FadeOut(100);
return false;
}
public override bool OnBackButton()
@ -314,7 +317,7 @@ namespace osu.Game.Screens.Ranking
ScorePanelList.HandleInput = false;
// Dim background.
ApplyToBackground(b => b.FadeTo(0.1f, 150));
ApplyToBackground(b => b.FadeColour(OsuColour.Gray(0.1f), 150));
detachedPanel = expandedPanel;
}
@ -338,7 +341,7 @@ namespace osu.Game.Screens.Ranking
ScorePanelList.HandleInput = true;
// Un-dim background.
ApplyToBackground(b => b.FadeTo(0.5f, 150));
ApplyToBackground(b => b.FadeColour(OsuColour.Gray(0.5f), 150));
detachedPanel = null;
}