RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not change depth value of drawables currently contained within a container.

This commit is contained in:
Tom94 2016-11-23 18:30:50 +01:00 committed by Dean Herbert
parent 3e4ff27865
commit 718f2b13a8
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 34193c7f15aba3520f73f8ca36c0fbc9cd3951d4
Subproject commit 1a521bb22cfd2c14f58d4cd60fbbfdb70ea8f87b

18
osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs
View File

@ -36,18 +36,18 @@ public WorkingBeatmap Beatmap
newBackground.Preload(Game, delegate
{
Background oldBackground = background;
float newDepth = 0;
if (background != null)
{
newDepth = background.Depth - 1;
background.Flush();
background.FadeOut(250);
background.Expire();
}
newBackground.Depth = newDepth;
Add(background = newBackground);
background.BlurSigma = blurTarget;
if (oldBackground != null)
{
oldBackground.Depth = 1;
oldBackground.Flush();
oldBackground.FadeOut(250);
oldBackground.Expire();
}
});
});
}

9
osu.Game/Screens/Select/BeatmapInfoOverlay.cs
View File

@ -20,12 +20,12 @@ public void UpdateBeatmap(WorkingBeatmap beatmap)
if (beatmap == null)
return;
float newDepth = 0;
if (beatmapInfoContainer != null)
{
Drawable oldWedgedBeatmapInfo = beatmapInfoContainer;
oldWedgedBeatmapInfo.Depth = 1;
oldWedgedBeatmapInfo.FadeOut(250);
oldWedgedBeatmapInfo.Expire();
newDepth = beatmapInfoContainer.Depth - 1;
beatmapInfoContainer.FadeOut(250);
beatmapInfoContainer.Expire();
}
FadeIn(250);
@ -34,6 +34,7 @@ public void UpdateBeatmap(WorkingBeatmap beatmap)
BeatmapInfo beatmapInfo = beatmap.BeatmapInfo;
Add(beatmapInfoContainer = new BufferedContainer
{
Depth = newDepth,
PixelSnapping = true,
CacheDrawnFrameBuffer = true,
Shear = -Shear,

5
osu.Game/Screens/Select/CarouselContainer.cs
View File

@ -144,10 +144,11 @@ private void addPanel(int index)
if (panel.Hidden)
return;
panel.Depth = index + (panel is BeatmapSetHeader ? panels.Count : 0);
if (!scrollableContent.Contains(panel))
{
panel.Depth = index + (panel is BeatmapSetHeader ? panels.Count : 0);
scrollableContent.Add(panel);
}
}
protected override void Update()