Merge pull request #4183 from smoogipoo/revert-carousel-depth

Revert carousel depth change
This commit is contained in:
Dean Herbert 2019-01-31 00:14:19 +09:00 committed by GitHub
commit d9cb0358ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -123,16 +123,6 @@ namespace osu.Game.Screens.Select
Padding = new MarginPadding { Top = 10, Right = 5 }, 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 new Container
{ {
RelativeSizeAxes = Axes.Both, 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()) new ResetScrollContainer(() => Carousel.ScrollToSelected())
{ {
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,