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

Merge branch 'master' of github.com:ppy/osu into better-transforms

Browse Source 
# Conflicts:
#	osu-framework
This commit is contained in:
Thomas Müller
2017-07-19 19:15:51 +02:00
parent 3ba119c115 a7d4a3d473
commit c4619f614a
31 changed files with 380 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Screens/Select/BeatmapInfoWedge.cs
View File

@ -45,6 +45,12 @@ namespace osu.Game.Screens.Select
};
}
protected override void LoadComplete()
{
base.LoadComplete();
AlwaysPresent = true;
}
protected override bool HideOnEscape => false;
protected override bool BlockPassThroughMouse => false;
@ -63,18 +69,6 @@ namespace osu.Game.Screens.Select
public void UpdateBeatmap(WorkingBeatmap beatmap)
{
if (beatmap?.BeatmapInfo == null)
{
State = Visibility.Hidden;
beatmapInfoContainer?.FadeOut(250);
beatmapInfoContainer?.Expire();
beatmapInfoContainer = null;
return;
}
State = Visibility.Visible;
AlwaysPresent = true;
var lastContainer = beatmapInfoContainer;
float newDepth = lastContainer?.Depth + 1 ?? 0;