sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 22:56:36 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into iscreen

Browse Source
This commit is contained in:
Dean Herbert
2019-01-31 01:08:06 +09:00
committed by GitHub
parent a8a34f8f20 d9cb0358ed
commit d34aa50613
4 changed files with 47 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,16 +123,6 @@ namespace osu.Game.Screens.Select
Padding = new MarginPadding { Top = 10, Right = 5 },
}
},
beatmapInfoWedge = new BeatmapInfoWedge
{
Size = wedged_container_size,
RelativeSizeAxes = Axes.X,
Margin = new MarginPadding
{
Top = left_area_padding,
Right = left_area_padding,
},
},
new Container
{
RelativeSizeAxes = Axes.Both,
@ -173,6 +163,16 @@ namespace osu.Game.Screens.Select
}
},
},
beatmapInfoWedge = new BeatmapInfoWedge
{
Size = wedged_container_size,
RelativeSizeAxes = Axes.X,
Margin = new MarginPadding
{
Top = left_area_padding,
Right = left_area_padding,
},
},
new ResetScrollContainer(() => Carousel.ScrollToSelected())
{
RelativeSizeAxes = Axes.Y,