h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-21 22:12:53 +08:00
Code Issues Releases Wiki Activity

Add glow to beatmap groups

Browse Source
This commit is contained in:
Drew DeVault 2016-10-19 16:23:07 -04:00
parent bc959f74a5
commit 941687e091
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/GameModes/Play/BeatmapGroup.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.GameModes.Play
{ {
class BeatmapGroup : AutoSizeContainer class BeatmapGroup : AutoSizeContainer
{ {
private const float collapsedAlpha = 0.3f; private const float collapsedAlpha = 0.5f;
public event Action<BeatmapSetInfo> SetSelected; public event Action<BeatmapSetInfo> SetSelected;
public event Action<BeatmapSetInfo, BeatmapInfo> BeatmapSelected; public event Action<BeatmapSetInfo, BeatmapInfo> BeatmapSelected;
@ -48,7 +48,7 @@ namespace osu.Game.GameModes.Play
EndTime = Time + 250, EndTime = Time + 250,
}); });
if (collapsed) if (collapsed)
topContainer.Remove(difficulties); topContainer.Remove(difficulties, false);
else else
topContainer.Add(difficulties); topContainer.Add(difficulties);
setBox.BorderColour = new Color4( setBox.BorderColour = new Color4(
@ -56,6 +56,7 @@ namespace osu.Game.GameModes.Play
setBox.BorderColour.G, setBox.BorderColour.G,
setBox.BorderColour.B, setBox.BorderColour.B,
collapsed ? 0 : 255); collapsed ? 0 : 255);
setBox.GlowRadius = collapsed ? 0 : 5;
} }
} }
@ -108,6 +109,7 @@ namespace osu.Game.GameModes.Play
CornerRadius = 5; CornerRadius = 5;
BorderThickness = 2; BorderThickness = 2;
BorderColour = new Color4(221, 255, 255, 0); BorderColour = new Color4(221, 255, 255, 0);
GlowColour = new Color4(166, 221, 251, 0.5f); // TODO: Get actual color for this
Children = new Drawable[] Children = new Drawable[]
{ {
new Box new Box

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

@ -98,7 +98,7 @@ namespace osu.Game.GameModes.Play
{ {
setList = new FlowContainer setList = new FlowContainer
{ {
Padding = new MarginPadding { Top = 25, Bottom = 25 }, Padding = new MarginPadding { Left = 25, Top = 25, Bottom = 25 },
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Size = new Vector2(1, 0), Size = new Vector2(1, 0),
Direction = FlowDirection.VerticalOnly, Direction = FlowDirection.VerticalOnly,