h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 06:57:39 +08:00
Code Issues Releases Wiki Activity

Move BeatmapGroupState to outside class definition.

Browse Source
This commit is contained in:
Dean Herbert 2016-10-27 13:42:37 +09:00
parent abfad501b6
commit 456169f182
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
osu.Game/Beatmaps/Drawable/BeatmapGroup.cs
View File

@ -14,14 +14,8 @@ using OpenTK.Graphics;
namespace osu.Game.Beatmaps.Drawable
{
class BeatmapGroup : Container, IStateful<BeatmapGroup.GroupState>
class BeatmapGroup : Container, IStateful<BeatmapGroupState>
{
public enum GroupState
{
Collapsed,
Expanded,
}
private const float collapsedAlpha = 0.5f;
private const float collapsedWidth = 0.8f;
@ -36,9 +30,9 @@ namespace osu.Game.Beatmaps.Drawable
private BeatmapSetHeader header;
private FlowContainer difficulties;
private GroupState state;
private BeatmapGroupState state;
public GroupState State
public BeatmapGroupState State
{
get { return state; }
set
@ -46,7 +40,7 @@ namespace osu.Game.Beatmaps.Drawable
state = value;
switch (state)
{
case GroupState.Expanded:
case BeatmapGroupState.Expanded:
FadeTo(1, 250);
difficulties.Show();
@ -59,7 +53,7 @@ namespace osu.Game.Beatmaps.Drawable
(difficulties.Children.FirstOrDefault() as BeatmapPanel).Selected = true;
SelectionChanged?.Invoke(this, selectedPanel?.Beatmap);
break;
case GroupState.Collapsed:
case BeatmapGroupState.Collapsed:
FadeTo(collapsedAlpha, 250);
difficulties.Hide();
@ -121,7 +115,7 @@ namespace osu.Game.Beatmaps.Drawable
public override void Load(BaseGame game)
{
base.Load(game);
State = GroupState.Collapsed;
State = BeatmapGroupState.Collapsed;
}
private void panelGainedSelection(BeatmapPanel panel)
@ -134,8 +128,14 @@ namespace osu.Game.Beatmaps.Drawable
protected override bool OnClick(InputState state)
{
State = GroupState.Expanded;
State = BeatmapGroupState.Expanded;
return true;
}
}
public enum BeatmapGroupState
{
Collapsed,
Expanded,
}
}

4
osu.Game/GameModes/Play/PlaySongSelect.cs
View File

@ -143,7 +143,7 @@ namespace osu.Game.GameModes.Play
return;
if (selectedBeatmapGroup != null)
selectedBeatmapGroup.State = BeatmapGroup.GroupState.Collapsed;
selectedBeatmapGroup.State = BeatmapGroupState.Collapsed;
selectedBeatmapGroup = group;
selectedBeatmap = beatmap;
@ -160,7 +160,7 @@ namespace osu.Game.GameModes.Play
setList.Add(group);
if (setList.Children.Count() == 1)
{
group.State = BeatmapGroup.GroupState.Expanded;
group.State = BeatmapGroupState.Expanded;
}
});
}