h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-19 13:02:54 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into ctb-pp

Browse Source
This commit is contained in:
Dean Herbert 2019-03-29 12:34:17 +09:00 committed by GitHub
commit 19825cf237
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Screens/Select/SongSelect.cs
View File

@ -90,13 +90,12 @@ namespace osu.Game.Screens.Select
protected SongSelect() protected SongSelect()
{ {
const float carousel_width = 640; const float carousel_width = 640;
const float filter_height = 100;
AddRangeInternal(new Drawable[] AddRangeInternal(new Drawable[]
{ {
new ParallaxContainer new ParallaxContainer
{ {
Padding = new MarginPadding { Top = filter_height }, Masking = true,
ParallaxAmount = 0.005f, ParallaxAmount = 0.005f,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Children = new[] Children = new[]
@ -155,7 +154,7 @@ namespace osu.Game.Screens.Select
FilterControl = new FilterControl FilterControl = new FilterControl
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Height = filter_height, Height = 100,
FilterChanged = c => Carousel.Filter(c), FilterChanged = c => Carousel.Filter(c),
Background = { Width = 2 }, Background = { Width = 2 },
Exit = () => Exit = () =>