mirror of
https://github.com/ppy/osu.git
synced 2025-02-19 08:23:20 +08:00
Fix beatmap carousel overlapping beatmap info wedge (#4760)
Fix beatmap carousel overlapping beatmap info wedge Co-authored-by: Dean Herbert <pe@ppy.sh>
This commit is contained in:
commit
71d3c9c495
@ -39,6 +39,7 @@ namespace osu.Game.Screens.Select
|
|||||||
public abstract class SongSelect : OsuScreen
|
public abstract class SongSelect : OsuScreen
|
||||||
{
|
{
|
||||||
private static readonly Vector2 wedged_container_size = new Vector2(0.5f, 245);
|
private static readonly Vector2 wedged_container_size = new Vector2(0.5f, 245);
|
||||||
|
|
||||||
protected const float BACKGROUND_BLUR = 20;
|
protected const float BACKGROUND_BLUR = 20;
|
||||||
private const float left_area_padding = 20;
|
private const float left_area_padding = 20;
|
||||||
|
|
||||||
@ -89,8 +90,6 @@ namespace osu.Game.Screens.Select
|
|||||||
|
|
||||||
protected SongSelect()
|
protected SongSelect()
|
||||||
{
|
{
|
||||||
const float carousel_width = 640;
|
|
||||||
|
|
||||||
AddRangeInternal(new Drawable[]
|
AddRangeInternal(new Drawable[]
|
||||||
{
|
{
|
||||||
new ParallaxContainer
|
new ParallaxContainer
|
||||||
@ -103,7 +102,8 @@ namespace osu.Game.Screens.Select
|
|||||||
new WedgeBackground
|
new WedgeBackground
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.Both,
|
RelativeSizeAxes = Axes.Both,
|
||||||
Padding = new MarginPadding { Right = carousel_width * 0.76f },
|
Padding = new MarginPadding { Right = -150 },
|
||||||
|
Size = new Vector2(wedged_container_size.X, 1),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -144,8 +144,8 @@ namespace osu.Game.Screens.Select
|
|||||||
Carousel = new BeatmapCarousel
|
Carousel = new BeatmapCarousel
|
||||||
{
|
{
|
||||||
Masking = false,
|
Masking = false,
|
||||||
RelativeSizeAxes = Axes.Y,
|
RelativeSizeAxes = Axes.Both,
|
||||||
Size = new Vector2(carousel_width, 1),
|
Size = new Vector2(1 - wedged_container_size.X, 1),
|
||||||
Anchor = Anchor.CentreRight,
|
Anchor = Anchor.CentreRight,
|
||||||
Origin = Anchor.CentreRight,
|
Origin = Anchor.CentreRight,
|
||||||
SelectionChanged = updateSelectedBeatmap,
|
SelectionChanged = updateSelectedBeatmap,
|
||||||
|
Loading…
Reference in New Issue
Block a user