h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 20:03:21 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/upstream/master' into async-workflow

Browse Source
This commit is contained in:
Dean Herbert 2016-11-03 16:44:49 +09:00
commit 439204b4fa
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game/Beatmaps/Drawable/Panel.cs
View File

@ -23,7 +23,6 @@ namespace osu.Game.Beatmaps.Drawable
Masking = true;
CornerRadius = 10;
BorderColour = new Color4(221, 255, 255, 0);
GlowColour = new Color4(102, 204, 255, 100);
RelativeSizeAxes = Axes.X;
}
@ -53,22 +52,30 @@ namespace osu.Game.Beatmaps.Drawable
protected virtual void Selected()
{
BorderColour = new Color4(BorderColour.R, BorderColour.G, BorderColour.B, 255);
GlowRadius = 10;
BorderColour = new Color4(BorderColour.R, BorderColour.G, BorderColour.B, 1f);
BorderThickness = 2.5f;
EdgeEffect = new EdgeEffect
{
Type = EdgeEffectType.Glow,
Colour = new Color4(130, 204, 255, 150),
Radius = 20,
Roundness = 10,
};
}
protected virtual void Deselected()
{
BorderColour = new Color4(BorderColour.R, BorderColour.G, BorderColour.B, 0);
GlowRadius = 0;
BorderThickness = 0;
EdgeEffect = new EdgeEffect { Type = EdgeEffectType.None };
}
protected override bool OnClick(InputState state)
{
State = PanelSelectedState.Selected;
return true;
protected override bool OnClick(InputState state)
{
State = PanelSelectedState.Selected;
return true;
}
}

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

@ -35,6 +35,7 @@ namespace osu.Game.GameModes.Play
private ScrollContainer scrollContainer;
private FlowContainer beatmapSetFlow;
private TrackManager trackManager;
private Container wedgeContainer;
/// <param name="database">Optionally provide a database to use instead of the OsuGame one.</param>
public PlaySongSelect(BeatmapDatabase database = null)
@ -45,7 +46,7 @@ namespace osu.Game.GameModes.Play
const float bottomToolHeight = 50;
Children = new Drawable[]
{
new Container
wedgeContainer = new Container
{
RelativeSizeAxes = Axes.Both,
Size = Vector2.One,
@ -147,6 +148,7 @@ namespace osu.Game.GameModes.Play
{
base.OnEntering(last);
ensurePlayingSelected();
wedgeContainer.FadeInFromZero(250);
}
protected override void OnResuming(GameMode last)