h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 05:27:23 +08:00
Code Issues Releases Wiki Activity

Fix loading layer being in the wrong place

Browse Source
This commit is contained in:
Dean Herbert 2021-04-06 16:29:07 +09:00
parent 59e6c46644
commit 1934e8e1fe
1 changed files with 74 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
osu.Game/Screens/Select/BeatmapDetails.cs
View File

@ -68,99 +68,102 @@ namespace osu.Game.Screens.Select
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Horizontal = spacing }, Padding = new MarginPadding { Horizontal = spacing },
Child = new GridContainer Children = new Drawable[]
{ {
RelativeSizeAxes = Axes.Both, new GridContainer
RowDimensions = new[]
{ {
new Dimension(GridSizeMode.AutoSize), RelativeSizeAxes = Axes.Both,
new Dimension() RowDimensions = new[]
},
Content = new[]
{
new Drawable[]
{ {
new FillFlowContainer new Dimension(GridSizeMode.AutoSize),
new Dimension()
},
Content = new[]
{
new Drawable[]
{ {
RelativeSizeAxes = Axes.X, new FillFlowContainer
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Horizontal,
Children = new Drawable[]
{ {
new FillFlowContainer RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Horizontal,
Children = new Drawable[]
{ {
RelativeSizeAxes = Axes.X, new FillFlowContainer
AutoSizeAxes = Axes.Y,
Width = 0.5f,
Spacing = new Vector2(spacing),
Padding = new MarginPadding { Right = spacing / 2 },
Children = new[]
{
new DetailBox().WithChild(advanced = new AdvancedStats
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Padding = new MarginPadding { Horizontal = spacing, Top = spacing * 2, Bottom = spacing },
}),
new DetailBox().WithChild(new OnlineViewContainer(string.Empty)
{
RelativeSizeAxes = Axes.X,
Height = 134,
Padding = new MarginPadding { Horizontal = spacing, Top = spacing },
Child = ratings = new UserRatings
{
RelativeSizeAxes = Axes.Both,
},
}),
},
},
new OsuScrollContainer
{
RelativeSizeAxes = Axes.Both,
Width = 0.5f,
ScrollbarVisible = false,
Padding = new MarginPadding { Left = spacing / 2 },
Child = new FillFlowContainer
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
LayoutDuration = transition_duration, Width = 0.5f,
LayoutEasing = Easing.OutQuad, Spacing = new Vector2(spacing),
Spacing = new Vector2(spacing * 2), Padding = new MarginPadding { Right = spacing / 2 },
Margin = new MarginPadding { Top = spacing * 2 },
Children = new[] Children = new[]
{ {
description = new MetadataSection("Description"), new DetailBox().WithChild(advanced = new AdvancedStats
source = new MetadataSection("Source"), {
tags = new MetadataSection("Tags"), RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Padding = new MarginPadding { Horizontal = spacing, Top = spacing * 2, Bottom = spacing },
}),
new DetailBox().WithChild(new OnlineViewContainer(string.Empty)
{
RelativeSizeAxes = Axes.X,
Height = 134,
Padding = new MarginPadding { Horizontal = spacing, Top = spacing },
Child = ratings = new UserRatings
{
RelativeSizeAxes = Axes.Both,
},
}),
},
},
new OsuScrollContainer
{
RelativeSizeAxes = Axes.Both,
Width = 0.5f,
ScrollbarVisible = false,
Padding = new MarginPadding { Left = spacing / 2 },
Child = new FillFlowContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
LayoutDuration = transition_duration,
LayoutEasing = Easing.OutQuad,
Spacing = new Vector2(spacing * 2),
Margin = new MarginPadding { Top = spacing * 2 },
Children = new[]
{
description = new MetadataSection("Description"),
source = new MetadataSection("Source"),
tags = new MetadataSection("Tags"),
},
}, },
}, },
}, },
}, },
}, },
}, new Drawable[]
new Drawable[]
{
failRetryContainer = new OnlineViewContainer("Sign in to view more details")
{ {
RelativeSizeAxes = Axes.Both, failRetryContainer = new OnlineViewContainer("Sign in to view more details")
Children = new Drawable[]
{ {
new OsuSpriteText RelativeSizeAxes = Axes.Both,
Children = new Drawable[]
{ {
Text = "Points of Failure", new OsuSpriteText
Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 14), {
Text = "Points of Failure",
Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 14),
},
failRetryGraph = new FailRetryGraph
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Top = 14 + spacing / 2 },
},
}, },
failRetryGraph = new FailRetryGraph
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Top = 14 + spacing / 2 },
},
loading = new LoadingLayer(true)
}, },
}, }
} }
} },
loading = new LoadingLayer(true)
} }
}, },
}; };