mirror of
https://github.com/ppy/osu.git
synced 2025-02-15 14:42:56 +08:00
Limit the width of first run overlay content
This commit is contained in:
parent
9aadc274bf
commit
bcce9c5e67
@ -62,7 +62,7 @@ namespace osu.Game.Overlays
|
|||||||
typeof(ScreenBehaviour),
|
typeof(ScreenBehaviour),
|
||||||
};
|
};
|
||||||
|
|
||||||
private Container stackContainer = null!;
|
private Container screenContent = null!;
|
||||||
|
|
||||||
private Bindable<OverlayActivation>? overlayActivationMode;
|
private Bindable<OverlayActivation>? overlayActivationMode;
|
||||||
|
|
||||||
@ -86,36 +86,51 @@ namespace osu.Game.Overlays
|
|||||||
Anchor = Anchor.Centre,
|
Anchor = Anchor.Centre,
|
||||||
Origin = Anchor.Centre,
|
Origin = Anchor.Centre,
|
||||||
RelativeSizeAxes = Axes.Both,
|
RelativeSizeAxes = Axes.Both,
|
||||||
Padding = new MarginPadding
|
Padding = new MarginPadding { Bottom = 20, },
|
||||||
|
Child = new GridContainer()
|
||||||
{
|
{
|
||||||
Horizontal = 70 * 1.2f,
|
Anchor = Anchor.Centre,
|
||||||
Bottom = 20,
|
Origin = Anchor.Centre,
|
||||||
},
|
|
||||||
Child = new InputBlockingContainer
|
|
||||||
{
|
|
||||||
Masking = true,
|
|
||||||
CornerRadius = 14,
|
|
||||||
RelativeSizeAxes = Axes.Both,
|
RelativeSizeAxes = Axes.Both,
|
||||||
Children = new Drawable[]
|
ColumnDimensions = new[]
|
||||||
{
|
{
|
||||||
new Box
|
new Dimension(),
|
||||||
{
|
new Dimension(minSize: 640, maxSize: 800),
|
||||||
RelativeSizeAxes = Axes.Both,
|
new Dimension(),
|
||||||
Colour = ColourProvider.Background6,
|
|
||||||
},
|
|
||||||
stackContainer = new Container
|
|
||||||
{
|
|
||||||
Anchor = Anchor.Centre,
|
|
||||||
Origin = Anchor.Centre,
|
|
||||||
RelativeSizeAxes = Axes.Both,
|
|
||||||
Padding = new MarginPadding
|
|
||||||
{
|
|
||||||
Vertical = 20,
|
|
||||||
Horizontal = 70,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
},
|
Content = new[]
|
||||||
|
{
|
||||||
|
new[]
|
||||||
|
{
|
||||||
|
Empty(),
|
||||||
|
new InputBlockingContainer
|
||||||
|
{
|
||||||
|
Masking = true,
|
||||||
|
CornerRadius = 14,
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
new Box
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Colour = ColourProvider.Background6,
|
||||||
|
},
|
||||||
|
new Container
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Padding = new MarginPadding
|
||||||
|
{
|
||||||
|
Vertical = 20,
|
||||||
|
Horizontal = 20,
|
||||||
|
},
|
||||||
|
Child = screenContent = new Container { RelativeSizeAxes = Axes.Both, },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Empty(),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -268,7 +283,7 @@ namespace osu.Game.Overlays
|
|||||||
{
|
{
|
||||||
Debug.Assert(currentStepIndex == null);
|
Debug.Assert(currentStepIndex == null);
|
||||||
|
|
||||||
stackContainer.Child = stack = new ScreenStack
|
screenContent.Child = stack = new ScreenStack
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.Both,
|
RelativeSizeAxes = Axes.Both,
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user