1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 04:13:00 +08:00

Move horizontal padding to content level to better align scrollbar

This commit is contained in:
Dean Herbert 2022-05-10 17:23:12 +09:00
parent bcce9c5e67
commit e5204e565d
2 changed files with 21 additions and 19 deletions

View File

@ -33,23 +33,29 @@ namespace osu.Game.Overlays.FirstRunSetup
new OsuScrollContainer(Direction.Vertical) new OsuScrollContainer(Direction.Vertical)
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
ScrollbarOverlapsContent = false, Masking = false,
Children = new Drawable[] Child = new Container
{ {
new OsuSpriteText RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Padding = new MarginPadding { Horizontal = 30 },
Children = new Drawable[]
{ {
Text = this.GetLocalisableDescription(), new OsuSpriteText
Font = OsuFont.Default.With(size: header_size), {
Colour = OverlayColourProvider.Light1, Text = this.GetLocalisableDescription(),
Font = OsuFont.Default.With(size: header_size),
Colour = OverlayColourProvider.Light1,
},
Content = new FillFlowContainer
{
Y = header_size + spacing,
Spacing = new Vector2(spacing),
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical,
}
}, },
Content = new FillFlowContainer
{
Y = header_size + spacing,
Spacing = new Vector2(spacing),
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical,
}
}, },
} }
}; };

View File

@ -118,11 +118,7 @@ namespace osu.Game.Overlays
new Container new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding Padding = new MarginPadding { Vertical = 20 },
{
Vertical = 20,
Horizontal = 20,
},
Child = screenContent = new Container { RelativeSizeAxes = Axes.Both, }, Child = screenContent = new Container { RelativeSizeAxes = Axes.Both, },
}, },
}, },