sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-07 00:23:59 +09:00
Code Issues Packages Projects 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
parent 046d51e39e 5c93ab3ecc
commit 439204b4fa
2 changed files with 18 additions and 9 deletions
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; Masking = true;
CornerRadius = 10; CornerRadius = 10;
BorderColour = new Color4(221, 255, 255, 0); BorderColour = new Color4(221, 255, 255, 0);
GlowColour = new Color4(102, 204, 255, 100);
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
} }
@ -53,22 +52,30 @@ namespace osu.Game.Beatmaps.Drawable
protected virtual void Selected() protected virtual void Selected()
{ {
BorderColour = new Color4(BorderColour.R, BorderColour.G, BorderColour.B, 255); BorderColour = new Color4(BorderColour.R, BorderColour.G, BorderColour.B, 1f);
GlowRadius = 10;
BorderThickness = 2.5f; BorderThickness = 2.5f;
EdgeEffect = new EdgeEffect
{
Type = EdgeEffectType.Glow,
Colour = new Color4(130, 204, 255, 150),
Radius = 20,
Roundness = 10,
};
} }
protected virtual void Deselected() protected virtual void Deselected()
{ {
BorderColour = new Color4(BorderColour.R, BorderColour.G, BorderColour.B, 0); BorderColour = new Color4(BorderColour.R, BorderColour.G, BorderColour.B, 0);
GlowRadius = 0;
BorderThickness = 0; BorderThickness = 0;
EdgeEffect = new EdgeEffect { Type = EdgeEffectType.None };
} }
protected override bool OnClick(InputState state) protected override bool OnClick(InputState state)
{ {
State = PanelSelectedState.Selected; State = PanelSelectedState.Selected;
return true; return true;
} }
} }

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

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