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

Don't set hidden; make it based on alpha value.

Browse Source
This commit is contained in:
Dean Herbert 2016-11-25 12:47:58 +09:00
parent 78be1dd3af
commit 12c74b1b0b
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
View File

@ -35,14 +35,8 @@ namespace osu.Game.Beatmaps.Drawables
switch (state) switch (state)
{ {
case BeatmapGroupState.Expanded: case BeatmapGroupState.Expanded:
//if (!difficulties.Children.All(d => IsLoaded))
// Task.WhenAll(difficulties.Children.Select(d => d.Preload(Game))).ContinueWith(t => difficulties.Show());
//else
foreach (BeatmapPanel panel in BeatmapPanels) foreach (BeatmapPanel panel in BeatmapPanels)
{
panel.Hidden = false;
panel.FadeIn(250); panel.FadeIn(250);
}
Header.State = PanelSelectedState.Selected; Header.State = PanelSelectedState.Selected;
if (SelectedPanel != null) if (SelectedPanel != null)
@ -54,11 +48,7 @@ namespace osu.Game.Beatmaps.Drawables
SelectedPanel.State = PanelSelectedState.NotSelected; SelectedPanel.State = PanelSelectedState.NotSelected;
foreach (BeatmapPanel panel in BeatmapPanels) foreach (BeatmapPanel panel in BeatmapPanels)
{
panel.Hidden = true;
panel.FadeOut(250); panel.FadeOut(250);
}
break; break;
} }
} }
@ -76,6 +66,7 @@ namespace osu.Game.Beatmaps.Drawables
BeatmapPanels = beatmap.BeatmapSetInfo.Beatmaps.Select(b => new BeatmapPanel(b) BeatmapPanels = beatmap.BeatmapSetInfo.Beatmaps.Select(b => new BeatmapPanel(b)
{ {
Alpha = 0,
GainedSelection = panelGainedSelection, GainedSelection = panelGainedSelection,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
}).ToList(); }).ToList();

1
osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
View File

@ -27,7 +27,6 @@ namespace osu.Game.Beatmaps.Drawables
public BeatmapSetHeader(WorkingBeatmap beatmap) public BeatmapSetHeader(WorkingBeatmap beatmap)
{ {
this.beatmap = beatmap; this.beatmap = beatmap;
Hidden = false;
Children = new Drawable[] Children = new Drawable[]
{ {

4
osu.Game/Beatmaps/Drawables/Panel.cs
View File

@ -4,6 +4,7 @@
using osu.Framework; using osu.Framework;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Transformations;
using osu.Framework.Input; using osu.Framework.Input;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
@ -14,7 +15,8 @@ namespace osu.Game.Beatmaps.Drawables
{ {
public const float MAX_HEIGHT = 80; public const float MAX_HEIGHT = 80;
public bool Hidden = true; public bool Hidden => Alpha == 0 && Transforms.Count == 0;
private Container nestedContainer; private Container nestedContainer;
protected override Container<Drawable> Content => nestedContainer; protected override Container<Drawable> Content => nestedContainer;